Changeset 72207 in webkit for trunk/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Nov 17, 2010, 7:52:43 AM (15 years ago)

Author:

[email protected]

Message:

2010-11-17 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r72197.
​http://trac.webkit.org/changeset/72197
​https://bugs.webkit.org/show_bug.cgi?id=49661

broke fast/regex/test1.html (Requested by stampho on #webkit).

• runtime/JSGlobalData.h:
• runtime/RegExp.cpp: (JSC::RegExpRepresentation::~RegExpRepresentation): (JSC::RegExp::compile): (JSC::RegExp::match):
• tests/mozilla/expected.html:
• wtf/Platform.h:
• yarr/RegexCompiler.cpp:
• yarr/RegexCompiler.h:
• yarr/RegexInterpreter.cpp:
• 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::setFallback): (JSC::Yarr::executeRegex):
• yarr/RegexParser.h:
• yarr/RegexPattern.h:

2010-11-17 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r72197.
​http://trac.webkit.org/changeset/72197
​https://bugs.webkit.org/show_bug.cgi?id=49661

broke fast/regex/test1.html (Requested by stampho on #webkit).

• 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/runtime/RegExp.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -29 +29 @@
 #include <wtf/OwnArrayPtr.h>
 
+
+#if ENABLE(YARR)
+
 #include "yarr/RegexCompiler.h"
 #if ENABLE(YARR_JIT)
@@ -36 +39 @@
 #endif
 
+#else
+
+#include <pcre/pcre.h>
+
+#endif
+
 namespace JSC {
 
@@ -41 +50 @@
 #if ENABLE(YARR_JIT)
     Yarr::RegexCodeBlock m_regExpJITCode;
-#else
+#elif ENABLE(YARR)
     OwnPtr<Yarr::BytecodePattern> m_regExpBytecode;
+#else
+    JSRegExp* m_regExp;
+#endif
+
+#if !ENABLE(YARR)
+    ~RegExpRepresentation()
+    {
+        jsRegExpFree(m_regExp);
+    }
 #endif
 };
@@ -83 +101 @@
 }
 
+#if ENABLE(YARR)
+
 void RegExp::compile(JSGlobalData* globalData)
 {
 #if ENABLE(YARR_JIT)
-    Yarr::jitCompileRegex(globalData, m_representation->m_regExpJITCode, m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
+    Yarr::jitCompileRegex(globalData, m_representation->m_regExpJITCode, m_pattern, m_numSubpatterns, m_constructionError, ignoreCase(), multiline());
 #else
     m_representation->m_regExpBytecode = Yarr::byteCompileRegex(m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
@@ -109 +129 @@
     if (m_representation->m_regExpBytecode) {
 #endif
-        int offsetVectorSize = (m_numSubpatterns + 1) * 2;
+        int offsetVectorSize = (m_numSubpatterns + 1) * 3; // FIXME: should be 2 - but adding temporary fallback to pcre.
         int* offsetVector;
         Vector<int, 32> nonReturnedOvector;
@@ -128 +148 @@
 
 #if ENABLE(YARR_JIT)
-        int result = Yarr::executeRegex(m_representation->m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector);
+        int result = Yarr::executeRegex(m_representation->m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector, offsetVectorSize);
 #else
         int result = Yarr::interpretRegex(m_representation->m_regExpBytecode.get(), s.characters(), startOffset, s.length(), offsetVector);
@@ -152 +172 @@
 }
 
+#else
+
+void RegExp::compile(JSGlobalData*)
+{
+    m_representation->m_regExp = 0;
+    JSRegExpIgnoreCaseOption ignoreCaseOption = ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase;
+    JSRegExpMultilineOption multilineOption = multiline() ? JSRegExpMultiline : JSRegExpSingleLine;
+    m_representation->m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(m_pattern.characters()), m_pattern.length(), ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
+}
+
+int RegExp::match(const UString& s, int startOffset, Vector<int, 32>* ovector)
+{
+#if ENABLE(REGEXP_TRACING)
+    m_rtMatchCallCount++;
+#endif
+    
+    if (startOffset < 0)
+        startOffset = 0;
+    if (ovector)
+        ovector->clear();
+
+    if (static_cast<unsigned>(startOffset) > s.length() || s.isNull())
+        return -1;
+
+    if (m_representation->m_regExp) {
+        // Set up the offset vector for the result.
+        // First 2/3 used for result, the last third used by PCRE.
+        int* offsetVector;
+        int offsetVectorSize;
+        int fixedSizeOffsetVector[3];
+        if (!ovector) {
+            offsetVectorSize = 3;
+            offsetVector = fixedSizeOffsetVector;
+        } else {
+            offsetVectorSize = (m_numSubpatterns + 1) * 3;
+            ovector->resize(offsetVectorSize);
+            offsetVector = ovector->data();
+        }
+
+        int numMatches = jsRegExpExecute(m_representation->m_regExp, reinterpret_cast<const UChar*>(s.characters()), s.length(), startOffset, offsetVector, offsetVectorSize);
+    
+        if (numMatches < 0) {
+#ifndef NDEBUG
+            if (numMatches != JSRegExpErrorNoMatch)
+                fprintf(stderr, "jsRegExpExecute failed with result %d\n", numMatches);
+#endif
+            if (ovector)
+                ovector->clear();
+            return -1;
+        }
+
+#if ENABLE(REGEXP_TRACING)
+        m_rtMatchFoundCount++;
+#endif
+        
+        return offsetVector[0];
+    }
+
+    return -1;
+}
+    
+#endif
+
 #if ENABLE(REGEXP_TRACING)
     void RegExp::printTraceData()