summaryrefslogtreecommitdiff
path: root/lib/CodeGen/PrologEpilogInserter.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2005-05-15 03:09:58 +0000
committerChris Lattner <sabre@nondot.org>2005-05-15 03:09:58 +0000
commit4fc997941dde5c11e91a28c9b5b8fa331d053a18 (patch)
tree31d3ba6c4a362c0d0aa85966250ab7374b2cbec3 /lib/CodeGen/PrologEpilogInserter.cpp
parent0dede079e7c2ab3b39bf3dc6e37039501a1eca07 (diff)
downloadllvm-4fc997941dde5c11e91a28c9b5b8fa331d053a18.tar.gz
llvm-4fc997941dde5c11e91a28c9b5b8fa331d053a18.tar.bz2
llvm-4fc997941dde5c11e91a28c9b5b8fa331d053a18.tar.xz
When inserting callee-save register reloads, make sure to skip over any
terminator instructions before the 'ret' in case the target has a multi-instruction return sequence. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22041 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/PrologEpilogInserter.cpp')
-rw-r--r--lib/CodeGen/PrologEpilogInserter.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp
index 37e40c90a9..c5bc2337fd 100644
--- a/lib/CodeGen/PrologEpilogInserter.cpp
+++ b/lib/CodeGen/PrologEpilogInserter.cpp
@@ -211,6 +211,14 @@ void PEI::saveCallerSavedRegisters(MachineFunction &Fn) {
MBB = FI;
I = MBB->end(); --I;
+ // Skip over all terminator instructions, which are part of the return
+ // sequence.
+ MachineBasicBlock::iterator I2 = I;
+ while (I2 != MBB->begin() && TII.isTerminatorInstr((--I2)->getOpcode()))
+ I = I2;
+
+ // Restore all registers immediately before the return and any terminators
+ // that preceed it.
for (unsigned i = 0, e = RegsToSave.size(); i != e; ++i) {
RegInfo->loadRegFromStackSlot(*MBB, I, RegsToSave[i], StackSlots[i]);
assert(I != MBB->begin() &&