Title: [152818] trunk/Source/_javascript_Core
Revision
152818
Author
[email protected]
Date
2013-07-17 16:43:53 -0700 (Wed, 17 Jul 2013)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (152817 => 152818)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-17 23:41:01 UTC (rev 152817)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-17 23:43:53 UTC (rev 152818)
@@ -1,3 +1,12 @@
+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-17  Geoffrey Garen  <[email protected]>
 
         API tests should test for JSStringCreateWithCFString with empty string

Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (152817 => 152818)


--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2013-07-17 23:41:01 UTC (rev 152817)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2013-07-17 23:43:53 UTC (rev 152818)
@@ -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: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (152817 => 152818)


--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2013-07-17 23:41:01 UTC (rev 152817)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2013-07-17 23:43:53 UTC (rev 152818)
@@ -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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to