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

Timestamp:

Dec 13, 2017, 11:38:51 AM (7 years ago)

Author:

[email protected]

Message:

Unreviewed rollout of r225695. Caused a crash on yahoo login page.

That bug tracked in ​https://bugs.webkit.org/show_bug.cgi?id=180761.

File:

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

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -272 +272 @@
 }
 
-
-static std::unique_ptr<Yarr::BytecodePattern> byteCodeCompilePattern(VM* vm, Yarr::YarrPattern& pattern)
-{
-    return Yarr::byteCompile(pattern, &vm->m_regExpAllocator, &vm->m_regExpAllocatorLock);
-}
-
-void RegExp::byteCodeCompileIfNecessary(VM* vm)
-{
-    if (m_regExpBytecode)
-        return;
-
-    Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->stackLimit());
-    if (m_constructionError) {
-        RELEASE_ASSERT_NOT_REACHED();
-#if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
-        m_state = ParseError;
-        return;
-#endif
-    }
-    ASSERT(m_numSubpatterns == pattern.m_numSubpatterns);
-
-    m_regExpBytecode = byteCodeCompilePattern(vm, pattern);
-}
-
 void RegExp::compile(VM* vm, Yarr::YarrCharSize charSize)
 {
@@ -328 +304 @@
 #endif
 
-    if (Options::dumpCompiledRegExpPatterns())
-        dataLog("Can't JIT this regular expression: \"", m_patternString, "\"\n");
-
     m_state = ByteCode;
-    m_regExpBytecode = byteCodeCompilePattern(vm, pattern);
+    m_regExpBytecode = Yarr::byteCompile(pattern, &vm->m_regExpAllocator, &vm->m_regExpAllocatorLock);
 }
 
@@ -384 +357 @@
 #endif
 
-    if (Options::dumpCompiledRegExpPatterns())
-        dataLog("Can't JIT this regular expression: \"", m_patternString, "\"\n");
-
     m_state = ByteCode;
-    m_regExpBytecode = byteCodeCompilePattern(vm, pattern);
+    m_regExpBytecode = Yarr::byteCompile(pattern, &vm->m_regExpAllocator, &vm->m_regExpAllocatorLock);
 }