Changeset 62405 in webkit for trunk/JavaScriptCore/runtime/RegExpCache.cpp

Timestamp:

Jul 2, 2010, 2:34:43 PM (15 years ago)

Author:

[email protected]

Message:

[ Updated after rollout. ]

Patch by Renata Hodovan <​[email protected]> on 2010-07-02
Reviewed by Oliver Hunt.

Merged RegExp constructor and RegExp::create methods.
Both functions are called with three parameters and check whether
flags (the third param) is given or not.
Avoid extra hash lookups in RegExpCache::create by passing a pre-computed
iterator parameter.
​https://bugs.webkit.org/show_bug.cgi?id=41055

• runtime/RegExp.cpp:

(JSC::RegExp::RegExp):

• runtime/RegExp.h:
• runtime/RegExpCache.cpp:

(JSC::RegExpCache::lookupOrCreate):
(JSC::RegExpCache::create):

• runtime/RegExpCache.h:

File:

• trunk/JavaScriptCore/runtime/RegExpCache.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExpCache.cpp

@@ -35 +35 @@
 {
     if (patternString.size() < maxCacheablePatternLength) {
-        pair<HashMap<RegExpKey, RefPtr<RegExp> >::iterator, bool> result = m_cacheMap.add(RegExpKey(flags, patternString), 0);
+        pair<RegExpCacheMap::iterator, bool> result = m_cacheMap.add(RegExpKey(flags, patternString), 0);
         if (!result.second)
             return result.first->second;
+        else
+            return create(patternString, flags, result.first);
     }
-    return create(patternString, flags);
+    return create(patternString, flags, m_cacheMap.end());
 }
 
-PassRefPtr<RegExp> RegExpCache::create(const UString& patternString, const UString& flags) 
+PassRefPtr<RegExp> RegExpCache::create(const UString& patternString, const UString& flags, RegExpCacheMap::iterator iterator) 
 {
-    RefPtr<RegExp> regExp;
-
-    if (!flags.isNull())
-        regExp = RegExp::create(m_globalData, patternString, flags);
-    else
-        regExp = RegExp::create(m_globalData, patternString);
+    RefPtr<RegExp> regExp = RegExp::create(m_globalData, patternString, flags);
 
     if (patternString.size() >= maxCacheablePatternLength)
         return regExp;
+
+    RegExpKey key = RegExpKey(flags, patternString);
+    iterator->first = key;
+    iterator->second = regExp;
 
     ++m_nextKeyToEvict;
@@ -62 +63 @@
         m_cacheMap.remove(RegExpKey(patternKeyArray[m_nextKeyToEvict].flagsValue, patternKeyArray[m_nextKeyToEvict].pattern));
 
-    RegExpKey key = RegExpKey(flags, patternString);
-    m_cacheMap.set(key, regExp);
     patternKeyArray[m_nextKeyToEvict].flagsValue = key.flagsValue;
     patternKeyArray[m_nextKeyToEvict].pattern = patternString.rep();