[llvm-commits] [llvm] r73893 - in /llvm/trunk: lib/Target/ARM/ARMRegisterInfo.cpp test/CodeGen/ARM/arm-frameaddr.ll

[Evan Cheng]

Author: evancheng
Date: Mon Jun 22 13:38:48 2009
New Revision: 73893

URL: http://llvm.org/viewvc/llvm-project?rev=73893&view=rev
Log:
hasFP should return true if frame address is taken.

Added:
    llvm/trunk/test/CodeGen/ARM/arm-frameaddr.ll
Modified:
    llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp?rev=73893&r1=73892&r2=73893&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp Mon Jun 22 13:38:48 2009
@@ -497,7 +497,9 @@
 ///
 bool ARMRegisterInfo::hasFP(const MachineFunction &MF) const {
   const MachineFrameInfo *MFI = MF.getFrameInfo();
-  return NoFramePointerElim || MFI->hasVarSizedObjects();
+  return (NoFramePointerElim ||
+          MFI->hasVarSizedObjects() ||
+          MFI->isFrameAddressTaken());
 }
 
 // hasReservedCallFrame - Under normal circumstances, when a frame pointer is

Added: llvm/trunk/test/CodeGen/ARM/arm-frameaddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/arm-frameaddr.ll?rev=73893&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/ARM/arm-frameaddr.ll (added)
+++ llvm/trunk/test/CodeGen/ARM/arm-frameaddr.ll Mon Jun 22 13:38:48 2009
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin  | grep mov | grep r7
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | grep mov | grep r11
+; PR4344
+; PR4416
+
+define arm_aapcscc i8* @t() nounwind {
+entry:
+	%0 = call i8* @llvm.frameaddress(i32 0)
+        ret i8* %0
+}
+
+declare i8* @llvm.frameaddress(i32) nounwind readnone