Changeset 72197 in webkit for trunk/JavaScriptCore/yarr/RegexInterpreter.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/RegexInterpreter.cpp (modified) (3 diffs)

trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

@@ -36 +36 @@
 #endif
 
-#if ENABLE(YARR)
-
 using namespace WTF;
 
@@ -1743 +1741 @@
 }
 
+PassOwnPtr<BytecodePattern> byteCompileRegex(RegexPattern& pattern, BumpPointerAllocator* allocator)
+{
+    return ByteCompiler(pattern).compile(allocator);
+}
+
 int interpretRegex(BytecodePattern* regex, const UChar* input, unsigned start, unsigned length, int* output)
 {
@@ -1759 +1762 @@
 
 } }
-
-#endif