Don't eliminate frame pointers from leaf functions if "--disable-fp-elim" is

specified.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@104066 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index 199119850b231ce2b0a43fe316184c7a95750ddd..b947b786a4ff5c6970dd256314deb0fd77809112 100644 (file)
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -275,7 +275,7 @@ namespace llvm {
   bool DisableFramePointerElim(const MachineFunction &MF) {
     // Check to see if we should eliminate non-leaf frame pointers and then
     // check to see if we should eliminate all frame pointers.
-    if (NoFramePointerElimNonLeaf) {
+    if (NoFramePointerElimNonLeaf && !NoFramePointerElim) {
       const MachineFrameInfo *MFI = MF.getFrameInfo();
       return MFI->hasCalls();
     }