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

Timestamp:

Sep 23, 2010, 11:24:21 PM (15 years ago)

Author:

Csaba Osztrogonác

Message:

2010-09-23 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r68223.
​http://trac.webkit.org/changeset/68223
​https://bugs.webkit.org/show_bug.cgi?id=46448

It broke 2-3 tests on bots (Requested by Ossy on #webkit).

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump):
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::registerFor): (JSC::BytecodeGenerator::constRegisterFor): (JSC::BytecodeGenerator::emitNewFunction):
• bytecompiler/BytecodeGenerator.h:
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JIT.h:
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_new_func): (JSC::JIT::emit_op_init_arguments):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::emit_op_new_func): (JSC::JIT::emit_op_init_arguments):
• parser/Nodes.h:

File:

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

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3613 +3613 @@
         int dst = vPC[1].u.operand;
         int func = vPC[2].u.operand;
-        int shouldCheck = vPC[3].u.operand;
-
-        if (!shouldCheck || !callFrame->r(dst).jsValue())
-            callFrame->r(dst) = JSValue(codeBlock->functionDecl(func)->make(callFrame, callFrame->scopeChain()));
+
+        callFrame->r(dst) = JSValue(codeBlock->functionDecl(func)->make(callFrame, callFrame->scopeChain()));
 
         vPC += OPCODE_LENGTH(op_new_func);
@@ -4140 +4138 @@
         NEXT_INSTRUCTION();
     }
-    DEFINE_OPCODE(op_init_lazy_reg) {
-        /* init_lazy_reg dst(r)
-
-           Initialises dst(r) to JSValue().
+    DEFINE_OPCODE(op_init_arguments) {
+        /* create_arguments dst(r)
+
+           Initialises 'arguments' to JSValue().
 
            This opcode appears only at the beginning of a code block.
@@ -4150 +4148 @@
 
         callFrame->r(dst) = JSValue();
-        vPC += OPCODE_LENGTH(op_init_lazy_reg);
+        callFrame->r(unmodifiedArgumentsRegister(dst)) = JSValue();
+        vPC += OPCODE_LENGTH(op_init_arguments);
         NEXT_INSTRUCTION();
     }