[MERGE chakra-core#2007 @curtisman] Fix regression from Bool-Int equality fast-path GenerateFastEqBoolInt

curtisman · curtisman · commit bbf46243132a · 2016-11-14T09:15:22.000-08:00
Merge pull request chakra-core#2007 from curtisman:fix 1. XOR requires the dst and src1 to be the same. Just use the dst instead of a temp 2. The true ^ false is not a AddrOpndKindDynamicVar, change it to AddrOpndKindDynamicMisc
diff --git a/lib/Backend/Lower.cpp b/lib/Backend/Lower.cpp
@@ -20478,13 +20478,12 @@ bool Lowerer::GenerateFastEqBoolInt(IR::Instr * instr, bool *pNeedHelper)
                 instr->InsertBefore(firstFalse);
             }
 
-            // tmp = src
-            // dst = tmp ^ (true ^ false) (= !src)
-            IR::RegOpnd* temp = IR::RegOpnd::New(IRType::TyVar, instr->m_func);
-            LowererMD::CreateAssign(temp, srcBool, instr);
+            // dst = src
+            // dst = dst ^ (true ^ false) (= !src)
+            LowererMD::CreateAssign(instr->GetDst(), srcBool, instr);
             ScriptContextInfo* sci = instr->m_func->GetScriptContextInfo();
-            IR::AddrOpnd* xorval = IR::AddrOpnd::New(sci->GetTrueAddr() ^ sci->GetFalseAddr(), IR::AddrOpndKindDynamicVar, instr->m_func, true);
-            instr->InsertBefore(IR::Instr::New(LowererMD::MDXorOpcode, instr->GetDst(), temp, xorval, instr->m_func));
+            IR::AddrOpnd* xorval = IR::AddrOpnd::New(sci->GetTrueAddr() ^ sci->GetFalseAddr(), IR::AddrOpndKindDynamicMisc, instr->m_func, true);
+            instr->InsertBefore(IR::Instr::New(LowererMD::MDXorOpcode, instr->GetDst(), instr->GetDst(), xorval, instr->m_func));
 
             instr->InsertBefore(forceInequal);
             LowererMD::CreateAssign(instr->GetDst(), this->LoadLibraryValueOpnd(instr, inequalResultValue), instr);
@@ -20531,13 +20530,12 @@ bool Lowerer::GenerateFastEqBoolInt(IR::Instr * instr, bool *pNeedHelper)
                 }
                 else
                 {
-                    // tmp = src
-                    // dst = tmp ^ (true ^ false) (= !src)
-                    IR::RegOpnd* temp = IR::RegOpnd::New(IRType::TyVar, instr->m_func);
-                    LowererMD::CreateAssign(temp, srcBool, instr);
+                    // dst = src
+                    // dst = dst ^ (true ^ false) (= !src)
+                    LowererMD::CreateAssign(instr->GetDst(), srcBool, instr);
                     ScriptContextInfo* sci = instr->m_func->GetScriptContextInfo();
-                    IR::AddrOpnd* xorval = IR::AddrOpnd::New(sci->GetTrueAddr() ^ sci->GetFalseAddr(), IR::AddrOpndKindDynamicVar, instr->m_func, true);
-                    instr->InsertBefore(IR::Instr::New(LowererMD::MDXorOpcode, instr->GetDst(), temp, xorval, instr->m_func));
+                    IR::AddrOpnd* xorval = IR::AddrOpnd::New(sci->GetTrueAddr() ^ sci->GetFalseAddr(), IR::AddrOpndKindDynamicMisc, instr->m_func, true);
+                    instr->InsertBefore(IR::Instr::New(LowererMD::MDXorOpcode, instr->GetDst(), instr->GetDst(), xorval, instr->m_func));
                 }
                 instr->InsertBefore(IR::BranchInstr::New(LowererMD::MDUncondBranchOpcode, labelDone, this->m_func));
             }
