Changeset 163808 in webkit for trunk/Source/JavaScriptCore/runtime/Identifier.h

Timestamp:

Feb 10, 2014, 12:39:12 PM (11 years ago)

Author:

[email protected]

Message:

Make the Identifier::add() family return PassRef<StringImpl>.
<​https://webkit.org/b/128542>

This knocks one branch off of creating an Identifier from another
string source.

Reviewed by Oliver Hunt.

• runtime/Identifier.cpp:

(JSC::Identifier::add):
(JSC::Identifier::add8):
(JSC::Identifier::addSlowCase):

• runtime/Identifier.h:

(JSC::Identifier::add):

• runtime/Lookup.cpp:

(JSC::HashTable::createTable):

File:

• trunk/Source/JavaScriptCore/runtime/Identifier.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/runtime/Identifier.h

@@ -96 +96 @@
 
         // Only to be used with string literals.
-        static PassRefPtr<StringImpl> add(VM*, const char*);
-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> add(ExecState*, const char*);
+        static PassRef<StringImpl> add(VM*, const char*);
+        JS_EXPORT_PRIVATE static PassRef<StringImpl> add(ExecState*, const char*);
 
     private:
@@ -108 +108 @@
         static bool equal(const Identifier& a, const LChar* b) { return equal(a.m_string.impl(), b); }
 
-        template <typename T> static PassRefPtr<StringImpl> add(VM*, const T*, int length);
-        static PassRefPtr<StringImpl> add8(VM*, const UChar*, int length);
+        template <typename T> static PassRef<StringImpl> add(VM*, const T*, int length);
+        static PassRef<StringImpl> add8(VM*, const UChar*, int length);
         template <typename T> ALWAYS_INLINE static bool canUseSingleCharacterString(T);
 
-        static PassRefPtr<StringImpl> add(ExecState* exec, StringImpl* r)
+        static PassRef<StringImpl> add(ExecState* exec, StringImpl* r)
         {
 #ifndef NDEBUG
@@ -118 +118 @@
 #endif
             if (r->isIdentifier())
-                return r;
+                return *r;
             return addSlowCase(exec, r);
         }
-        static PassRefPtr<StringImpl> add(VM* vm, StringImpl* r)
+        static PassRef<StringImpl> add(VM* vm, StringImpl* r)
         {
 #ifndef NDEBUG
@@ -127 +127 @@
 #endif
             if (r->isIdentifier())
-                return r;
+                return *r;
             return addSlowCase(vm, r);
         }
 
-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(ExecState*, StringImpl* r);
-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(VM*, StringImpl* r);
+        JS_EXPORT_PRIVATE static PassRef<StringImpl> addSlowCase(ExecState*, StringImpl* r);
+        JS_EXPORT_PRIVATE static PassRef<StringImpl> addSlowCase(VM*, StringImpl* r);
 
         JS_EXPORT_PRIVATE static void checkCurrentIdentifierTable(ExecState*);
@@ -179 +179 @@
 
     template <typename T>
-    PassRefPtr<StringImpl> Identifier::add(VM* vm, const T* s, int length)
+    PassRef<StringImpl> Identifier::add(VM* vm, const T* s, int length)
     {
         if (length == 1) {
@@ -188 +188 @@
         
         if (!length)
-            return StringImpl::empty();
+            return *StringImpl::empty();
         CharBuffer<T> buf = { s, static_cast<unsigned>(length) };
         HashSet<StringImpl*>::AddResult addResult = vm->identifierTable->add<CharBuffer<T>, IdentifierCharBufferTranslator<T>>(buf);
@@ -194 +194 @@
         // If the string is newly-translated, then we need to adopt it.
         // The boolean in the pair tells us if that is so.
-        return addResult.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator;
+        return addResult.isNewEntry ? adoptRef(**addResult.iterator) : **addResult.iterator;
     }