Changeset 37697 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Oct 18, 2008, 10:17:49 PM (17 years ago)

Author:

Darin Adler

Message:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Oliver Hunt.

• fix assertions I introduced with my casting changes

These were showing up as failures in the JavaScriptCore tests.

• VM/Machine.cpp: (JSC::Machine::cti_op_instanceof): Remove the bogus asCell casting that was at the top of the function, and instead cast at the point of use. (JSC::Machine::cti_op_construct_NotJSConstruct): Moved the cast to object after checking the construct type.

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -4541 +4541 @@
     JSValuePtr baseVal = ARG_src2;
     JSValuePtr proto = ARG_src3;
-    JSCell* valueCell = asCell(value);
-    JSCell* baseCell = asCell(baseVal);
-    JSCell* protoCell = asCell(proto);
 
     // at least one of these checks must have failed to get to the slow case
-    ASSERT(JSImmediate::isAnyImmediate(valueCell, baseCell, protoCell) 
-           || !valueCell->isObject() || !baseCell->isObject() || !protoCell->isObject() 
-           || (baseCell->structureID()->typeInfo().flags() & (ImplementsHasInstance | OverridesHasInstance)) != ImplementsHasInstance);
+    ASSERT(JSImmediate::isAnyImmediate(value, baseVal, proto) 
+           || !value->isObject() || !baseVal->isObject() || !proto->isObject() 
+           || (asObject(baseVal)->structureID()->typeInfo().flags() & (ImplementsHasInstance | OverridesHasInstance)) != ImplementsHasInstance);
 
     if (!baseVal->isObject()) {
@@ -4559 +4556 @@
     }
 
-    if (!baseCell->structureID()->typeInfo().implementsHasInstance())
+    if (!asObject(baseVal)->structureID()->typeInfo().implementsHasInstance())
         return jsBoolean(false);
 
@@ -4570 +4567 @@
         return jsBoolean(false);
 
-    JSValuePtr result = jsBoolean(asObject(baseCell)->hasInstance(callFrame, valueCell, protoCell));
+    JSValuePtr result = jsBoolean(asObject(baseVal)->hasInstance(callFrame, value, proto));
     VM_CHECK_EXCEPTION_AT_END();
 
@@ -4931 +4928 @@
     ConstructType constructType = constrVal->getConstructData(constructData);
 
-    JSObject* constructor = asObject(constrVal);
-
     if (constructType == ConstructTypeHost) {
+        JSObject* constructor = asObject(constrVal);
+
         if (*ARG_profilerReference)
             (*ARG_profilerReference)->willExecute(callFrame, constructor);