summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2009-06-22 18:38:48 +0000
committerEvan Cheng <evan.cheng@apple.com>2009-06-22 18:38:48 +0000
commit8dcbbdd00ebb4beb8eeb822791df326eee5de827 (patch)
treef18ca2e1ca402a234ae6881479212f14cfef25c1
parent08367b61638b4d446ebab69e2aad6431daa77ba7 (diff)
downloadllvm-8dcbbdd00ebb4beb8eeb822791df326eee5de827.tar.gz
llvm-8dcbbdd00ebb4beb8eeb822791df326eee5de827.tar.bz2
llvm-8dcbbdd00ebb4beb8eeb822791df326eee5de827.tar.xz
hasFP should return true if frame address is taken.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73893 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/ARM/ARMRegisterInfo.cpp4
-rw-r--r--test/CodeGen/ARM/arm-frameaddr.ll12
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMRegisterInfo.cpp b/lib/Target/ARM/ARMRegisterInfo.cpp
index bbc13001ae..522f65b4bf 100644
--- a/lib/Target/ARM/ARMRegisterInfo.cpp
+++ b/lib/Target/ARM/ARMRegisterInfo.cpp
@@ -497,7 +497,9 @@ ARMRegisterInfo::requiresRegisterScavenging(const MachineFunction &MF) const {
///
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
diff --git a/test/CodeGen/ARM/arm-frameaddr.ll b/test/CodeGen/ARM/arm-frameaddr.ll
new file mode 100644
index 0000000000..f1e4c2aeb7
--- /dev/null
+++ b/test/CodeGen/ARM/arm-frameaddr.ll
@@ -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