Modified: tags/Safari-537.51.3/Source/_javascript_Core/ChangeLog (152913 => 152914)
--- tags/Safari-537.51.3/Source/_javascript_Core/ChangeLog 2013-07-19 18:46:39 UTC (rev 152913)
+++ tags/Safari-537.51.3/Source/_javascript_Core/ChangeLog 2013-07-19 18:49:07 UTC (rev 152914)
@@ -1,5 +1,18 @@
2013-07-19 Lucas Forschler <[email protected]>
+ Merge r152818
+
+ 2013-07-17 Filip Pizlo <[email protected]>
+
+ Unreviewed, fix 32-bit after http://trac.webkit.org/changeset/152813
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileNewFunctionNoCheck):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
+2013-07-19 Lucas Forschler <[email protected]>
+
Merge r152813
2013-07-17 Filip Pizlo <[email protected]>
Modified: tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (152913 => 152914)
--- tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2013-07-19 18:46:39 UTC (rev 152913)
+++ tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2013-07-19 18:49:07 UTC (rev 152914)
@@ -4057,7 +4057,7 @@
GPRReg resultGPR = result.gpr();
flushRegisters();
callOperation(
- operationNewFunction, resultGPR, m_jit.codeBlock()->functionDecl(node->functionDeclIndex()));
+ operationNewFunctionNoCheck, resultGPR, m_jit.codeBlock()->functionDecl(node->functionDeclIndex()));
cellResult(resultGPR, node);
}
Modified: tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (152913 => 152914)
--- tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2013-07-19 18:46:39 UTC (rev 152913)
+++ tags/Safari-537.51.3/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2013-07-19 18:49:07 UTC (rev 152914)
@@ -4897,21 +4897,22 @@
case NewFunction: {
JSValueOperand value(this, node->child1());
- GPRTemporary resultTag(this, op1);
- GPRTemporary resultPayload(this, op1, false);
+ GPRTemporary resultTag(this, value);
+ GPRTemporary resultPayload(this, value, false);
GPRReg valueTagGPR = value.tagGPR();
GPRReg valuePayloadGPR = value.payloadGPR();
GPRReg resultTagGPR = resultTag.gpr();
GPRReg resultPayloadGPR = resultPayload.gpr();
- m_jit.move(valuePayloadGPR, resultGPR);
+ m_jit.move(valuePayloadGPR, resultPayloadGPR);
+ m_jit.move(valueTagGPR, resultTagGPR);
JITCompiler::Jump notCreated = m_jit.branch32(JITCompiler::Equal, valueTagGPR, TrustedImm32(JSValue::EmptyValueTag));
addSlowPathGenerator(
slowPathCall(
- notCreated, this, operationNewFunction, resultTagGPR, resultPayloadGPR,
+ notCreated, this, operationNewFunction, JSValueRegs(resultTagGPR, resultPayloadGPR),
m_jit.codeBlock()->functionDecl(node->functionDeclIndex())));
jsValueResult(resultTagGPR, resultPayloadGPR, node);