[MERGE chakra-core#943] fix bug in lowering of asm.js floor/ceil on x86 <SSE4

MikeHolman · MikeHolman · commit 2bf9cf40370d · 2016-05-10T16:07:54.000-07:00
Merge pull request chakra-core#943 from MikeHolman:asmmathhelper
diff --git a/lib/Backend/LowerMDShared.cpp b/lib/Backend/LowerMDShared.cpp
@@ -8657,17 +8657,26 @@ void LowererMD::HelperCallForAsmMathBuiltin(IR::Instr* instr, IR::JnHelperMethod
 
     IR::Opnd * argOpnd = instr->UnlinkSrc1();
     IR::JnHelperMethod helperMethod;
+    uint dwordCount;
     if (argOpnd->IsFloat32())
     {
         helperMethod = helperMethodFloat;
         LoadFloatHelperArgument(instr, argOpnd);
+        dwordCount = 1;
     }
     else
     {
         helperMethod = helperMethodDouble;
         LoadDoubleHelperArgument(instr, argOpnd);
+        dwordCount = 2;
     }
-    ChangeToHelperCall(instr, helperMethod);
+
+    instr->m_opcode = Js::OpCode::CALL;
+
+    IR::HelperCallOpnd *helperCallOpnd = Lowerer::CreateHelperCallOpnd(helperMethod, this->lowererMDArch.GetHelperArgsCount(), m_func);
+    instr->SetSrc1(helperCallOpnd);
+
+    this->lowererMDArch.LowerCall(instr, dwordCount);
 }
 void LowererMD::GenerateFastInlineBuiltInCall(IR::Instr* instr, IR::JnHelperMethod helperMethod)
 {
diff --git a/lib/Backend/amd64/LowererMDArch.cpp b/lib/Backend/amd64/LowererMDArch.cpp
@@ -793,6 +793,7 @@ LowererMDArch::LowerCallPut(IR::Instr *callInstr)
 IR::Instr *
 LowererMDArch::LowerCall(IR::Instr * callInstr, uint32 argCount)
 {
+    UNREFERENCED_PARAMETER(argCount);
     IR::Instr *retInstr = callInstr;
     callInstr->m_opcode = Js::OpCode::CALL;
 

Original file line number	Diff line number	Diff line change
`@@ -8657,17 +8657,26 @@ void LowererMD::HelperCallForAsmMathBuiltin(IR::Instr* instr, IR::JnHelperMethod`
`8657`	`8657`
`8658`	`8658`	`IR::Opnd * argOpnd = instr->UnlinkSrc1();`
`8659`	`8659`	`IR::JnHelperMethod helperMethod;`
	`8660`	`+ uint dwordCount;`
`8660`	`8661`	`if (argOpnd->IsFloat32())`
`8661`	`8662`	`{`
`8662`	`8663`	`helperMethod = helperMethodFloat;`
`8663`	`8664`	`LoadFloatHelperArgument(instr, argOpnd);`
	`8665`	`+ dwordCount = 1;`
`8664`	`8666`	`}`
`8665`	`8667`	`else`
`8666`	`8668`	`{`
`8667`	`8669`	`helperMethod = helperMethodDouble;`
`8668`	`8670`	`LoadDoubleHelperArgument(instr, argOpnd);`
	`8671`	`+ dwordCount = 2;`
`8669`	`8672`	`}`
`8670`		`- ChangeToHelperCall(instr, helperMethod);`
	`8673`	`+`
	`8674`	`+ instr->m_opcode = Js::OpCode::CALL;`
	`8675`	`+`
	`8676`	`+ IR::HelperCallOpnd *helperCallOpnd = Lowerer::CreateHelperCallOpnd(helperMethod, this->lowererMDArch.GetHelperArgsCount(), m_func);`
	`8677`	`+ instr->SetSrc1(helperCallOpnd);`
	`8678`	`+`
	`8679`	`+ this->lowererMDArch.LowerCall(instr, dwordCount);`
`8671`	`8680`	`}`
`8672`	`8681`	`void LowererMD::GenerateFastInlineBuiltInCall(IR::Instr* instr, IR::JnHelperMethod helperMethod)`
`8673`	`8682`	`{`
Original file line number	Diff line number	Diff line change
`@@ -793,6 +793,7 @@ LowererMDArch::LowerCallPut(IR::Instr *callInstr)`
`793`	`793`	`IR::Instr *`
`794`	`794`	`LowererMDArch::LowerCall(IR::Instr * callInstr, uint32 argCount)`
`795`	`795`	`{`
	`796`	`+ UNREFERENCED_PARAMETER(argCount);`
`796`	`797`	`IR::Instr *retInstr = callInstr;`
`797`	`798`	`callInstr->m_opcode = Js::OpCode::CALL;`
`798`	`799`