maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

WebAssembly: fix build 

It was broken by the work for PR26753.

llvm-svn: 262140
This commit is contained in:
JF Bastien 2016-02-27 16:38:23 +00:00
parent 9a5419ecf7
commit 13d3b9b777
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp
View File

@ -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);