Changeset 76133 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 19, 2011, 9:58:15 AM (14 years ago)

Author:

[email protected]

Message:

2011-01-19 Michael Saboff <​[email protected]>

Reviewed by Darin Adler.

<rdar://problem/8882994> Regression: Simple nested backtrack hangs
​https://bugs.webkit.org/show_bug.cgi?id=52675

The changeset (r76076) for ​https://bugs.webkit.org/show_bug.cgi?id=52540
broke simple backtracking in some cases. Reworked that change to
link both jumps and labels.

• yarr/YarrJIT.cpp: (JSC::Yarr::YarrGenerator::BacktrackDestination::hasBacktrackToLabel): (JSC::Yarr::YarrGenerator::TermGenerationState::propagateBacktrackingFrom): (JSC::Yarr::YarrGenerator::generateParenthesesSingle):

2011-01-19 Michael Saboff <​[email protected]>

Reviewed by Darin Adler.

<rdar://problem/8882994> Regression: Simple nested backtrack hangs
​https://bugs.webkit.org/show_bug.cgi?id=52675

New tests to support change.

• fast/regex/parentheses-expected.txt:
• fast/regex/script-tests/parentheses.js:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• yarr/YarrJIT.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-19  Michael Saboff  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/8882994> Regression: Simple nested backtrack hangs
+        https://bugs.webkit.org/show_bug.cgi?id=52675
+
+        The changeset (r76076) for https://bugs.webkit.org/show_bug.cgi?id=52540
+        broke simple backtracking in some cases.  Reworked that change to 
+        link both jumps and labels.
+
+        * yarr/YarrJIT.cpp:
+        (JSC::Yarr::YarrGenerator::BacktrackDestination::hasBacktrackToLabel):
+        (JSC::Yarr::YarrGenerator::TermGenerationState::propagateBacktrackingFrom):
+        (JSC::Yarr::YarrGenerator::generateParenthesesSingle):
+
 2011-01-19  Pavel Podivilov  <[email protected]>
 

trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp

@@ -619 +619 @@
         }
 
+        bool hasBacktrackToLabel()
+        {
+            return m_backtrackToLabel;
+        }
+
         void setBacktrackJumpList(JumpList* jumpList)
         {
@@ -997 +1002 @@
             if (doJump)
                 m_backtrack.jumpToBacktrack(generator, backtrack.getBacktrackJumps());
+
+            if (m_backtrack.isLabel() && backtrack.hasBacktrackToLabel())
+                backtrack.linkBacktrackToLabel(m_backtrack.getLabel());
+
             if (backtrack.hasDestination()) {
                 if (m_backtrack.hasDataLabel())
@@ -1655 +1664 @@
             BacktrackDestination& stateBacktrack = state.getBacktrackDestination();
 
-            // If we have a backtrack label, use it for the parenthesis
-            if (stateBacktrack.isLabel())
-                parenthesesBacktrack.linkBacktrackToLabel(stateBacktrack.getLabel());
-            else {
-                state.propagateBacktrackingFrom(this, parenthesesBacktrack);
-                stateBacktrack.copyBacktrackToLabel(parenthesesBacktrack);
-            }
+            state.propagateBacktrackingFrom(this, parenthesesBacktrack);
+            stateBacktrack.copyBacktrackToLabel(parenthesesBacktrack);
 
             m_expressionState.decrementParenNestingLevel();