Changeset 27484 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Nov 6, 2007, 11:49:39 AM (18 years ago)

Author:

oliver

Message:

Fix previous patch to use a 3 bit shift, a 16 bit shift causes a regression in sunspider.

RS=Darin

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1708 +1708 @@
     JSType t1 = v1->type();
     JSType t2 = v2->type();
-    const unsigned bothTypes = (t1 << 16) | t2;
+    const unsigned bothTypes = (t1 << 3) | t2;
     
-    if (bothTypes == ((NumberType << 16) | NumberType))
+    if (bothTypes == ((NumberType << 3) | NumberType))
         return jsNumber(v1->toNumber(exec) + v2->toNumber(exec));
-    else if (bothTypes == ((StringType << 16) | StringType)) {
+    else if (bothTypes == ((StringType << 3) | StringType)) {
         UString value = static_cast<StringImp*>(v1)->value() + static_cast<StringImp*>(v2)->value();
         if (value.isNull())