Changeset 36604 in webkit for trunk/JavaScriptCore

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):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (2 diffs)
• VM/CodeGenerator.h (modified) (1 diff)
• VM/ExceptionHelpers.cpp (modified) (4 diffs)
• VM/ExceptionHelpers.h (modified) (1 diff)
• VM/Machine.cpp (modified) (2 diffs)
• VM/Machine.h (modified) (2 diffs)
• kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+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):
+
 2008-09-17  Gavin Barraclough  <[email protected]>
 

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -1110 +1110 @@
 }
 
-RegisterID* CodeGenerator::emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode* argumentsNode)
+RegisterID* CodeGenerator::emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
 {
     ASSERT(func->refCount());
@@ -1130 +1130 @@
     }
 
+    emitExpressionInfo(divot, startOffset, endOffset);
     emitGetById(funcProto.get(), func, globalExec()->propertyNames().prototype);
 
+    emitExpressionInfo(divot, startOffset, endOffset);
     emitOpcode(op_construct);
     instructions().append(dst->index());

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -281 +281 @@
         RegisterID* emitEnd(RegisterID* src) { return emitUnaryNoDstOp(op_end, src); }
 
-        RegisterID* emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode*);
+        RegisterID* emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
 
         PassRefPtr<LabelID> emitLabel(LabelID*);

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;

trunk/JavaScriptCore/VM/ExceptionHelpers.h

@@ -43 +43 @@
     JSValue* createUndefinedVariableError(ExecState*, const Identifier&, const Instruction*, CodeBlock*);
     JSNotAnObjectErrorStub* createNotAnObjectErrorStub(ExecState*, bool isNull);
-    JSValue* createInvalidParamError(ExecState*, const char* op, JSValue*, const Instruction*, CodeBlock*);
-    JSValue* createNotAConstructorError(ExecState*, JSValue*, const Instruction*, CodeBlock*);
+    JSObject* createInvalidParamError(ExecState*, const char* op, JSValue*, const Instruction*, CodeBlock*);
+    JSObject* createNotAConstructorError(ExecState*, JSValue*, const Instruction*, CodeBlock*);
     JSValue* createNotAFunctionError(ExecState*, JSValue*, const Instruction*, CodeBlock*);
     JSObject* createNotAnObjectError(ExecState*, JSNotAnObjectErrorStub*, const Instruction*, CodeBlock*);

trunk/JavaScriptCore/VM/Machine.cpp

@@ -476 +476 @@
     exceptionValue = createUndefinedVariableError(exec, ident, vPC, codeBlock);
     return false;
+}
+
+#if HAVE(COMPUTED_GOTO)
+Opcode Machine::s_opcodeTable[numOpcodeIDs];
+#endif
+
+Opcode Machine::getOpcode(OpcodeID id)
+{
+    #if HAVE(COMPUTED_GOTO)
+        return s_opcodeTable[id];
+    #else
+        return id;
+    #endif
 }
 
@@ -1388 +1401 @@
     if (flag == InitializeAndReturn) {
         #if HAVE(COMPUTED_GOTO)
-            #define ADD_OPCODE(id) m_opcodeTable[id] = &&id;
+            #define ADD_OPCODE(id) s_opcodeTable[id] = &&id;
                 FOR_EACH_OPCODE_ID(ADD_OPCODE);
             #undef ADD_OPCODE

trunk/JavaScriptCore/VM/Machine.h

@@ -75 +75 @@
         RegisterFile& registerFile() { return m_registerFile; }
         
-        Opcode getOpcode(OpcodeID id)
-        {
-            #if HAVE(COMPUTED_GOTO)
-                return m_opcodeTable[id];
-            #else
-                return id;
-            #endif
-        }
+        static Opcode getOpcode(OpcodeID id);
 
         OpcodeID getOpcodeID(Opcode opcode)
@@ -300 +293 @@
 
 #if HAVE(COMPUTED_GOTO)
-        Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling
+        static Opcode s_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling
         HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
 #endif

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -408 +408 @@
 {
     RefPtr<RegisterID> r0 = generator.emitNode(m_expr.get());
-    generator.emitExpressionInfo(m_divot, m_startOffset, m_endOffset);
-    return generator.emitConstruct(generator.finalDestination(dst, r0.get()), r0.get(), m_args.get());
+    return generator.emitConstruct(generator.finalDestination(dst, r0.get()), r0.get(), m_args.get(), m_divot, m_startOffset, m_endOffset);
 }
 
@@ -799 +798 @@
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
     RefPtr<RegisterID> src2 = generator.emitNode(m_expr2.get());
+
+    generator.emitExpressionInfo(m_divot, m_startOffset, m_endOffset);
     RegisterID* src2Prototype = generator.emitGetById(generator.newTemporary(), src2.get(), generator.globalExec()->propertyNames().prototype);
+
     generator.emitExpressionInfo(m_divot, m_startOffset, m_endOffset);
     return generator.emitInstanceOf(generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), src2Prototype);