aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/X86/X86RegisterInfo.cpp
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2013-02-19 23:50:45 +0000
committerChad Rosier <mcrosier@apple.com>2013-02-19 23:50:45 +0000
commitb86f1e5e557f8a00209eef1c6ecb4532b33d7738 (patch)
tree4e5f4b2ded8e1ddb4ee6091f1e7473f6a845627f /lib/Target/X86/X86RegisterInfo.cpp
parent2f87fed2479017589051a5a99277e4278f6372e3 (diff)
downloadexternal_llvm-b86f1e5e557f8a00209eef1c6ecb4532b33d7738.zip
external_llvm-b86f1e5e557f8a00209eef1c6ecb4532b33d7738.tar.gz
external_llvm-b86f1e5e557f8a00209eef1c6ecb4532b33d7738.tar.bz2
[ms-inline asm] Force the use of a base pointer if the MachineFunction includes
MS-style inline assembly. This is a follow-on to r175334. Forcing a FP to be emitted doesn't ensure it will be used. Therefore, force the base pointer as well. We now treat MS inline assembly in the same way we treat functions with dynamic stack realignment and VLAs. This guarantees the BP will be used to reference parameters and locals. rdar://13218191 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175576 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86RegisterInfo.cpp')
-rw-r--r--lib/Target/X86/X86RegisterInfo.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 401eefb..fbe6331 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -389,8 +389,10 @@ bool X86RegisterInfo::hasBasePointer(const MachineFunction &MF) const {
return false;
// When we need stack realignment and there are dynamic allocas, we can't
- // reference off of the stack pointer, so we reserve a base pointer.
- if (needsStackRealignment(MF) && MFI->hasVarSizedObjects())
+ // reference off of the stack pointer, so we reserve a base pointer. This
+ // is also true if the function contain MS-style inline assembly.
+ if ((needsStackRealignment(MF) && MFI->hasVarSizedObjects()) ||
+ MF.hasMSInlineAsm())
return true;
return false;