OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Revert r58489. It isn't correct for all cases. 

llvm-svn: 58523
This commit is contained in:
Bill Wendling 2008-10-31 18:30:19 +00:00
parent 21c9705264
commit d2bc13380f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/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 "return" instructions, which are part of the return // Skip over all terminator instructions, which are part of the return
// sequence. // sequence.
MachineBasicBlock::iterator I2 = I; MachineBasicBlock::iterator I2 = I;
while (I2 != MBB->begin() && (--I2)->getDesc().isReturn()) while (I2 != MBB->begin() && (--I2)->getDesc().isTerminator())
I = I2; I = I2;
bool AtStart = I == MBB->begin(); bool AtStart = I == MBB->begin();

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

@ -850,7 +850,8 @@ 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 && !PI->getDesc().isReturn()) if (Opc != X86::POP32r && Opc != X86::POP64r &&
!PI->getDesc().isTerminator())
break; break;
--MBBI; --MBBI;
} }