diff options
| author | Bill Wendling <isanbard@gmail.com> | 2008-10-31 04:00:23 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2008-10-31 04:00:23 +0000 |
| commit | f6a9988ceab0ca660fa4f4e89d8d683f487118eb (patch) | |
| tree | 40d810941b73fa68a95150cae99235cecb5974e0 | |
| parent | 0656466734f44ac2fc0132322700b67a18d220c2 (diff) | |
Don't skip over all "terminator" instructions when determining where to put the
callee-saved restore code. It could skip over conditional jumps
accidentally. Instead, just skip the "return" instructions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58489 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, 3 insertions, 4 deletions
diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index d3b0b11c70..2469c8e000 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 terminator instructions, which are part of the return + // Skip over all "return" instructions, which are part of the return // sequence. MachineBasicBlock::iterator I2 = I; - while (I2 != MBB->begin() && (--I2)->getDesc().isTerminator()) + while (I2 != MBB->begin() && (--I2)->getDesc().isReturn()) I = I2; bool AtStart = I == MBB->begin(); diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 97e1de729a..9e9495dd12 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -850,8 +850,7 @@ 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().isTerminator()) + if (Opc != X86::POP32r && Opc != X86::POP64r && !PI->getDesc().isReturn()) break; --MBBI; } |