Changeset 51978 in webkit

Timestamp:

Dec 10, 2009 7:42:33 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-12-10 Adam Barth <​abarth@webkit.org>

No review, rolling out r51975.
​http://trac.webkit.org/changeset/51975

• 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):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITStubs.cpp (modified) (1 diff)
• runtime/JSString.h (modified) (4 diffs)
• runtime/Operations.cpp (modified) (1 diff)
• runtime/Operations.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-12-10  Adam Barth  <abarth@webkit.org>
+
+        No review, rolling out r51975.
+        http://trac.webkit.org/changeset/51975
+
+        * 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):
+
 2009-12-10  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -1034 +1034 @@
     JSValue v1 = stackFrame.args[0].jsValue();
     JSValue v2 = stackFrame.args[1].jsValue();
-    CallFrame* callFrame = stackFrame.callFrame;
-
-    if (v1.isString()) {
-        JSValue result = v2.isString()
-            ? jsString(callFrame, asString(v1), asString(v2))
-            : jsString(callFrame, asString(v1), v2.toString(callFrame));
+
+    double left;
+    double right = 0.0;
+
+    bool rightIsNumber = v2.getNumber(right);
+    if (rightIsNumber && v1.getNumber(left))
+        return JSValue::encode(jsNumber(stackFrame.globalData, left + right));
+    
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    bool leftIsString = v1.isString();
+    if (leftIsString && v2.isString()) {
+        JSValue result = jsString(callFrame, asString(v1), asString(v2));
         CHECK_FOR_EXCEPTION_AT_END();
         return JSValue::encode(result);
     }
 
-    double left = 0.0, right;
-    if (v1.getNumber(left) && v2.getNumber(right))
-        return JSValue::encode(jsNumber(stackFrame.globalData, left + right));
+    if (rightIsNumber & leftIsString) {
+        RefPtr<UString::Rep> value = v2.isInt32() ?
+            concatenate(asString(v1)->value(callFrame).rep(), v2.asInt32()) :
+            concatenate(asString(v1)->value(callFrame).rep(), right);
+
+        if (UNLIKELY(!value)) {
+            throwOutOfMemoryError(callFrame);
+            VM_THROW_EXCEPTION();
+        }
+        return JSValue::encode(jsString(stackFrame.globalData, value.release()));
+    }
 
     // All other cases are pretty uncommon

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
@@ -285 +259 @@
         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)
         {
@@ -296 +265 @@
                     m_fibers[index++] = jsString->m_fibers[i].ref();
             } else
-                appendStringInConstruct(index, jsString->string());
+                m_fibers[index++] = Rope::Fiber(jsString->string().rep()->ref());
         }
 
@@ -343 +312 @@
 
         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);
     };

trunk/JavaScriptCore/runtime/Operations.cpp

@@ -55 +55 @@
     JSValue p2 = v2.toPrimitive(callFrame);
 
-    if (p1.isString()) {
-        return p2.isString()
-            ? jsString(callFrame, asString(p1), asString(p2))
-            : jsString(callFrame, asString(p1), p2.toString(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 (p2.isString())
-        return jsString(callFrame, p1.toString(callFrame), asString(p2));
 
     return jsNumber(callFrame, p1.toNumber(callFrame) + p2.toNumber(callFrame));

trunk/JavaScriptCore/runtime/Operations.h

@@ -38 +38 @@
     ALWAYS_INLINE JSValue jsString(ExecState* exec, JSString* s1, JSString* s2)
     {
-        if (!s1->length())
-            return s2;
-        if (!s2->length())
-            return s1;
-
         unsigned ropeLength = s1->ropeLength() + s2->ropeLength();
         JSGlobalData* globalData = &exec->globalData();
@@ -55 +50 @@
         rope->append(index, s1);
         rope->append(index, s2);
-        ASSERT(index == ropeLength);
-        return new (globalData) JSString(globalData, rope.release());
-    }
-
-    ALWAYS_INLINE JSValue jsString(ExecState* exec, const UString& u1, JSString* s2)
-    {
-        unsigned ropeLength = 1 + s2->ropeLength();
-        JSGlobalData* globalData = &exec->globalData();
-
-        if (ropeLength <= JSString::s_maxInternalRopeLength)
-            return new (globalData) JSString(globalData, ropeLength, u1, s2);
-
-        unsigned index = 0;
-        RefPtr<JSString::Rope> rope = JSString::Rope::createOrNull(ropeLength);
-        if (UNLIKELY(!rope))
-            return throwOutOfMemoryError(exec);
-        rope->append(index, u1);
-        rope->append(index, s2);
-        ASSERT(index == ropeLength);
-        return new (globalData) JSString(globalData, rope.release());
-    }
-
-    ALWAYS_INLINE JSValue jsString(ExecState* exec, JSString* s1, const UString& u2)
-    {
-        unsigned ropeLength = s1->ropeLength() + 1;
-        JSGlobalData* globalData = &exec->globalData();
-
-        if (ropeLength <= JSString::s_maxInternalRopeLength)
-            return new (globalData) JSString(globalData, ropeLength, s1, u2);
-
-        unsigned index = 0;
-        RefPtr<JSString::Rope> rope = JSString::Rope::createOrNull(ropeLength);
-        if (UNLIKELY(!rope))
-            return throwOutOfMemoryError(exec);
-        rope->append(index, s1);
-        rope->append(index, u2);
         ASSERT(index == ropeLength);
         return new (globalData) JSString(globalData, rope.release());
@@ -289 +248 @@
     ALWAYS_INLINE JSValue jsAdd(CallFrame* callFrame, JSValue v1, JSValue v2)
     {
-        double left = 0.0, right;
-        if (v1.getNumber(left), v2.getNumber(right))
+        double left;
+        double right = 0.0;
+
+        bool rightIsNumber = v2.getNumber(right);
+        if (rightIsNumber && v1.getNumber(left))
             return jsNumber(callFrame, left + right);
         
-        if (v1.isString()) {
-            return v2.isString()
-                ? jsString(callFrame, asString(v1), asString(v2))
-                : jsString(callFrame, asString(v1), v2.toString(callFrame));
+        bool leftIsString = v1.isString();
+        if (leftIsString && v2.isString()) {
+            if (!asString(v1)->length())
+                return asString(v2);
+            if (!asString(v2)->length())
+                return asString(v1);
+            return jsString(callFrame, asString(v1), asString(v2));
+        }
+
+        if (rightIsNumber & leftIsString) {
+            RefPtr<UString::Rep> value = v2.isInt32() ?
+                concatenate(asString(v1)->value(callFrame).rep(), v2.asInt32()) :
+                concatenate(asString(v1)->value(callFrame).rep(), right);
+
+            if (!value)
+                return throwOutOfMemoryError(callFrame);
+            return jsString(callFrame, value.release());
         }