[llvm-commits] CVS: llvm/lib/Target/ARM/ARMRegisterInfo.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMRegisterInfo.cpp updated: 1.50 -> 1.51
---
Log message:

Don't want to add FramePtr to callee save spill list twice.

---
Diffs of the changes:  (+2 -8)

 ARMRegisterInfo.cpp |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.50 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.51
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.50	Wed Jan 31 16:25:33 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Wed Jan 31 17:17:29 2007
@@ -881,13 +881,7 @@
     }
   }
 
-  if (hasFP(MF)) {
-    MF.changePhyRegUsed(FramePtr, true);
-    NumGPRSpills++;
-    CanEliminateFrame = false;
-  }
-
-  if (!CanEliminateFrame) {
+  if (!CanEliminateFrame || hasFP(MF)) {
     AFI->setHasStackFrame(true);
 
     // If LR is not spilled, but at least one of R4, R5, R6, and R7 is spilled.
@@ -902,7 +896,7 @@
 
     // Darwin ABI requires FP to point to the stack slot that contains the
     // previous FP.
-    if (STI.isTargetDarwin()) {
+    if (STI.isTargetDarwin() || hasFP(MF)) {
       MF.changePhyRegUsed(FramePtr, true);
       NumGPRSpills++;
     }