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

Timestamp:

Jun 25, 2010, 5:41:49 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-25 Renata Hodovan <​[email protected]>

Reviewed by Geoffrey Garen.

Merge RegExp constructor and RegExp::create methods into one.
Both of function are called with tree parameters and check whether
flags (the third param) is given or not.
Simplify hash lookups in RegExpCache::create with giving them an extra
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

@@ -38 +38 @@
         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)
@@ -63 +60 @@
 
     RegExpKey key = RegExpKey(flags, patternString);
-    m_cacheMap.set(key, regExp);
+    iterator->first = key;
+    iterator->second = regExp;
     patternKeyArray[m_nextKeyToEvict].flagsValue = key.flagsValue;
     patternKeyArray[m_nextKeyToEvict].pattern = patternString.rep();