Changeset 44174 in webkit for trunk/JavaScriptCore

Timestamp:

May 26, 2009, 8:22:47 PM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/6924033> REGRESSION: Assertion failure due to forward references

Reviewed by Gavin Barraclough.

Add a pattern type for forward references to ensure that we don't confuse the
quantifier alternatives assertion.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• yarr/RegexCompiler.cpp (modified) (3 diffs)
• yarr/RegexInterpreter.cpp (modified) (1 diff)
• yarr/RegexJIT.cpp (modified) (1 diff)
• yarr/RegexPattern.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-05-26  Oliver Hunt  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        <rdar://problem/6924033> REGRESSION: Assertion failure due to forward references
+
+        Add a pattern type for forward references to ensure that we don't confuse the
+        quantifier alternatives assertion.
+
+        * yarr/RegexCompiler.cpp:
+        (JSC::Yarr::RegexPatternConstructor::atomBackReference):
+        (JSC::Yarr::RegexPatternConstructor::setupAlternativeOffsets):
+        * yarr/RegexInterpreter.cpp:
+        (JSC::Yarr::ByteCompiler::emitDisjunction):
+        * yarr/RegexJIT.cpp:
+        (JSC::Yarr::RegexGenerator::generateTerm):
+        * yarr/RegexPattern.h:
+        (JSC::Yarr::PatternTerm::):
+        (JSC::Yarr::PatternTerm::PatternTerm):
+        (JSC::Yarr::PatternTerm::ForwardReference):
+
 2009-05-26  Gavin Barraclough  <[email protected]>
 

trunk/JavaScriptCore/yarr/RegexCompiler.cpp

@@ -472 +472 @@
         m_pattern.m_maxBackReference = std::max(m_pattern.m_maxBackReference, subpatternId);
 
-        if (subpatternId > m_pattern.m_numSubpatterns)
+        if (subpatternId > m_pattern.m_numSubpatterns) {
+            m_alternative->m_terms.append(PatternTerm::ForwardReference());
             return;
+        }
 
         PatternAlternative* currentAlternative = m_alternative;
@@ -483 +485 @@
             ASSERT((term.type == PatternTerm::TypeParenthesesSubpattern) || (term.type == PatternTerm::TypeParentheticalAssertion));
 
-            if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.subpatternId))
+            if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.subpatternId)) {
+                m_alternative->m_terms.append(PatternTerm::ForwardReference());
                 return;
+            }
         }
 
@@ -593 +597 @@
                 currentCallFrameSize += RegexStackSpaceForBackTrackInfoBackReference;
                 alternative->m_hasFixedSize = false;
+                break;
+
+            case PatternTerm::TypeForwardReference:
                 break;
 

trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

@@ -1556 +1556 @@
                 case PatternTerm::TypeBackReference:
                     atomBackReference(term.subpatternId, term.inputPosition - currentCountAlreadyChecked, term.frameLocation, term.quantityCount, term.quantityType);
+                        break;
+
+                case PatternTerm::TypeForwardReference:
                     break;
 

trunk/JavaScriptCore/yarr/RegexJIT.cpp

@@ -1072 +1072 @@
             break;
 
+        case PatternTerm::TypeForwardReference:
+            break;
+
         case PatternTerm::TypeParenthesesSubpattern:
             if ((term.quantityCount == 1) && !term.parentheses.isCopy)

trunk/JavaScriptCore/yarr/RegexPattern.h

@@ -79 +79 @@
         TypeCharacterClass,
         TypeBackReference,
+        TypeForwardReference,
         TypeParenthesesSubpattern,
         TypeParentheticalAssertion,
@@ -144 +145 @@
     }
 
+    static PatternTerm ForwardReference()
+    {
+        return PatternTerm(TypeForwardReference);
+    }
+
     static PatternTerm BOL()
     {