Changeset 41999 in webkit for trunk/JavaScriptCore

Timestamp:

Mar 25, 2009, 7:39:38 PM (16 years ago)

Author:

[email protected]

Message:

Fix exception handling for instanceof in the interpreter.

Reviewed by Geoff Garen

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-03-25  Oliver Hunt  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Fix exception handling for instanceof in the interpreter.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+
 2009-03-25  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -1733 +1733 @@
 
         JSObject* baseObj = asObject(baseVal);
-        callFrame[dst] = jsBoolean(baseObj->structure()->typeInfo().implementsHasInstance() ? baseObj->hasInstance(callFrame, callFrame[value].jsValue(callFrame), callFrame[baseProto].jsValue(callFrame)) : false);
+        if (baseObj->structure()->typeInfo().implementsHasInstance()) {
+            bool result = baseObj->hasInstance(callFrame, callFrame[value].jsValue(callFrame), callFrame[baseProto].jsValue(callFrame));
+            CHECK_FOR_EXCEPTION();
+            callFrame[dst] = jsBoolean(result);
+        } else
+            callFrame[dst] = jsBoolean(false);
 
         vPC += 5;