Also change LowerRet on Arm

Cellule · Cellule · commit bf376ecbee31 · 2017-06-29T14:16:13.000-07:00
diff --git a/lib/Backend/arm/LowerMD.cpp b/lib/Backend/arm/LowerMD.cpp
@@ -2424,11 +2424,13 @@ LowererMD::CreateAssign(IR::Opnd *dst, IR::Opnd *src, IR::Instr *instrInsertPt,
 IR::Instr *
 LowererMD::LowerRet(IR::Instr * retInstr)
 {
-    IR::RegOpnd *retReg = IR::RegOpnd::New(nullptr, RETURN_REG, TyMachReg, m_func);
+    IR::RegOpnd *retReg = IR::RegOpnd::New(TyMachReg, m_func);
+    retReg->SetReg(RETURN_REG);
+    Lowerer::InsertMove(retReg, retInstr->UnlinkSrc1(), retInstr);
 
-    retInstr->SetDst(retReg);
+    retInstr->SetSrc1(retReg);
 
-    return this->ChangeToAssign(retInstr);
+    return retInstr;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -2424,11 +2424,13 @@ LowererMD::CreateAssign(IR::Opnd dst, IR::Opnd src, IR::Instr *instrInsertPt,`
`2424`	`2424`	`IR::Instr *`
`2425`	`2425`	`LowererMD::LowerRet(IR::Instr * retInstr)`
`2426`	`2426`	`{`
`2427`		`- IR::RegOpnd *retReg = IR::RegOpnd::New(nullptr, RETURN_REG, TyMachReg, m_func);`
	`2427`	`+ IR::RegOpnd *retReg = IR::RegOpnd::New(TyMachReg, m_func);`
	`2428`	`+ retReg->SetReg(RETURN_REG);`
	`2429`	`+ Lowerer::InsertMove(retReg, retInstr->UnlinkSrc1(), retInstr);`
`2428`	`2430`
`2429`		`- retInstr->SetDst(retReg);`
	`2431`	`+ retInstr->SetSrc1(retReg);`
`2430`	`2432`
`2431`		`- return this->ChangeToAssign(retInstr);`
	`2433`	`+ return retInstr;`
`2432`	`2434`	`}`
`2433`	`2435`
`2434`	`2436`