Undo r295543, since the shrink wrapping bug was fixed upstream by Davide

Italiano and Quentin Colombet.
This commit is contained in:
dim 2016-02-24 21:41:28 +00:00
parent 7ef26dcde6
commit 72672a13f9

View File

@ -2592,9 +2592,6 @@ bool X86FrameLowering::canUseAsEpilogue(const MachineBasicBlock &MBB) const {
bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const { bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const {
// If we may need to emit frameless compact unwind information, give // If we may need to emit frameless compact unwind information, give
// up as this is currently broken: PR25614. // up as this is currently broken: PR25614.
#if 1
return false;
#else
return (MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF)) && return (MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF)) &&
// The lowering of segmented stack and HiPE only support entry blocks // The lowering of segmented stack and HiPE only support entry blocks
// as prologue blocks: PR26107. // as prologue blocks: PR26107.
@ -2603,7 +2600,6 @@ bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const {
// - adjustForHiPEPrologue // - adjustForHiPEPrologue
MF.getFunction()->getCallingConv() != CallingConv::HiPE && MF.getFunction()->getCallingConv() != CallingConv::HiPE &&
!MF.shouldSplitStack(); !MF.shouldSplitStack();
#endif
} }
MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers( MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers(