Changeset 51975 in webkit for trunk/JavaScriptCore/runtime/JSString.h

Timestamp:

Dec 10, 2009, 6:07:42 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=32400
Switch remaining cases of string addition to use ropes.

Reviewed by Oliver Hunt.

~1% progression on Sunspidey.

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/JSString.h:

(JSC::JSString::JSString):
(JSC::JSString::appendStringInConstruct):

• runtime/Operations.cpp:

(JSC::jsAddSlowCase):

• runtime/Operations.h:

(JSC::jsString):
(JSC::jsAdd):

File:

• trunk/JavaScriptCore/runtime/JSString.h (modified) (4 diffs)

trunk/JavaScriptCore/runtime/JSString.h

@@ -204 +204 @@
             ASSERT(ropeLength == index);
         }
+        // This constructor constructs a new string by concatenating s1 & s2.
+        // This should only be called with ropeLength <= 3.
+        JSString(JSGlobalData* globalData, unsigned ropeLength, JSString* s1, const UString& u2)
+            : JSCell(globalData->stringStructure.get())
+            , m_stringLength(s1->length() + u2.size())
+            , m_ropeLength(ropeLength)
+        {
+            ASSERT(ropeLength <= s_maxInternalRopeLength);
+            unsigned index = 0;
+            appendStringInConstruct(index, s1);
+            appendStringInConstruct(index, u2);
+            ASSERT(ropeLength == index);
+        }
+        // This constructor constructs a new string by concatenating s1 & s2.
+        // This should only be called with ropeLength <= 3.
+        JSString(JSGlobalData* globalData, unsigned ropeLength, const UString& u1, JSString* s2)
+            : JSCell(globalData->stringStructure.get())
+            , m_stringLength(u1.size() + s2->length())
+            , m_ropeLength(ropeLength)
+        {
+            ASSERT(ropeLength <= s_maxInternalRopeLength);
+            unsigned index = 0;
+            appendStringInConstruct(index, u1);
+            appendStringInConstruct(index, s2);
+            ASSERT(ropeLength == index);
+        }
         // This constructor constructs a new string by concatenating v1, v2 & v3.
         // This should only be called with ropeLength <= 3 ... which since every
@@ -259 +285 @@
         void resolveRope(ExecState*) const;
 
+        void appendStringInConstruct(unsigned& index, const UString& string)
+        {
+            m_fibers[index++] = Rope::Fiber(string.rep()->ref());
+        }
+
         void appendStringInConstruct(unsigned& index, JSString* jsString)
         {
@@ -265 +296 @@
                     m_fibers[index++] = jsString->m_fibers[i].ref();
             } else
-                m_fibers[index++] = Rope::Fiber(jsString->string().rep()->ref());
+                appendStringInConstruct(index, jsString->string());
         }
 
@@ -312 +343 @@
 
         friend JSValue jsString(ExecState* exec, JSString* s1, JSString* s2);
+        friend JSValue jsString(ExecState* exec, const UString& u1, JSString* s2);
+        friend JSValue jsString(ExecState* exec, JSString* s1, const UString& u2);
         friend JSValue jsString(ExecState* exec, Register* strings, unsigned count);
     };