Title: [161435] branches/jsCStack/Source/_javascript_Core
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161434 => 161435)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-07 18:30:23 UTC (rev 161434)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-07 18:47:31 UTC (rev 161435)
@@ -1,5 +1,9 @@
2014-01-07 Filip Pizlo <[email protected]>
+ Merge trunk r161411.
+
+2014-01-07 Filip Pizlo <[email protected]>
+
Really merge r161399.
* dfg/DFGArithMode.cpp: Added.
Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (161434 => 161435)
--- branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-07 18:30:23 UTC (rev 161434)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-07 18:47:31 UTC (rev 161435)
@@ -1943,7 +1943,7 @@
m_jit.store32(value.payloadGPR(), JITCompiler::payloadFor(node->machineLocal()));
m_jit.store32(value.tagGPR(), JITCompiler::tagFor(node->machineLocal()));
noResult(node);
- recordSetLocal(DataFormatJS);
+ recordSetLocal(dataFormatFor(node->variableAccessData()->flushFormat()));
break;
}
Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (161434 => 161435)
--- branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2014-01-07 18:30:23 UTC (rev 161434)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2014-01-07 18:47:31 UTC (rev 161435)
@@ -2256,7 +2256,7 @@
JSValueOperand value(this, node->child1());
m_jit.store64(value.gpr(), JITCompiler::addressFor(node->machineLocal()));
noResult(node);
- recordSetLocal(DataFormatJS);
+ recordSetLocal(dataFormatFor(node->variableAccessData()->flushFormat()));
break;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
