RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Don't skip over all "terminator" instructions when determining where to put the

Browse Source 
callee-saved restore code. It could skip over conditional jumps
accidentally. Instead, just skip the "return" instructions.

llvm-svn: 58489
This commit is contained in:
Bill Wendling 2008-10-31 04:00:23 +00:00
parent 8abdac1eb4
commit 0f1f4f8bb1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CodeGen/PrologEpilogInserter.cpp
View File

@ -273,10 +273,10 @@ void PEI::saveCalleeSavedRegisters(MachineFunction &Fn) {
MBB = FI; MBB = FI;
I = MBB->end(); --I; 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. // sequence.
MachineBasicBlock::iterator I2 = I; MachineBasicBlock::iterator I2 = I;
while (I2 != MBB->begin() && (--I2)->getDesc().isTerminator()) while (I2 != MBB->begin() && (--I2)->getDesc().isReturn())
I = I2; I = I2;
bool AtStart = I == MBB->begin(); bool AtStart = I == MBB->begin();

3
lib/Target/X86/X86RegisterInfo.cpp
View File

@ -850,8 +850,7 @@ void X86RegisterInfo::emitEpilogue(MachineFunction &MF,
while (MBBI != MBB.begin()) { while (MBBI != MBB.begin()) {
MachineBasicBlock::iterator PI = prior(MBBI); MachineBasicBlock::iterator PI = prior(MBBI);
unsigned Opc = PI->getOpcode(); unsigned Opc = PI->getOpcode();
if (Opc != X86::POP32r && Opc != X86::POP64r && if (Opc != X86::POP32r && Opc != X86::POP64r && !PI->getDesc().isReturn())
!PI->getDesc().isTerminator())
break; break;
--MBBI; --MBBI;
} }