diff options
| author | Chad Rosier <mcrosier@apple.com> | 2011-10-10 01:03:35 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2011-10-10 01:03:35 +0000 |
| commit | b60187ae74d1c326352315d9561ebf0162d48c2a (patch) | |
| tree | 75c0d0a3f2253637ae4c07b4da0823d95d9021fd /llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp | |
| parent | 12340e5b186884d7a012a6b7afefbacf48604ccc (diff) | |
| download | bcm5719-llvm-b60187ae74d1c326352315d9561ebf0162d48c2a.tar.gz bcm5719-llvm-b60187ae74d1c326352315d9561ebf0162d48c2a.zip | |
Fix a regression from r138445. If we're loading from the frame/base pointer
the tADDrSPi instruction can't be used. Make sure we're updating the opcode
to tADDi3 in all cases.
rdar://10254707
llvm-svn: 141523
Diffstat (limited to 'llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp b/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp index d6b03778096..e8ed482a66f 100644 --- a/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp @@ -454,6 +454,7 @@ rewriteFrameIndex(MachineBasicBlock::iterator II, unsigned FrameRegIdx, // r0 = add sp, 255*4 // r0 = add r0, (imm - 255*4) if (Opcode == ARM::tADDi3) { + MI.setDesc(TII.get(Opcode)); removeOperands(MI, FrameRegIdx); MachineInstrBuilder MIB(&MI); AddDefaultPred(AddDefaultT1CC(MIB).addReg(FrameReg).addImm(Mask)); |
