Changeset 155735 in webkit for trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

Timestamp:

Sep 13, 2013, 5:28:57 PM (12 years ago)

Author:

[email protected]

Message:

FTL JIT broke after r155711
​https://bugs.webkit.org/show_bug.cgi?id=121332

Reviewed by Geoffrey Garen.

Fixed OSR entry to use the local variable's index instead of its VirtualRegister.
Initialized ExitArgumentForOperand::m_operand to InvalidVirtualRegister instead of -1.
Fixed compileCallOrConstruct() to update locals on callframe going down.
Fixed prepareOSREntry() to grow stack down if needed.

• ftl/FTLExitArgumentForOperand.h:

(JSC::FTL::ExitArgumentForOperand::ExitArgumentForOperand):

• ftl/FTLLink.cpp:

(JSC::FTL::link):

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compileExtractOSREntryLocal):
(JSC::FTL::LowerDFGToLLVM::compileCallOrConstruct):

• ftl/FTLOSREntry.cpp:

(JSC::FTL::prepareOSREntry):

File:

• trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

@@ -78 +78 @@
         scratch[local] = JSValue::encode(values.local(local));
     
-    unsigned stackFrameSize = entryCodeBlock->m_numCalleeRegisters;
-    if (!vm.interpreter->stack().grow(&exec->registers()[stackFrameSize])) {
+    int stackFrameSize = entryCodeBlock->m_numCalleeRegisters;
+    if (!vm.interpreter->stack().grow(&exec->registers()[localToOperand(stackFrameSize)])) {
         if (Options::verboseOSR())
             dataLog("    OSR failed bcause stack growth failed.\n");