diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2010-02-19 18:59:53 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2010-02-19 18:59:53 +0000 |
| commit | 1a2e8686f8137a1a2329952ffd1e21969ea1658c (patch) | |
| tree | 87490651543b97c401178f0db2505c23639aaa78 /lib/CodeGen/PrologEpilogInserter.cpp | |
| parent | bc02853b8995b9c6402096912cd551f676679659 (diff) | |
| download | llvm-1a2e8686f8137a1a2329952ffd1e21969ea1658c.tar.gz llvm-1a2e8686f8137a1a2329952ffd1e21969ea1658c.tar.bz2 llvm-1a2e8686f8137a1a2329952ffd1e21969ea1658c.tar.xz | |
Revert 96634. It causes assertion failures for 126.gcc and 176.gcc in
the armv6 nightly tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96691 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/PrologEpilogInserter.cpp')
| -rw-r--r-- | lib/CodeGen/PrologEpilogInserter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index 138e711030..040259e15c 100644 --- a/lib/CodeGen/PrologEpilogInserter.cpp +++ b/lib/CodeGen/PrologEpilogInserter.cpp @@ -175,10 +175,9 @@ void PEI::calculateCallsInformation(MachineFunction &Fn) { MachineBasicBlock::iterator I = *i; // If call frames are not being included as part of the stack frame, and - // the target doesn't indicate otherwise, remove the call frame pseudos - // here. The sub/add sp instruction pairs are still inserted, but we don't - // need to track the SP adjustment for frame index elimination. - if (RegInfo->canSimplifyCallFramePseudos(Fn)) + // there is no dynamic allocation (therefore referencing frame slots off + // sp), leave the pseudo ops alone. We'll eliminate them later. + if (RegInfo->hasReservedCallFrame(Fn) || RegInfo->hasFP(Fn)) RegInfo->eliminateCallFramePseudoInstr(Fn, *I->getParent(), I); } } |