diff options
author | Eric Christopher <echristo@apple.com> | 2010-05-06 02:29:06 +0000 |
---|---|---|
committer | Eric Christopher <echristo@apple.com> | 2010-05-06 02:29:06 +0000 |
commit | f865cb5c1f00d5655d981503ed5761b2836fa5a8 (patch) | |
tree | a28a6c3f96efd2a07c017974a9fef12ee7d81c90 /lib/Target/X86/X86RegisterInfo.cpp | |
parent | 06572793a7ae8b45ad802c04ab508a36b915d999 (diff) | |
download | external_llvm-f865cb5c1f00d5655d981503ed5761b2836fa5a8.zip external_llvm-f865cb5c1f00d5655d981503ed5761b2836fa5a8.tar.gz external_llvm-f865cb5c1f00d5655d981503ed5761b2836fa5a8.tar.bz2 |
Revert r103156 since it was breaking the build bots.
Reverse-merging r103156 into '.':
U lib/Target/ARM/ARMInstrNEON.td
U lib/Target/ARM/ARMRegisterInfo.h
U lib/Target/ARM/ARMBaseRegisterInfo.cpp
U lib/Target/ARM/ARMBaseInstrInfo.cpp
U lib/Target/ARM/ARMRegisterInfo.td
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103159 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86RegisterInfo.cpp')
-rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index f24138a..4f1c851 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -716,7 +716,7 @@ static void mergeSPUpdatesUp(MachineBasicBlock &MBB, MachineBasicBlock::iterator &MBBI, unsigned StackPtr, uint64_t *NumBytes = NULL) { if (MBBI == MBB.begin()) return; - + MachineBasicBlock::iterator PI = prior(MBBI); unsigned Opc = PI->getOpcode(); if ((Opc == X86::ADD64ri32 || Opc == X86::ADD64ri8 || |