Title: [96178] trunk/Source/_javascript_Core
- Revision
- 96178
- Author
- [email protected]
- Date
- 2011-09-27 18:52:21 -0700 (Tue, 27 Sep 2011)
Log Message
DFG JIT - merge changes between 95905 - 96175
https://bugs.webkit.org/show_bug.cgi?id=68963
Reviewed by Sam Weinig.
Merge missing changes from bug#68677, bug#68784, bug#68785.
* dfg/DFGJITCompiler32_64.cpp:
(JSC::DFG::JITCompiler::exitSpeculativeWithOSR):
(JSC::DFG::JITCompiler::compileEntry):
(JSC::DFG::JITCompiler::compileBody):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96177 => 96178)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-28 01:46:08 UTC (rev 96177)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-28 01:52:21 UTC (rev 96178)
@@ -1,5 +1,21 @@
2011-09-27 Gavin Barraclough <[email protected]>
+ DFG JIT - merge changes between 95905 - 96175
+ https://bugs.webkit.org/show_bug.cgi?id=68963
+
+ Reviewed by Sam Weinig.
+
+ Merge missing changes from bug#68677, bug#68784, bug#68785.
+
+ * dfg/DFGJITCompiler32_64.cpp:
+ (JSC::DFG::JITCompiler::exitSpeculativeWithOSR):
+ (JSC::DFG::JITCompiler::compileEntry):
+ (JSC::DFG::JITCompiler::compileBody):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
+2011-09-27 Gavin Barraclough <[email protected]>
+
Get JSVALUE32_64 DFG JIT building on OS X.
https://bugs.webkit.org/show_bug.cgi?id=68961
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp (96177 => 96178)
--- trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp 2011-09-28 01:46:08 UTC (rev 96177)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp 2011-09-28 01:52:21 UTC (rev 96178)
@@ -95,10 +95,6 @@
fprintf(stderr, "OSR exit for Node @%d (bc#%u) at JIT offset 0x%x ", (int)exit.m_nodeIndex, exit.m_bytecodeIndex, debugOffset());
exit.dump(stderr);
#endif
-#if ENABLE(DFG_JIT_BREAK_ON_SPECULATION_FAILURE)
- breakpoint();
-#endif
-
#if ENABLE(DFG_VERBOSE_SPECULATION_FAILURE)
SpeculationFailureDebugInfo* debugInfo = new SpeculationFailureDebugInfo;
debugInfo->codeBlock = m_codeBlock;
@@ -107,6 +103,10 @@
debugCall(debugOperationPrintSpeculationFailure, debugInfo);
#endif
+#if ENABLE(DFG_JIT_BREAK_ON_SPECULATION_FAILURE)
+ breakpoint();
+#endif
+
#if ENABLE(DFG_SUCCESS_STATS)
static SamplingCounter counter("SpeculationFailure");
emitCount(counter);
@@ -522,8 +522,6 @@
// both normal return code and when jumping to an exception handler).
preserveReturnAddressAfterCall(GPRInfo::regT2);
emitPutToCallFrameHeader(GPRInfo::regT2, RegisterFile::ReturnPC);
-
- addPtr(Imm32(1), AbsoluteAddress(codeBlock()->addressOfSpeculativeSuccessCounter()));
}
void JITCompiler::compileBody()
@@ -533,6 +531,8 @@
// Handy debug tool!
breakpoint();
#endif
+
+ addPtr(Imm32(1), AbsoluteAddress(codeBlock()->addressOfSpeculativeSuccessCounter()));
Label speculativePathBegin = label();
SpeculativeJIT speculative(*this);
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (96177 => 96178)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2011-09-28 01:46:08 UTC (rev 96177)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2011-09-28 01:52:21 UTC (rev 96178)
@@ -601,8 +601,15 @@
break;
case GetLocal: {
+ PredictedType prediction = m_jit.graph().getPrediction(node.local());
+
+ // If we have no prediction for this local, then don't attempt to compile.
+ if (prediction == PredictNone) {
+ terminateSpeculativeExecution();
+ break;
+ }
+
GPRTemporary result(this);
- PredictedType prediction = m_jit.graph().getPrediction(node.local());
VirtualRegister virtualRegister = node.virtualRegister();
m_jit.load32(JITCompiler::payloadFor(node.local()), result.gpr());
if (isInt32Prediction(prediction)) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
