Changeset 96178 in webkit
- Timestamp:
- Sep 27, 2011 6:52:21 PM (13 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r96175 r96178 1 2011-09-27 Gavin Barraclough <barraclough@apple.com> 2 3 DFG JIT - merge changes between 95905 - 96175 4 https://bugs.webkit.org/show_bug.cgi?id=68963 5 6 Reviewed by Sam Weinig. 7 8 Merge missing changes from bug#68677, bug#68784, bug#68785. 9 10 * dfg/DFGJITCompiler32_64.cpp: 11 (JSC::DFG::JITCompiler::exitSpeculativeWithOSR): 12 (JSC::DFG::JITCompiler::compileEntry): 13 (JSC::DFG::JITCompiler::compileBody): 14 * dfg/DFGSpeculativeJIT32_64.cpp: 15 (JSC::DFG::SpeculativeJIT::compile): 16 1 17 2011-09-27 Gavin Barraclough <barraclough@apple.com> 2 18 -
trunk/Source/JavaScriptCore/dfg/DFGJITCompiler32_64.cpp
r96175 r96178 96 96 exit.dump(stderr); 97 97 #endif 98 #if ENABLE(DFG_JIT_BREAK_ON_SPECULATION_FAILURE)99 breakpoint();100 #endif101 102 98 #if ENABLE(DFG_VERBOSE_SPECULATION_FAILURE) 103 99 SpeculationFailureDebugInfo* debugInfo = new SpeculationFailureDebugInfo; … … 106 102 107 103 debugCall(debugOperationPrintSpeculationFailure, debugInfo); 104 #endif 105 106 #if ENABLE(DFG_JIT_BREAK_ON_SPECULATION_FAILURE) 107 breakpoint(); 108 108 #endif 109 109 … … 523 523 preserveReturnAddressAfterCall(GPRInfo::regT2); 524 524 emitPutToCallFrameHeader(GPRInfo::regT2, RegisterFile::ReturnPC); 525 526 addPtr(Imm32(1), AbsoluteAddress(codeBlock()->addressOfSpeculativeSuccessCounter()));527 525 } 528 526 … … 534 532 breakpoint(); 535 533 #endif 534 535 addPtr(Imm32(1), AbsoluteAddress(codeBlock()->addressOfSpeculativeSuccessCounter())); 536 536 537 537 Label speculativePathBegin = label(); -
trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
r96175 r96178 602 602 603 603 case GetLocal: { 604 PredictedType prediction = m_jit.graph().getPrediction(node.local()); 605 606 // If we have no prediction for this local, then don't attempt to compile. 607 if (prediction == PredictNone) { 608 terminateSpeculativeExecution(); 609 break; 610 } 611 604 612 GPRTemporary result(this); 605 PredictedType prediction = m_jit.graph().getPrediction(node.local());606 613 VirtualRegister virtualRegister = node.virtualRegister(); 607 614 m_jit.load32(JITCompiler::payloadFor(node.local()), result.gpr());
Note: See TracChangeset
for help on using the changeset viewer.