From ada6aca3cc8473bff3d821fa5eb1b0410fb36fb8 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 24 Feb 2016 21:41:28 +0000 Subject: [PATCH] Undo r295543, since the shrink wrapping bug was fixed upstream by Davide Italiano and Quentin Colombet. --- contrib/llvm/lib/Target/X86/X86FrameLowering.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp b/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp index 62d88b758387..f5ffe0cf7e88 100644 --- a/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -2592,9 +2592,6 @@ bool X86FrameLowering::canUseAsEpilogue(const MachineBasicBlock &MBB) const { bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const { // If we may need to emit frameless compact unwind information, give // up as this is currently broken: PR25614. -#if 1 - return false; -#else return (MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF)) && // The lowering of segmented stack and HiPE only support entry blocks // as prologue blocks: PR26107. @@ -2603,7 +2600,6 @@ bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const { // - adjustForHiPEPrologue MF.getFunction()->getCallingConv() != CallingConv::HiPE && !MF.shouldSplitStack(); -#endif } MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers(