[1.10>master] [MERGE #5560 @rajatd] Insert bytecode uses before (vs after) the branch/compare instruction during UnsignedCmpPeep. OS#17686612

rajatd · rajatd · commit d28eb4af7b98 · 2018-08-01T11:40:23.000-07:00
Merge pull request #5560 from rajatd:unsignedCmpPeep-bcu-1.10
diff --git a/lib/Backend/FlowGraph.cpp b/lib/Backend/FlowGraph.cpp
@@ -3958,7 +3958,6 @@ bool FlowGraph::UnsignedCmpPeep(IR::Instr *cmpInstr)
     }
 
     IR::ByteCodeUsesInstr * bytecodeInstr = IR::ByteCodeUsesInstr::New(cmpInstr);
-    cmpInstr->InsertAfter(bytecodeInstr);
 
     if (cmpSrc1 != newSrc1)
     {
@@ -3997,6 +3996,7 @@ bool FlowGraph::UnsignedCmpPeep(IR::Instr *cmpInstr)
         }
     }
 
+    cmpInstr->InsertBefore(bytecodeInstr);
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3958,7 +3958,6 @@ bool FlowGraph::UnsignedCmpPeep(IR::Instr *cmpInstr)`
`3958`	`3958`	`}`
`3959`	`3959`
`3960`	`3960`	`IR::ByteCodeUsesInstr * bytecodeInstr = IR::ByteCodeUsesInstr::New(cmpInstr);`
`3961`		`- cmpInstr->InsertAfter(bytecodeInstr);`
`3962`	`3961`
`3963`	`3962`	`if (cmpSrc1 != newSrc1)`
`3964`	`3963`	`{`
`@@ -3997,6 +3996,7 @@ bool FlowGraph::UnsignedCmpPeep(IR::Instr *cmpInstr)`
`3997`	`3996`	`}`
`3998`	`3997`	`}`
`3999`	`3998`
	`3999`	`+ cmpInstr->InsertBefore(bytecodeInstr);`
`4000`	`4000`	`return true;`
`4001`	`4001`	`}`
`4002`	`4002`