[webkit-changes] [108484] trunk/Source/JavaScriptCore

[ossy]

Title: [108484] trunk/Source/_javascript_Core

Revision

108484

Author

o...@webkit.org

Date

2012-02-22 05:05:14 -0800 (Wed, 22 Feb 2012)

Log Message

Unreviewed, rolling out r108456.
http://trac.webkit.org/changeset/108456
https://bugs.webkit.org/show_bug.cgi?id=79223

Broke fast/regex/pcre-test-4.html and cannot find anyone on
IRC (Requested by zherczeg on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-02-22

* yarr/YarrJIT.cpp:
(JSC::Yarr::YarrGenerator::backtrackPatternCharacterGreedy):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/yarr/YarrJIT.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (108483 => 108484)

--- trunk/Source/_javascript_Core/ChangeLog	2012-02-22 12:56:57 UTC (rev 108483)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-02-22 13:05:14 UTC (rev 108484)
@@ -1,5 +1,17 @@
 2012-02-22  Sheriff Bot  <webkit.review....@gmail.com>
 
+        Unreviewed, rolling out r108456.
+        http://trac.webkit.org/changeset/108456
+        https://bugs.webkit.org/show_bug.cgi?id=79223
+
+        Broke fast/regex/pcre-test-4.html and cannot find anyone on
+        IRC (Requested by zherczeg on #webkit).
+
+        * yarr/YarrJIT.cpp:
+        (JSC::Yarr::YarrGenerator::backtrackPatternCharacterGreedy):
+
+2012-02-22  Sheriff Bot  <webkit.review....@gmail.com>
+
         Unreviewed, rolling out r108468.
         http://trac.webkit.org/changeset/108468
         https://bugs.webkit.org/show_bug.cgi?id=79219

Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (108483 => 108484)

--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp	2012-02-22 12:56:57 UTC (rev 108483)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp	2012-02-22 13:05:14 UTC (rev 108484)
@@ -843,22 +843,16 @@
     {
         YarrOp& op = m_ops[opIndex];
         PatternTerm* term = op.m_term;
-        UChar ch = term->patternCharacter;
 
         const RegisterID countRegister = regT1;
 
         m_backtrackingState.link(this);
 
-        if ((ch > 0xff) && (m_charSize == Char8)) {
-            // Have a 16 bit pattern character and an 8 bit string - short circuit
-            m_backtrackingState.append(op.m_jumps);
-        } else {
-            loadFromFrame(term->frameLocation, countRegister);
-            m_backtrackingState.append(branchTest32(Zero, countRegister));
-            sub32(TrustedImm32(1), countRegister);
-            sub32(TrustedImm32(1), index);
-            jump(op.m_reentry);
-        }
+        loadFromFrame(term->frameLocation, countRegister);
+        m_backtrackingState.append(branchTest32(Zero, countRegister));
+        sub32(TrustedImm32(1), countRegister);
+        sub32(TrustedImm32(1), index);
+        jump(op.m_reentry);
     }
 
     void generatePatternCharacterNonGreedy(size_t opIndex)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes