Changeset 108484 in webkit for trunk/Source/JavaScriptCore/yarr

Timestamp:

Feb 22, 2012, 5:05:14 AM (13 years ago)

Author:

Csaba Osztrogonác

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 <​[email protected]> on 2012-02-22

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::backtrackPatternCharacterGreedy):

File:

• trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp

@@ -844 +844 @@
         YarrOp& op = m_ops[opIndex];
         PatternTerm* term = op.m_term;
-        UChar ch = term->patternCharacter;
 
         const RegisterID countRegister = regT1;
@@ -850 +849 @@
         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);
     }