Title: [96534] trunk/Source/_javascript_Core
- Revision
- 96534
- Author
- [email protected]
- Date
- 2011-10-03 13:39:10 -0700 (Mon, 03 Oct 2011)
Log Message
Unreviewed build fix for DFG JIT 32_64.
* dfg/DFGJITCompiler32_64.cpp:
(JSC::DFG::JITCompiler::exitSpeculativeWithOSR):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96533 => 96534)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-03 20:25:13 UTC (rev 96533)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-03 20:39:10 UTC (rev 96534)
@@ -1,3 +1,12 @@
+2011-10-03 Gavin Barraclough <[email protected]>
+
+ Unreviewed build fix for DFG JIT 32_64.
+
+ * dfg/DFGJITCompiler32_64.cpp:
+ (JSC::DFG::JITCompiler::exitSpeculativeWithOSR):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
2011-10-02 Filip Pizlo <[email protected]>
DFG should speculate more aggressively on obvious cases on
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp (96533 => 96534)
--- trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp 2011-10-03 20:25:13 UTC (rev 96533)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCompiler32_64.cpp 2011-10-03 20:39:10 UTC (rev 96534)
@@ -467,12 +467,12 @@
move(TrustedImmPtr(codeBlock()->alternative()), GPRInfo::regT0);
Jump fewFails = branch32(BelowOrEqual, GPRInfo::regT2, Imm32(codeBlock()->largeFailCountThreshold()));
- mul32(Imm32(codeBlock()->desiredSuccessFailRatio()), GPRInfo::regT2, GPRInfo::regT2);
+ mul32(Imm32(Heuristics::desiredSpeculativeSuccessFailRatio), GPRInfo::regT2, GPRInfo::regT2);
Jump lowFailRate = branch32(BelowOrEqual, GPRInfo::regT2, GPRInfo::regT1);
// Reoptimize as soon as possible.
- store32(Imm32(CodeBlock::counterValueForOptimizeNextInvocation()), Address(GPRInfo::regT0, CodeBlock::offsetOfExecuteCounter()));
+ store32(Imm32(Heuristics::executionCounterValueForOptimizeNextInvocation), Address(GPRInfo::regT0, CodeBlock::offsetOfExecuteCounter()));
Jump doneAdjusting = jump();
fewFails.link(this);
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (96533 => 96534)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2011-10-03 20:25:13 UTC (rev 96533)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2011-10-03 20:39:10 UTC (rev 96534)
@@ -1703,10 +1703,10 @@
#if ENABLE(GGC) || ENABLE(WRITE_BARRIER_PROFILING)
// Must always emit this write barrier as the structure transition itself requires it
- writeBarrier(baseGPR, node.structure(), WriteBarrierForGenericAccess);
+ writeBarrier(baseGPR, node.structureTransitionData().newStructure, WriteBarrierForGenericAccess);
#endif
- m_jit.storePtr(MacroAssembler::TrustedImmPtr(node.structure()), MacroAssembler::Address(baseGPR, JSCell::structureOffset()));
+ m_jit.storePtr(MacroAssembler::TrustedImmPtr(node.structureTransitionData().newStructure), MacroAssembler::Address(baseGPR, JSCell::structureOffset()));
noResult(m_compileIndex);
break;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
