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

Timestamp:

May 19, 2010, 9:57:20 PM (15 years ago)

Author:

[email protected]

Message:

Bug 39399 - Move responsibility for verifying constructors return objects from the caller to the callee.

Reviewed by Geoff Garen.

This is a necessary step to move object creation from caller to callee.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitReturn):
(JSC::BytecodeGenerator::emitConstruct):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::isConstructor):

• bytecompiler/NodesCodegen.cpp:

(JSC::FunctionBodyNode::emitBytecode):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):

• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::emit_op_constructor_ret):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_constructor_ret):

File:

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

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3841 +3841 @@
         NEXT_INSTRUCTION();
     }
+    DEFINE_OPCODE(op_constructor_ret) {
+        /* ret result(r)
+           
+           Return register result as the return value of the current
+           function call, writing it into the caller's expected return
+           value register. In addition, unwind one call frame and
+           restore the scope chain, code block instruction pointer and
+           register base to those of the calling function.
+        */
+
+        int result = vPC[1].u.operand;
+
+        if (callFrame->codeBlock()->needsFullScopeChain())
+            callFrame->scopeChain()->deref();
+
+        JSValue returnValue = callFrame->r(result).jsValue();
+
+        if (UNLIKELY(!returnValue.isObject()))
+            returnValue = callFrame->r(vPC[2].u.operand).jsValue();
+
+        vPC = callFrame->returnPC();
+        int dst = callFrame->returnValueRegister();
+        callFrame = callFrame->callerFrame();
+        
+        if (callFrame->hasHostCallFrameFlag())
+            return returnValue;
+
+        callFrame->r(dst) = returnValue;
+
+        NEXT_INSTRUCTION();
+    }
     DEFINE_OPCODE(op_enter) {
         /* enter
@@ -4017 +4048 @@
         exceptionValue = createNotAConstructorError(callFrame, v, vPC - callFrame->codeBlock()->instructions().begin(), callFrame->codeBlock());
         goto vm_throw;
-    }
-    DEFINE_OPCODE(op_construct_verify) {
-        /* construct_verify dst(r) override(r)
-
-           Verifies that register dst holds an object. If not, moves
-           the object in register override to register dst.
-        */
-
-        int dst = vPC[1].u.operand;
-        if (LIKELY(callFrame->r(dst).jsValue().isObject())) {
-            vPC += OPCODE_LENGTH(op_construct_verify);
-            NEXT_INSTRUCTION();
-        }
-
-        int override = vPC[2].u.operand;
-        callFrame->r(dst) = callFrame->r(override);
-
-        vPC += OPCODE_LENGTH(op_construct_verify);
-        NEXT_INSTRUCTION();
     }
     DEFINE_OPCODE(op_strcat) {