commit 0a9509f0806b803be1693fef246b3a825d3721c7
author Reid Kleckner <reid@kleckner.net> Tue Dec 10 05:31:27 2013 +0000
committer Reid Kleckner <reid@kleckner.net> Tue Dec 10 05:31:27 2013 +0000
tree ee0249862532b9fed79ce55dc5be61b1ee431e1c
parent 2f47acfd6a3a17c7d0d0c5b5007bdac5a55e31e8

Revert "Fix miscompile of MS inline assembly with stack realignment"

This reverts commit r196876.  Its tests failed on the bots, so I'll
figure it out tomorrow.

llvm-svn: 196879

llvm/lib/Target/X86/X86FrameLowering.cpp

diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
index 0d76534..a06ba9d 100644
--- a/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -50,7 +50,7 @@
   return (MF.getTarget().Options.DisableFramePointerElim(MF) ||
           RegInfo->needsStackRealignment(MF) ||
           MFI->hasVarSizedObjects() ||
-          MFI->isFrameAddressTaken() || MFI->hasInlineAsmWithSPAdjust() ||
+          MFI->isFrameAddressTaken() || MF.hasMSInlineAsm() ||
           MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer() ||
           MMI.callsUnwindInit() || MMI.callsEHReturn());
 }