diff options
| -rw-r--r-- | lib/CodeGen/LiveIntervalAnalysis.cpp | 5 | ||||
| -rw-r--r-- | lib/CodeGen/VirtRegRewriter.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 873e58e..d8f2089 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -1157,11 +1157,6 @@ bool LiveIntervals::isReMaterializable(const LiveInterval &li, if (DisableReMat) return false; - // FIXME: For now, avoid remating instructions whose definition has a subreg - // index. It's just incredibly difficult to get right. - if (MI->findRegisterDefOperand(li.reg)->getSubReg()) - return false; - if (MI->getOpcode() == TargetInstrInfo::IMPLICIT_DEF) return true; diff --git a/lib/CodeGen/VirtRegRewriter.cpp b/lib/CodeGen/VirtRegRewriter.cpp index 800cdd6..a859d80 100644 --- a/lib/CodeGen/VirtRegRewriter.cpp +++ b/lib/CodeGen/VirtRegRewriter.cpp @@ -490,7 +490,14 @@ static void ReMaterialize(MachineBasicBlock &MBB, const TargetInstrInfo *TII, const TargetRegisterInfo *TRI, VirtRegMap &VRM) { - TII->reMaterialize(MBB, MII, DestReg, 0, VRM.getReMaterializedMI(Reg)); + MachineInstr *ReMatDefMI = VRM.getReMaterializedMI(Reg); +#ifdef NDEBUG + const TargetInstrDesc &TID = ReMatDefMI->getDesc(); + assert(TID.getNumDefs() != 1 && + "Don't know how to remat instructions that define > 1 values!"); +#endif + TII->reMaterialize(MBB, MII, DestReg, + ReMatDefMI->getOperand(0).getSubReg(), ReMatDefMI); MachineInstr *NewMI = prior(MII); for (unsigned i = 0, e = NewMI->getNumOperands(); i != e; ++i) { MachineOperand &MO = NewMI->getOperand(i); diff --git a/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll b/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll index 518e8cc..a0f4fcf 100644 --- a/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll +++ b/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll @@ -1,10 +1,7 @@ +; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | grep movd | count 1 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | grep movq ; PR2677 -; FIXME: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | grep movd | count 1 -; We now no longer allow instruction whose def has a sub-reg index to be -; rematerialized. - %struct.Bigint = type { %struct.Bigint*, i32, i32, i32, i32, [1 x i32] } |