From cb7b2cb2b312af6412db6908241e8d24aba2885f Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Sat, 27 Feb 2016 16:38:23 +0000 Subject: [PATCH] WebAssembly: fix build It was broken by the work for PR26753. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@262140 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/WebAssembly/WebAssemblyRegStackify.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp b/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp index d69b7279077..27ef0db1f0b 100644 --- a/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp +++ b/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp @@ -121,10 +121,10 @@ static bool IsSafeToMove(const MachineInstr *Def, const MachineInstr *Insert, // Insert will change value numbers are seen. const LiveInterval &LI = LIS.getInterval(Reg); VNInfo *DefVNI = - MO.isDef() ? LI.getVNInfoAt(LIS.getInstructionIndex(Def).getRegSlot()) - : LI.getVNInfoBefore(LIS.getInstructionIndex(Def)); + MO.isDef() ? LI.getVNInfoAt(LIS.getInstructionIndex(*Def).getRegSlot()) + : LI.getVNInfoBefore(LIS.getInstructionIndex(*Def)); assert(DefVNI && "Instruction input missing value number"); - VNInfo *InsVNI = LI.getVNInfoBefore(LIS.getInstructionIndex(Insert)); + VNInfo *InsVNI = LI.getVNInfoBefore(LIS.getInstructionIndex(*Insert)); if (InsVNI && DefVNI != InsVNI) return false; } @@ -206,7 +206,7 @@ RematerializeCheapDef(unsigned Reg, MachineOperand &Op, MachineInstr *Def, TII->reMaterialize(MBB, Insert, NewReg, 0, Def, *TRI); Op.setReg(NewReg); MachineInstr *Clone = &*std::prev(MachineBasicBlock::instr_iterator(Insert)); - LIS.InsertMachineInstrInMaps(Clone); + LIS.InsertMachineInstrInMaps(*Clone); LIS.createAndComputeVirtRegInterval(NewReg); MFI.stackifyVReg(NewReg); ImposeStackOrdering(Clone); @@ -214,11 +214,11 @@ RematerializeCheapDef(unsigned Reg, MachineOperand &Op, MachineInstr *Def, // If that was the last use of the original, delete the original. // Otherwise shrink the LiveInterval. if (MRI.use_empty(Reg)) { - SlotIndex Idx = LIS.getInstructionIndex(Def).getRegSlot(); + SlotIndex Idx = LIS.getInstructionIndex(*Def).getRegSlot(); LIS.removePhysRegDefAt(WebAssembly::ARGUMENTS, Idx); LIS.removeVRegDefAt(LIS.getInterval(Reg), Idx); LIS.removeInterval(Reg); - LIS.RemoveMachineInstrFromMaps(Def); + LIS.RemoveMachineInstrFromMaps(*Def); Def->eraseFromParent(); } else { LIS.shrinkToUses(&LIS.getInterval(Reg)); @@ -263,7 +263,7 @@ static MachineInstr *MoveAndTeeForMultiUse( .addReg(DefReg); Op.setReg(TeeReg); Def->getOperand(0).setReg(DefReg); - LIS.InsertMachineInstrInMaps(Tee); + LIS.InsertMachineInstrInMaps(*Tee); LIS.removeInterval(Reg); LIS.createAndComputeVirtRegInterval(NewReg); LIS.createAndComputeVirtRegInterval(TeeReg); @@ -453,7 +453,7 @@ bool WebAssemblyRegStackify::runOnMachineFunction(MachineFunction &MF) { if (!Def) { // MRI doesn't know what the Def is. Try asking LIS. const VNInfo *ValNo = LIS.getInterval(Reg).getVNInfoBefore( - LIS.getInstructionIndex(Insert)); + LIS.getInstructionIndex(*Insert)); if (!ValNo) continue; Def = LIS.getInstructionFromIndex(ValNo->def); -- 2.11.0