Changeset 61927 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jun 25, 2010, 6:04:28 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-25 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r61924.
​http://trac.webkit.org/changeset/61924
​https://bugs.webkit.org/show_bug.cgi?id=41240

It was rolled out, but cq+ wasn't removed (Requested by Ossy_
on #webkit).

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create):
• runtime/RegExp.h:
• runtime/RegExpCache.cpp: (JSC::RegExpCache::lookupOrCreate): (JSC::RegExpCache::create):
• runtime/RegExpCache.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• RegExp.cpp (modified) (3 diffs)
• RegExp.h (modified) (2 diffs)
• RegExpCache.cpp (modified) (2 diffs)
• RegExpCache.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -47 +47 @@
 namespace JSC {
 
+inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
+    : m_pattern(pattern)
+    , m_flagBits(0)
+    , m_constructionError(0)
+    , m_numSubpatterns(0)
+{
+    compile(globalData);
+}
+
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
     : m_pattern(pattern)
@@ -55 +64 @@
     // NOTE: The global flag is handled on a case-by-case basis by functions like
     // String::match and RegExpObject::match.
-    if (!flags.isNull()) {
-        if (flags.find('g') != UString::NotFound)
-            m_flagBits |= Global;
-        if (flags.find('i') != UString::NotFound)
-            m_flagBits |= IgnoreCase;
-        if (flags.find('m') != UString::NotFound)
-            m_flagBits |= Multiline;
-    }
+    if (flags.find('g') != UString::NotFound)
+        m_flagBits |= Global;
+    if (flags.find('i') != UString::NotFound)
+        m_flagBits |= IgnoreCase;
+    if (flags.find('m') != UString::NotFound)
+        m_flagBits |= Multiline;
+
     compile(globalData);
 }
@@ -72 +80 @@
 }
 #endif
+
+PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern)
+{
+    return adoptRef(new RegExp(globalData, pattern));
+}
 
 PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)

trunk/JavaScriptCore/runtime/RegExp.h

@@ -38 +38 @@
     class RegExp : public RefCounted<RegExp> {
     public:
+        static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern);
         static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern, const UString& flags);
 #if !ENABLE(YARR)
@@ -56 +57 @@
 
     private:
+        RegExp(JSGlobalData* globalData, const UString& pattern);
         RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
 

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, m_cacheMap.end());
+    return create(patternString, flags);
 }
 
-PassRefPtr<RegExp> RegExpCache::create(const UString& patternString, const UString& flags, RegExpCacheMap::iterator iterator) 
+PassRefPtr<RegExp> RegExpCache::create(const UString& patternString, const UString& flags) 
 {
-    RefPtr<RegExp> regExp = RegExp::create(m_globalData, patternString, flags);
+    RefPtr<RegExp> regExp;
+
+    if (!flags.isNull())
+        regExp = RegExp::create(m_globalData, patternString, flags);
+    else
+        regExp = RegExp::create(m_globalData, patternString);
 
     if (patternString.size() >= maxCacheablePatternLength)
@@ -60 +63 @@
 
     RegExpKey key = RegExpKey(flags, patternString);
-    iterator->first = key;
-    iterator->second = regExp;
+    m_cacheMap.set(key, regExp);
     patternKeyArray[m_nextKeyToEvict].flagsValue = key.flagsValue;
     patternKeyArray[m_nextKeyToEvict].pattern = patternString.rep();

trunk/JavaScriptCore/runtime/RegExpCache.h

@@ -36 +36 @@
 
 class RegExpCache {
-
-typedef HashMap<RegExpKey, RefPtr<RegExp> > RegExpCacheMap;
-
 public:
     PassRefPtr<RegExp> lookupOrCreate(const UString& patternString, const UString& flags);
-    PassRefPtr<RegExp> create(const UString& patternString, const UString& flags, RegExpCacheMap::iterator iterator);
+    PassRefPtr<RegExp> create(const UString& patternString, const UString& flags);
     RegExpCache(JSGlobalData* globalData);
 
@@ -48 +45 @@
     static const int maxCacheableEntries = 256;
 
+    typedef HashMap<RegExpKey, RefPtr<RegExp> > RegExpCacheMap;
     RegExpKey patternKeyArray[maxCacheableEntries];
     RegExpCacheMap m_cacheMap;