Changeset 72197 in webkit for trunk/JavaScriptCore/yarr/RegexJIT.cpp

Timestamp:

Nov 17, 2010, 5:15:56 AM (15 years ago)

Author:

Csaba Osztrogonác

Message:

YARR JIT should fallback to YARR Interpreter instead of PCRE.
​https://bugs.webkit.org/show_bug.cgi?id=46719

Patch by Peter Varga <​[email protected]> on 2010-11-17
Reviewed by Gavin Barraclough.

Remove the ENABLE_YARR macro and the option of matching regular
expressions with PCRE from JavaScriptCore.

JavaScriptCore:

• runtime/JSGlobalData.h:
• runtime/RegExp.cpp:

(JSC::RegExp::compile):
(JSC::RegExp::match):

• tests/mozilla/expected.html:
• wtf/Platform.h:
• yarr/RegexCompiler.cpp:
• yarr/RegexCompiler.h:
• yarr/RegexInterpreter.cpp:

(JSC::Yarr::byteCompileRegex):

• yarr/RegexInterpreter.h:
• yarr/RegexJIT.cpp:

(JSC::Yarr::jitCompileRegex):

• yarr/RegexJIT.h:

(JSC::Yarr::RegexCodeBlock::RegexCodeBlock):
(JSC::Yarr::RegexCodeBlock::~RegexCodeBlock):
(JSC::Yarr::RegexCodeBlock::getFallback):
(JSC::Yarr::RegexCodeBlock::isFallback):
(JSC::Yarr::RegexCodeBlock::setFallback):
(JSC::Yarr::executeRegex):

• yarr/RegexParser.h:
• yarr/RegexPattern.h:

LayoutTests:

• fast/js/regexp-look-ahead-empty-expected.txt:
• fast/js/regexp-overflow-expected.txt:
• fast/js/script-tests/regexp-overflow.js:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.5_Term/S15.10.2.5_A1_T4-expected.txt:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.8_Atom/S15.10.2.8_A2_T1-expected.txt:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.2_RegExp.prototype.exec/S15.10.6.2_A1_T6-expected.txt:

File:

• trunk/JavaScriptCore/yarr/RegexJIT.cpp (modified) (3 diffs)

trunk/JavaScriptCore/yarr/RegexJIT.cpp

@@ -32 +32 @@
 #include "MacroAssembler.h"
 #include "RegexCompiler.h"
-
-#include "pcre.h" // temporary, remove when fallback is removed.
+#include "RegexInterpreter.h" // temporary, remove when fallback is removed.
 
 #if ENABLE(YARR_JIT)
@@ -1533 +1532 @@
 };
 
-void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& patternString, unsigned& numSubpatterns, const char*& error, bool ignoreCase, bool multiline)
+void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& patternString, unsigned& numSubpatterns, const char*& error, BumpPointerAllocator* allocator, bool ignoreCase, bool multiline)
 {
     RegexPattern pattern(ignoreCase, multiline);
@@ -1547 +1546 @@
     }
 
-    JSRegExpIgnoreCaseOption ignoreCaseOption = ignoreCase ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase;
-    JSRegExpMultilineOption multilineOption = multiline ? JSRegExpMultiline : JSRegExpSingleLine;
-    jitObject.setFallback(jsRegExpCompile(reinterpret_cast<const UChar*>(patternString.characters()), patternString.length(), ignoreCaseOption, multilineOption, &numSubpatterns, &error));
+    jitObject.setFallback(byteCompileRegex(pattern, allocator));
 }