diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-12-10 18:27:32 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-12-10 18:27:32 +0000 |
| commit | ee08897fb8d4b59b4609f6e837205e7a089b6fb7 (patch) | |
| tree | c2b3f4fa2494bc1195edbd74c4e162e882c73c82 /llvm/lib/Target/X86/X86FrameLowering.cpp | |
| parent | 6f2f39006ba5b95e6314f83c0a8cd670152892d3 (diff) | |
| download | bcm5719-llvm-ee08897fb8d4b59b4609f6e837205e7a089b6fb7.tar.gz bcm5719-llvm-ee08897fb8d4b59b4609f6e837205e7a089b6fb7.zip | |
Reland "Fix miscompile of MS inline assembly with stack realignment"
This re-lands commit r196876, which was reverted in r196879.
The tests have been fixed to pass on platforms with a stack alignment
larger than 4.
Update to clang side tests will land shortly.
llvm-svn: 196939
Diffstat (limited to 'llvm/lib/Target/X86/X86FrameLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 88d7c5e175b..142e60b4836 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -50,7 +50,7 @@ bool X86FrameLowering::hasFP(const MachineFunction &MF) const { return (MF.getTarget().Options.DisableFramePointerElim(MF) || RegInfo->needsStackRealignment(MF) || MFI->hasVarSizedObjects() || - MFI->isFrameAddressTaken() || MF.hasMSInlineAsm() || + MFI->isFrameAddressTaken() || MFI->hasInlineAsmWithSPAdjust() || MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer() || MMI.callsUnwindInit() || MMI.callsEHReturn()); } |
