Changeset 35830 in webkit for trunk/JavaScriptCore/kjs/operations.cpp

Timestamp:

Aug 18, 2008, 9:39:04 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

• eliminate JSValue::type()

This will make it slightly easier to change the JSImmediate design without
having to touch so many call sites.

SunSpider says this change is a wash (looked like a slight speedup, but not
statistically significant).

• API/JSStringRef.cpp: Removed include of JSType.h.
• API/JSValueRef.cpp: Removed include of JSType.h. (JSValueGetType): Replaced use of JSValue::type() with JSValue::is functions.

• JavaScriptCore.exp: Updated.

• VM/JSPropertyNameIterator.cpp: Removed type() implementation. (KJS::JSPropertyNameIterator::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.
• VM/JSPropertyNameIterator.h: Ditto.

• VM/Machine.cpp: (KJS::fastIsNumber): Updated for name change. (KJS::fastToInt32): Ditto. (KJS::fastToUInt32): Ditto. (KJS::jsAddSlowCase): Updated toPrimitive caller for change from JSType to PreferredPrimitiveType. (KJS::jsAdd): Replaced calls to JSValue::type() with calls to JSValue::isString(). (KJS::jsTypeStringForValue): Replaced calls to JSValue::type() with multiple calls to JSValue::is -- we could make this a virtual function instead if we want to have faster performance. (KJS::Machine::privateExecute): Renamed JSImmediate::toTruncatedUInt32 to JSImmediate::getTruncatedUInt32 for consistency with other functions. Changed two calls of JSValue::type() to JSValue::isString().

• kjs/GetterSetter.cpp: (KJS::GetterSetter::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType. (KJS::GetterSetter::isGetterSetter): Added.
• kjs/GetterSetter.h:

• kjs/JSCell.cpp: (KJS::JSCell::isString): Added. (KJS::JSCell::isGetterSetter): Added. (KJS::JSCell::isObject): Added.

• kjs/JSCell.h: Eliminated type function. Added isGetterSetter. Made isString and isObject virtual. Changed toPrimitive to take PreferredPrimitiveType argument instead of JSType. (KJS::JSCell::isNumber): Use Heap::isNumber for faster performance. (KJS::JSValue::isGetterSetter): Added. (KJS::JSValue::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.

• kjs/JSImmediate.h: Removed JSValue::type() and replaced JSValue::toTruncatedUInt32 with JSValue::getTruncatedUInt32. (KJS::JSImmediate::isEitherImmediate): Added.

• kjs/JSNotAnObject.cpp: (KJS::JSNotAnObject::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.
• kjs/JSNotAnObject.h: Ditto.
• kjs/JSNumberCell.cpp: (KJS::JSNumberCell::toPrimitive): Ditto.
• kjs/JSNumberCell.h: (KJS::JSNumberCell::toInt32): Renamed from fastToInt32. There's no other "slow" version of this once you have a JSNumberCell, so there's no need for "fast" in the name. It's a feature that this hides the base class toInt32, which does the same job less efficiently (and has an additional ExecState argument). (KJS::JSNumberCell::toUInt32): Ditto.

• kjs/JSObject.cpp: (KJS::callDefaultValueFunction): Use isGetterSetter instead of type. (KJS::JSObject::getPrimitiveNumber): Use PreferredPrimitiveType. (KJS::JSObject::defaultValue): Ditto. (KJS::JSObject::defineGetter): Use isGetterSetter. (KJS::JSObject::defineSetter): Ditto. (KJS::JSObject::lookupGetter): Ditto. (KJS::JSObject::lookupSetter): Ditto. (KJS::JSObject::toNumber): Use PreferredPrimitiveType. (KJS::JSObject::toString): Ditto. (KJS::JSObject::isObject): Added.

• kjs/JSObject.h: (KJS::JSObject::inherits): Call the isObject from JSCell; it's now hidden by our override of isObject. (KJS::JSObject::getOwnPropertySlotForWrite): Use isGetterSetter instead of type. (KJS::JSObject::getOwnPropertySlot): Ditto. (KJS::JSObject::toPrimitive): Use PreferredPrimitiveType.

• kjs/JSString.cpp: (KJS::JSString::toPrimitive): Use PreferredPrimitiveType. (KJS::JSString::isString): Added.
• kjs/JSString.h: Ditto.

• kjs/JSValue.h: Removed type(), added isGetterSetter(). Added PreferredPrimitiveType enum and used it as the argument for the toPrimitive function. (KJS::JSValue::getBoolean): Simplified a bit an removed a branch.

• kjs/collector.cpp: (KJS::typeName): Changed to use JSCell::is functions instead of calling JSCell::type.

• kjs/collector.h: (KJS::Heap::isNumber): Renamed from fastIsNumber.

• kjs/nodes.h: Added now-needed include of JSType, since the type is used here to record types of values in the tree.

• kjs/operations.cpp: (KJS::equal): Rewrote to no longer depend on type(). (KJS::strictEqual): Ditto.

JavaScriptGlue:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

• eliminate JSValue::type()

• JSUtils.cpp: (KJSValueToCFTypeInternal): Replaced uses of JSValue::type() with JSValue::is functions.
• UserObjectImp.cpp: (UserObjectImp::getOwnPropertySlot): Ditto. (UserObjectImp::toPrimitive): Take PreferredPrimitiveType argument instead of JSType argument.
• UserObjectImp.h: Ditto.

WebCore:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

• eliminate JSValue::type()

• bridge/c/c_instance.cpp: (KJS::Bindings::CInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean, since that's never passed.
• bridge/c/c_instance.h: Ditto.

• bridge/c/c_utility.cpp: (KJS::Bindings::convertValueToNPVariant): Use JSValue::is functions instead of JSValue::type(). Removed unneeded code to handle "unspecified".

• bridge/jni/jni_instance.cpp: (JavaInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean.
• bridge/jni/jni_instance.h: Ditto.

• bridge/jni/jni_jsobject.mm: (JavaJSObject::convertValueToJObject): Use JSValue::is functions instead of JSValue::type().

• bridge/objc/objc_instance.h: Take PreferredPrimitiveType argument instead of JSType argument. Removed unused argument.
• bridge/objc/objc_instance.mm: (ObjcInstance::getValueOfUndefinedField): Removed unused argument. (ObjcInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean and another dead code path for unknown types.

• bridge/objc/objc_runtime.h: Take PreferredPrimitiveType argument instead of JSType argument. Removed override of type() that caused the fallback object to return "UndefinedType" when there is no invokeUndefinedMethodFromWebScript:withArguments: method defined. That didn't accomplish much, since most checks for undefined don't ever call type().
• bridge/objc/objc_runtime.mm: (ObjcFallbackObjectImp::defaultValue): Ditto.

• bridge/qt/qt_instance.cpp: (KJS::Bindings::QtInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean.
• bridge/qt/qt_instance.h: Ditto.

• bridge/runtime.h: (KJS::Bindings::Instance::getValueOfUndefinedField): Removed unsed argument.
• bridge/runtime_object.cpp: (RuntimeObjectImp::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument.
• bridge/runtime_object.h: Ditto.

WebKit/mac:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

• eliminate JSValue::type()

• WebView/WebView.mm: (aeDescFromJSValue): Rewrite to use the JSValue::is functions instead of a switch on JSValue::type().

LayoutTests:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

• added a test since I had to rewrite the == and === operators

• fast/js/equality-expected.txt: Added.
• fast/js/equality.html: Added.
• fast/js/resources/equality.js: Added.

File:

• trunk/JavaScriptCore/kjs/operations.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/operations.cpp

@@ -37 +37 @@
 
 // ECMA 11.9.3
-bool equal(ExecState *exec, JSValue *v1, JSValue *v2)
+bool equal(ExecState* exec, JSValue* v1, JSValue* v2)
 {
-    JSType t1 = v1->type();
-    JSType t2 = v2->type();
-    
-    if (t1 != t2) {
-        if (t1 == UndefinedType)
-            t1 = NullType;
-        if (t2 == UndefinedType)
-            t2 = NullType;
-        
-        if (t1 == BooleanType)
-            t1 = NumberType;
-        if (t2 == BooleanType)
-            t2 = NumberType;
-        
-        if (t1 == NumberType && t2 == StringType) {
-            // use toNumber
-        } else if (t1 == StringType && t2 == NumberType)
-            t1 = NumberType;
-            // use toNumber
-        else {
-            if ((t1 == StringType || t1 == NumberType) && t2 == ObjectType) {
-                v2 = v2->toPrimitive(exec);
-                if (exec->hadException())
-                    return false;
-                return equal(exec, v1, v2);
-            }
-            if (t1 == NullType && t2 == ObjectType)
-                return static_cast<JSObject *>(v2)->masqueradeAsUndefined();
-            if (t1 == ObjectType && (t2 == StringType || t2 == NumberType)) {
-                v1 = v1->toPrimitive(exec);
-                if (exec->hadException())
-                    return false;
-                return equal(exec, v1, v2);
-            }
-            if (t1 == ObjectType && t2 == NullType)
-                return static_cast<JSObject *>(v1)->masqueradeAsUndefined();
-            if (t1 != t2)
-                return false;
-        }
+startOver:
+    if (JSImmediate::areBothImmediateNumbers(v1, v2))
+        return v1 == v2;
+
+    if (v1->isNumber() && v2->isNumber())
+        return v1->uncheckedGetNumber() == v2->uncheckedGetNumber();
+
+    bool s1 = v1->isString();
+    bool s2 = v2->isString();
+    if (s1 && s2)
+        return static_cast<JSString*>(v1)->value() == static_cast<JSString*>(v2)->value();
+
+    if (v1->isUndefinedOrNull()) {
+        if (v2->isUndefinedOrNull())
+            return true;
+        if (!v2->isObject())
+            return false;
+        return static_cast<JSObject*>(v2)->masqueradeAsUndefined();
     }
-    
-    if (t1 == UndefinedType || t1 == NullType)
-        return true;
-    
-    if (t1 == NumberType) {
+
+    if (v2->isUndefinedOrNull()) {
+        if (!v1->isObject())
+            return false;
+        return static_cast<JSObject*>(v1)->masqueradeAsUndefined();
+    }
+
+    if (v1->isObject()) {
+        if (v2->isObject())
+            return v1 == v2;
+        JSValue* p1 = v1->toPrimitive(exec);
+        if (exec->hadException())
+            return false;
+        v1 = p1;
+        goto startOver;
+    }
+
+    if (v2->isObject()) {
+        JSValue* p2 = v2->toPrimitive(exec);
+        if (exec->hadException())
+            return false;
+        v2 = p2;
+        goto startOver;
+    }
+
+    if (s1 || s2) {
         double d1 = v1->toNumber(exec);
         double d2 = v2->toNumber(exec);
         return d1 == d2;
     }
-    
-    if (t1 == StringType)
-        return static_cast<JSString*>(v1)->value() == static_cast<JSString*>(v2)->value();
-    
-    if (t1 == BooleanType)
-        return v1->toBoolean(exec) == v2->toBoolean(exec);
-    
-    // types are Object
+
+    if (v1->isBoolean()) {
+        if (v2->isNumber())
+            return v1->getBoolean() == v2->uncheckedGetNumber();
+    } else if (v2->isBoolean()) {
+        if (v1->isNumber())
+            return v1->uncheckedGetNumber() == v2->getBoolean();
+    }
+
     return v1 == v2;
 }
@@ -101 +102 @@
 bool strictEqual(JSValue* v1, JSValue* v2)
 {
-    JSType t1 = v1->type();
-    JSType t2 = v2->type();
-    
-    if (t1 != t2)
-        return false;
+    if (JSImmediate::isEitherImmediate(v1, v2)) {
+        if (v1 == v2)
+            return true;
 
-    if (t1 == NumberType)
-        return v1->getNumber() == v2->getNumber();
-    
-    if (t1 == StringType)
-        return static_cast<JSString*>(v1)->value() == static_cast<JSString*>(v2)->value();
-    
-    return v1 == v2; // covers object, boolean, null, and undefined types
+        // The reason we can't just return false here is that 0 === -0,
+        // and while the former is an immediate number, the latter is not.
+        if (v1 == JSImmediate::from(0))
+            return !JSImmediate::isImmediate(v2)
+                && static_cast<JSCell*>(v2)->isNumber()
+                && static_cast<JSNumberCell*>(v2)->value() == 0;
+        return v2 == JSImmediate::from(0)
+            && !JSImmediate::isImmediate(v1)
+            && static_cast<JSCell*>(v1)->isNumber()
+            && static_cast<JSNumberCell*>(v1)->value() == 0;
+    }
+
+    if (static_cast<JSCell*>(v1)->isNumber())
+        return static_cast<JSCell*>(v2)->isNumber()
+            && static_cast<JSNumberCell*>(v1)->value() == static_cast<JSNumberCell*>(v2)->value();
+
+    if (static_cast<JSCell*>(v1)->isString())
+        return static_cast<JSCell*>(v2)->isString()
+            && static_cast<JSString*>(v1)->value() == static_cast<JSString*>(v2)->value();
+
+    return v1 == v2;
 }