diff options
| author | Bill Wendling <isanbard@gmail.com> | 2008-10-31 18:30:19 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2008-10-31 18:30:19 +0000 |
| commit | f7c094000f4baf094b1d60ba68a5b4e0193c502a (patch) | |
| tree | 0b5f034b6c0f32a79d40996ae400f0a3053ff989 | |
| parent | 476527a19daada771579d7099eb53125d814edc1 (diff) | |
Revert r58489. It isn't correct for all cases.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58523 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/PrologEpilogInserter.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index 2469c8e000..d3b0b11c70 100644 --- a/lib/CodeGen/PrologEpilogInserter.cpp +++ b/lib/CodeGen/PrologEpilogInserter.cpp @@ -273,10 +273,10 @@ void PEI::saveCalleeSavedRegisters(MachineFunction &Fn) { MBB = FI; I = MBB->end(); --I; - // Skip over all "return" instructions, which are part of the return + // Skip over all terminator instructions, which are part of the return // sequence. MachineBasicBlock::iterator I2 = I; - while (I2 != MBB->begin() && (--I2)->getDesc().isReturn()) + while (I2 != MBB->begin() && (--I2)->getDesc().isTerminator()) I = I2; bool AtStart = I == MBB->begin(); diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 9e9495dd12..97e1de729a 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -850,7 +850,8 @@ void X86RegisterInfo::emitEpilogue(MachineFunction &MF, while (MBBI != MBB.begin()) { MachineBasicBlock::iterator PI = prior(MBBI); unsigned Opc = PI->getOpcode(); - if (Opc != X86::POP32r && Opc != X86::POP64r && !PI->getDesc().isReturn()) + if (Opc != X86::POP32r && Opc != X86::POP64r && + !PI->getDesc().isTerminator()) break; --MBBI; } |