Changeset 52026 in webkit for trunk/JavaScriptCore/runtime/Operations.cpp

Timestamp:

Dec 11, 2009, 2:57:39 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.

Re-landing r51975 - added toPrimitiveString method,
performs toPrimitive then subsequent toString operations.

~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/Operations.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/Operations.cpp

@@ -55 +55 @@
     JSValue p2 = v2.toPrimitive(callFrame);
 
-    if (p1.isString() || p2.isString()) {
-        RefPtr<UString::Rep> value = concatenate(p1.toString(callFrame).rep(), p2.toString(callFrame).rep());
-        if (!value)
-            return throwOutOfMemoryError(callFrame);
-        return jsString(callFrame, value.release());
+    if (p1.isString()) {
+        return p2.isString()
+            ? jsString(callFrame, asString(p1), asString(p2))
+            : jsString(callFrame, asString(p1), p2.toString(callFrame));
     }
+    if (p2.isString())
+        return jsString(callFrame, p1.toString(callFrame), asString(p2));
 
     return jsNumber(callFrame, p1.toNumber(callFrame) + p2.toNumber(callFrame));