diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-04-15 03:35:57 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-04-15 03:35:57 +0000 |
| commit | bcb8c6d09ee426e0f774e3412912f6ae9e5f78dd (patch) | |
| tree | 19eda0282d1d201b4a7ae6dc5b2760d73a13eaf3 /lib/Target/X86/X86FrameLowering.cpp | |
| parent | 9eec66e604f09ed9779bc438d0dc4fa9d24db44c (diff) | |
| download | external_llvm-bcb8c6d09ee426e0f774e3412912f6ae9e5f78dd.tar.gz external_llvm-bcb8c6d09ee426e0f774e3412912f6ae9e5f78dd.tar.bz2 external_llvm-bcb8c6d09ee426e0f774e3412912f6ae9e5f78dd.zip | |
Revert r129518, "Change ELF systems to use CFI for producing the EH tables. This reduces the"
It broke several builds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129557 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86FrameLowering.cpp')
| -rw-r--r-- | lib/Target/X86/X86FrameLowering.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp index 52ea6a847c..071fbe0cef 100644 --- a/lib/Target/X86/X86FrameLowering.cpp +++ b/lib/Target/X86/X86FrameLowering.cpp @@ -22,7 +22,6 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" -#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Support/CommandLine.h" @@ -477,15 +476,6 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { .addReg(StackPtr); if (needsFrameMoves) { - const MCAsmInfo &MAI = MMI.getContext().getAsmInfo(); - if (MAI.getExceptionHandlingType() == ExceptionHandling::DwarfCFI) { - MCSymbol *FrameLabel0 = MMI.getContext().CreateTempSymbol(); - BuildMI(MBB, MBBI, DL, TII.get(X86::PROLOG_LABEL)).addSym(FrameLabel0); - MachineLocation FPSrc0(FramePtr); - MachineLocation FPDst0(FramePtr, -2 * stackGrowth); - Moves.push_back(MachineMove(FrameLabel0, FPDst0, FPSrc0)); - } - // Mark effective beginning of when frame pointer becomes valid. MCSymbol *FrameLabel = MMI.getContext().CreateTempSymbol(); BuildMI(MBB, MBBI, DL, TII.get(X86::PROLOG_LABEL)).addSym(FrameLabel); @@ -625,7 +615,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { emitSPUpdate(MBB, MBBI, StackPtr, -(int64_t)NumBytes, Is64Bit, TII, *RegInfo); - if (( (!HasFP && NumBytes) || PushedRegs) && needsFrameMoves) { + if ((NumBytes || PushedRegs) && needsFrameMoves) { // Mark end of stack pointer adjustment. MCSymbol *Label = MMI.getContext().CreateTempSymbol(); BuildMI(MBB, MBBI, DL, TII.get(X86::PROLOG_LABEL)).addSym(Label); |