[MERGE #1536 @rajatd] Bug fix to not remove GetNewScObject in the loop prepass

rajatd · rajatd · commit 9a99b667756f · 2016-09-07T13:16:49.000-07:00
Merge pull request #1536 from rajatd:getNewScObject We should wait for the main pass of a loop to make changes to the IR based on value types of operands. In this case GetNewScObject instruction was being removed in the prepass and this led to functional differences from nonative runs.
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -4954,7 +4954,7 @@ GlobOpt::OptInstr(IR::Instr *&instr, bool* isInstrRemoved)
         this->currentBlock->RemoveInstr(instr);
         return instrNext;
     }
-    else if (instr->m_opcode == Js::OpCode::GetNewScObject && src1Val->GetValueInfo()->IsPrimitive())
+    else if (instr->m_opcode == Js::OpCode::GetNewScObject && !this->IsLoopPrePass() && src1Val->GetValueInfo()->IsPrimitive())
     {
         // Constructor returned (src1) a primitive value, so fold this into "dst = Ld_A src2", where src2 is the new object that
         // was passed into the constructor as its 'this' parameter

Original file line number	Diff line number	Diff line change
`@@ -4954,7 +4954,7 @@ GlobOpt::OptInstr(IR::Instr &instr, bool isInstrRemoved)`
`4954`	`4954`	`this->currentBlock->RemoveInstr(instr);`
`4955`	`4955`	`return instrNext;`
`4956`	`4956`	`}`
`4957`		`- else if (instr->m_opcode == Js::OpCode::GetNewScObject && src1Val->GetValueInfo()->IsPrimitive())`
	`4957`	`+ else if (instr->m_opcode == Js::OpCode::GetNewScObject && !this->IsLoopPrePass() && src1Val->GetValueInfo()->IsPrimitive())`
`4958`	`4958`	`{`
`4959`	`4959`	`// Constructor returned (src1) a primitive value, so fold this into "dst = Ld_A src2", where src2 is the new object that`
`4960`	`4960`	`// was passed into the constructor as its 'this' parameter`