Changeset 43560 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

May 12, 2009, 2:18:44 AM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-12 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

instanceof should throw if the constructor being tested does not implement
'HasInstance" (i.e. is a function). Instead we were returning false.

• interpreter/Interpreter.cpp: (JSC::isInvalidParamForIn): (JSC::isInvalidParamForInstanceOf): (JSC::Interpreter::privateExecute):
• jit/JITStubs.cpp: (JSC::JITStubs::cti_op_instanceof):
• tests/mozilla/ecma_2/instanceof/instanceof-003.js:

Fix broken test case.

• tests/mozilla/ecma_2/instanceof/regress-7635.js:

Remove broken test case (was an exact duplicate of a test in instanceof-003.js).

LayoutTests:

2009-05-12 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Test was checked in with one test case disabled since it exposed an existing bug;
enable it now.

• fast/js/instance-of-immediates-expected.txt:
• fast/js/resources/instance-of-immediates.js:

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (3 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -318 +318 @@
 }
 
-static NEVER_INLINE bool isNotObject(CallFrame* callFrame, bool forInstanceOf, CodeBlock* codeBlock, const Instruction* vPC, JSValue value, JSValue& exceptionData)
+static NEVER_INLINE bool isInvalidParamForIn(CallFrame* callFrame, CodeBlock* codeBlock, const Instruction* vPC, JSValue value, JSValue& exceptionData)
 {
     if (value.isObject())
         return false;
-    exceptionData = createInvalidParamError(callFrame, forInstanceOf ? "instanceof" : "in" , value, vPC - codeBlock->instructions().begin(), codeBlock);
+    exceptionData = createInvalidParamError(callFrame, "in" , value, vPC - codeBlock->instructions().begin(), codeBlock);
+    return true;
+}
+
+static NEVER_INLINE bool isInvalidParamForInstanceOf(CallFrame* callFrame, CodeBlock* codeBlock, const Instruction* vPC, JSValue value, JSValue& exceptionData)
+{
+    if (value.isObject() && asObject(value)->structure()->typeInfo().implementsHasInstance())
+        return false;
+    exceptionData = createInvalidParamError(callFrame, "instanceof" , value, vPC - codeBlock->instructions().begin(), codeBlock);
     return true;
 }
@@ -1813 +1821 @@
         JSValue baseVal = callFrame[base].jsValue();
 
-        if (isNotObject(callFrame, true, callFrame->codeBlock(), vPC, baseVal, exceptionValue))
+        if (isInvalidParamForInstanceOf(callFrame, callFrame->codeBlock(), vPC, baseVal, exceptionValue))
             goto vm_throw;
 
-        JSObject* baseObj = asObject(baseVal);
-        if (baseObj->structure()->typeInfo().implementsHasInstance()) {
-            bool result = baseObj->hasInstance(callFrame, callFrame[value].jsValue(), callFrame[baseProto].jsValue());
-            CHECK_FOR_EXCEPTION();
-            callFrame[dst] = jsBoolean(result);
-        } else
-            callFrame[dst] = jsBoolean(false);
+        bool result = asObject(baseVal)->hasInstance(callFrame, callFrame[value].jsValue(), callFrame[baseProto].jsValue());
+        CHECK_FOR_EXCEPTION();
+        callFrame[dst] = jsBoolean(result);
 
         vPC += 5;
@@ -1939 +1943 @@
 
         JSValue baseVal = callFrame[base].jsValue();
-        if (isNotObject(callFrame, false, callFrame->codeBlock(), vPC, baseVal, exceptionValue))
+        if (isInvalidParamForIn(callFrame, callFrame->codeBlock(), vPC, baseVal, exceptionValue))
             goto vm_throw;