Changeset 227469 in webkit for trunk/Source/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Jan 23, 2018, 8:51:08 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

[YARR] Add diagnosis for YarrJIT failures
​https://bugs.webkit.org/show_bug.cgi?id=181927

Reviewed by Sam Weinig.

It is nice if we can see the reason why YarrJIT fails to compile a given pattern.
This patch introduces Yarr::JITFailureReason and dumps messages if Options::dumpCompiledRegExpPatterns is specified.

• runtime/RegExp.cpp:

(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::generateTerm):
(JSC::Yarr::YarrGenerator::backtrackTerm):
(JSC::Yarr::YarrGenerator::opCompileParenthesesSubpattern):
(JSC::Yarr::YarrGenerator::YarrGenerator):
(JSC::Yarr::YarrGenerator::compile):
(JSC::Yarr::dumpCompileFailure):
(JSC::Yarr::jitCompile):

• yarr/YarrJIT.h:

(JSC::Yarr::YarrCodeBlock::setFallBack):
(JSC::Yarr::YarrCodeBlock::fallBack):
(JSC::Yarr::YarrCodeBlock::clear):
(JSC::Yarr::YarrCodeBlock::YarrCodeBlock): Deleted.
(JSC::Yarr::YarrCodeBlock::~YarrCodeBlock): Deleted.
(JSC::Yarr::YarrCodeBlock::isFallBack): Deleted.

File:

• trunk/Source/JavaScriptCore/runtime/RegExp.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -309 +309 @@
     if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()) {
         Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode);
-        if (!m_regExpJITCode.isFallBack()) {
+        if (!m_regExpJITCode.failureReason()) {
             m_state = JITCode;
             return;
@@ -365 +365 @@
     if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()) {
         Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode, Yarr::MatchOnly);
-        if (!m_regExpJITCode.isFallBack()) {
+        if (!m_regExpJITCode.failureReason()) {
             m_state = JITCode;
             return;