Changeset 36604 in webkit for trunk/JavaScriptCore/VM/ExceptionHelpers.cpp

Timestamp:

Sep 17, 2008, 11:20:42 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-17 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Bug 20876: REGRESSION (r36417, r36427): fast/js/exception-expression-offset.html fails
<​https://bugs.webkit.org/show_bug.cgi?id=20876>

r36417 and r36427 caused an get_by_id opcode to be emitted before the
instanceof and construct opcodes, in order to enable inline caching of
the prototype property. Unfortunately, this regressed some tests dealing
with exceptions thrown by 'instanceof' and the 'new' operator. We fix
these problems by detecting whether an "is not an object" exception is
thrown before op_instanceof or op_construct, and emit the proper
exception in those cases.

• VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitConstruct):
• VM/CodeGenerator.h:
• VM/ExceptionHelpers.cpp: (JSC::createInvalidParamError): (JSC::createNotAConstructorError): (JSC::createNotAnObjectError):
• VM/ExceptionHelpers.h:
• VM/Machine.cpp: (JSC::Machine::getOpcode): (JSC::Machine::privateExecute):
• VM/Machine.h:
• kjs/nodes.cpp: (JSC::NewExprNode::emitCode): (JSC::InstanceOfNode::emitCode):

File:

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

trunk/JavaScriptCore/VM/ExceptionHelpers.cpp

@@ -32 +32 @@
 #include "CodeBlock.h"
 #include "ExecState.h"
-#include "nodes.h"
 #include "JSObject.h"
 #include "JSNotAnObject.h"
+#include "Machine.h"
+#include "nodes.h"
 
 namespace JSC {
@@ -148 +149 @@
 }
 
-JSValue* createInvalidParamError(ExecState* exec, const char* op, JSValue* value, const Instruction* vPC, CodeBlock* codeBlock)
+JSObject* createInvalidParamError(ExecState* exec, const char* op, JSValue* value, const Instruction* vPC, CodeBlock* codeBlock)
 {
     UString message = "not a valid argument for '";
@@ -166 +167 @@
 }
 
-JSValue* createNotAConstructorError(ExecState* exec, JSValue* value, const Instruction* vPC, CodeBlock* codeBlock)
+JSObject* createNotAConstructorError(ExecState* exec, JSValue* value, const Instruction* vPC, CodeBlock* codeBlock)
 {
     int startOffset = 0;
@@ -208 +209 @@
 JSObject* createNotAnObjectError(ExecState* exec, JSNotAnObjectErrorStub* error, const Instruction* vPC, CodeBlock* codeBlock)
 {
+    if (vPC[8].u.opcode == Machine::getOpcode(op_instanceof))
+        return createInvalidParamError(exec, "instanceof", error->isNull() ? jsNull() : jsUndefined(), vPC, codeBlock);
+    if (vPC[8].u.opcode == Machine::getOpcode(op_construct))
+        return createNotAConstructorError(exec, error->isNull() ? jsNull() : jsUndefined(), vPC, codeBlock);
+
     int startOffset = 0;
     int endOffset = 0;