Fix thinko in my recent movt commit: it's not safe to remat movt, since it has input...

Disable rematting of it for now.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82975 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMInstrInfo.cpp b/lib/Target/ARM/ARMInstrInfo.cpp
index 15c3c393c32b299addd7ed1459e577528edf07db..2ab355b190d5ed3b43b7d87c6ff522ee8fa9f4e6 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.cpp
+++ b/lib/Target/ARM/ARMInstrInfo.cpp
@@ -96,8 +96,6 @@ reMaterialize(MachineBasicBlock &MBB,
 
   MachineInstr *MI = MBB.getParent()->CloneMachineInstr(Orig);
   MI->getOperand(0).setReg(DestReg);
-  if (Orig->getOpcode() == ARM::MOVTi16)
-    MI->getOperand(1).setReg(DestReg);
 
   MBB.insert(I, MI);
 }

diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td
index 0e9e67709ddabfd73cf4b30fc9fe8a873ef4e4b0..4bc62733d6876b8ce7a8ab45ac5ca6d5c73040ce 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.td
+++ b/lib/Target/ARM/ARMInstrInfo.td
@@ -938,8 +938,7 @@ def MOVi16 : AI1<0b1000, (outs GPR:$dst), (ins i32imm:$src),
   let Inst{25} = 1;
 }
 
-let isReMaterializable = 1, isAsCheapAsAMove = 1, 
-    Constraints = "$src = $dst" in
+let isAsCheapAsAMove = 1, Constraints = "$src = $dst" in
 def MOVTi16 : AI1<0b1010, (outs GPR:$dst), (ins GPR:$src, i32imm:$imm),
                   DPFrm, IIC_iMOVi,
                   "movt", " $dst, $imm",