Title: [134316] branches/safari-536.28-branch/Source/_javascript_Core
- Revision
- 134316
- Author
- [email protected]
- Date
- 2012-11-12 15:09:19 -0800 (Mon, 12 Nov 2012)
Log Message
Merge part 2 of <rdar://problem/12486142>.
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/_javascript_Core/ChangeLog (134315 => 134316)
--- branches/safari-536.28-branch/Source/_javascript_Core/ChangeLog 2012-11-12 22:57:54 UTC (rev 134315)
+++ branches/safari-536.28-branch/Source/_javascript_Core/ChangeLog 2012-11-12 23:09:19 UTC (rev 134316)
@@ -4,6 +4,20 @@
2012-08-13 Filip Pizlo <[email protected]>
+ Value recovery for arguments should be based on the argument-aware prediction.
+ <rdar://problem/12046032>
+
+ Reviewed by Gavin Barraclough.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
+2012-11-12 Lucas Forschler <[email protected]>
+
+ Merge fix for <rdar://problem/12486142>.
+
+ 2012-08-13 Filip Pizlo <[email protected]>
+
Value recovery for arguments should always just indicate that the argument is in the register file, and
not attempt to claim anything about the tag.
<rdar://problem/12046032>
Modified: branches/safari-536.28-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (134315 => 134316)
--- branches/safari-536.28-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2012-11-12 22:57:54 UTC (rev 134315)
+++ branches/safari-536.28-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2012-11-12 23:09:19 UTC (rev 134316)
@@ -953,7 +953,7 @@
else if (at(nodeIndex).variableAccessData()->shouldUseDoubleFormat())
m_variables[i] = ValueSource(DoubleInRegisterFile);
else
- m_variables[i] = ValueSource::forPrediction(at(nodeIndex).variableAccessData()->prediction());
+ m_variables[i] = ValueSource::forPrediction(at(nodeIndex).variableAccessData()->argumentAwarePrediction());
}
m_lastSetOperand = std::numeric_limits<int>::max();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
