[llvm-commits] [llvm] r104066 - /llvm/trunk/lib/Target/TargetMachine.cpp

[Bill Wendling]

Author: void
Date: Tue May 18 16:47:08 2010
New Revision: 104066

URL: http://llvm.org/viewvc/llvm-project?rev=104066&view=rev
Log:
Don't eliminate frame pointers from leaf functions if "--disable-fp-elim" is
specified.

Modified:
    llvm/trunk/lib/Target/TargetMachine.cpp

Modified: llvm/trunk/lib/Target/TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=104066&r1=104065&r2=104066&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/TargetMachine.cpp Tue May 18 16:47:08 2010
@@ -275,7 +275,7 @@
   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();
     }