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

Timestamp:

Aug 25, 2010, 11:55:26 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-25 Michael Saboff <​[email protected]>

Reviewed by Sam Weinig.

Remove the single entry regular expression cache introduced as part of
the fix for ​https://bugs.webkit.org/show_bug.cgi?id=41238.
The performance problem in Dromaeo that initiated that bug is no
longer present. Dromaeo has been modified so that the regular
expression tests are somewhat random and don't benefit from a
single entry cache.

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::match):
• runtime/RegExp.h:

File:

• trunk/JavaScriptCore/runtime/RegExp.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -52 +52 @@
     , m_constructionError(0)
     , m_numSubpatterns(0)
-    , m_lastMatchStart(-1)
 {
     // NOTE: The global flag is handled on a case-by-case basis by functions like
@@ -97 +96 @@
         ovector->resize(0);
 
-    if (static_cast<unsigned>(startOffset) > s.length() || s.isNull()) {
-        m_lastMatchString = UString();
-        m_lastMatchStart = -1;
-        m_lastOVector.shrink(0);
+    if (static_cast<unsigned>(startOffset) > s.length() || s.isNull())
         return -1;
-    }
-    
-    // Perform check to see if this match call is the same as the last match invocation
-    // and if it is return the prior result.
-    if ((startOffset == m_lastMatchStart) && (s.impl() == m_lastMatchString.impl())) {
-        if (ovector)
-            *ovector = m_lastOVector;
-        
-        if (m_lastOVector.isEmpty())
-            return -1;
-
-        return m_lastOVector.at(0);
-    }
 
 #if ENABLE(YARR_JIT)
@@ -152 +135 @@
         }
         
-        m_lastMatchString = s;
-        m_lastMatchStart = startOffset;
-
-        if (ovector)
-            m_lastOVector = *ovector;
-        else
-            m_lastOVector = nonReturnedOvector;
-
         return result;
     }
-
-    m_lastMatchString = UString();
-    m_lastMatchStart = -1;
-    m_lastOVector.shrink(0);
 
     return -1;