Changeset 60105 in webkit for trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

Timestamp:

May 24, 2010, 5:44:17 PM (15 years ago)

Author:

[email protected]

Message:

Reverting 60075 & 60084, these broke the interpreter.

Reviewed by NOBODY (revert).

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):
(JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset):

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

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

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::emitGetByIdExceptionInfo):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

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

(JSC::JIT::compileOpConstructSetupArgs):
(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITCall32_64.cpp:

(JSC::JIT::compileOpConstructSetupArgs):
(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::emit_op_neq_null):
(JSC::JIT::emit_op_convert_this):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):
(JSC::JITThunks::hostFunctionStub):

• jit/JITStubs.h:

(JSC::JITThunks::ctiNativeCall):
(JSC::):

• runtime/ExceptionHelpers.cpp:

(JSC::createNotAnObjectError):

• runtime/Executable.h:

(JSC::NativeExecutable::create):
(JSC::NativeExecutable::NativeExecutable):

• runtime/JSFunction.cpp:
• runtime/JSFunction.h:

File:

• trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (modified) (5 diffs)

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -365 +365 @@
     ++m_nextParameterIndex;
     ++m_codeBlock->m_numParameters;
+
+    if (!isConstructor() && (functionBody->usesThis() || m_shouldEmitDebugHooks)) {
+        emitOpcode(op_convert_this);
+        instructions().append(m_thisRegister.index());
+    }
     
     for (size_t i = 0; i < parameterCount; ++i)
@@ -370 +375 @@
 
     preserveLastVar();
-
-    if (isConstructor()) {
-        RefPtr<RegisterID> func = newTemporary();
-        RefPtr<RegisterID> funcProto = newTemporary();
-
-        emitOpcode(op_get_callee);
-        instructions().append(func->index());
-        // Load prototype.
-        emitGetByIdExceptionInfo(op_create_this);
-        emitGetById(funcProto.get(), func.get(), globalData()->propertyNames->prototype);
-
-        emitOpcode(op_create_this);
-        instructions().append(m_thisRegister.index());
-        instructions().append(funcProto->index());
-    } else if (functionBody->usesThis() || m_shouldEmitDebugHooks) {
-        emitOpcode(op_convert_this);
-        instructions().append(m_thisRegister.index());
-    }
 }
 
@@ -1595 +1582 @@
     }
 
+    RefPtr<RegisterID> funcProto = newTemporary();
+
     // Generate code for arguments.
     Vector<RefPtr<RegisterID>, 16> argv;
@@ -1610 +1599 @@
     }
 
+    // Load prototype.
+    emitExpressionInfo(divot, startOffset, endOffset);
+    emitGetByIdExceptionInfo(op_construct);
+    emitGetById(funcProto.get(), func, globalData()->propertyNames->prototype);
+
     // Reserve space for call frame.
     Vector<RefPtr<RegisterID>, RegisterFile::CallFrameHeaderSize> callFrame;
@@ -1625 +1619 @@
     instructions().append(argv.size()); // argCount
     instructions().append(argv[0]->index() + argv.size() + RegisterFile::CallFrameHeaderSize); // registerOffset
+    instructions().append(funcProto->index()); // proto
+    instructions().append(argv[0]->index()); // thisRegister
     if (dst != ignoredResult()) {
         emitOpcode(op_call_put_result);