svn commit: r296008 - projects/clang380-import/contrib/llvm/lib/Target/X86

[Dimitry Andric]

Author: dim
Date: Wed Feb 24 21:41:28 2016
New Revision: 296008
URL: https://svnweb.freebsd.org/changeset/base/296008

Log:
  Undo r295543, since the shrink wrapping bug was fixed upstream by Davide
  Italiano and Quentin Colombet.

Modified:
  projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp

Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Wed Feb 24 21:38:51 2016	(r296007)
+++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp	Wed Feb 24 21:41:28 2016	(r296008)
@@ -2592,9 +2592,6 @@ bool X86FrameLowering::canUseAsEpilogue(
 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::enableShrinkWrapp
          // - adjustForHiPEPrologue
          MF.getFunction()->getCallingConv() != CallingConv::HiPE &&
          !MF.shouldSplitStack();
-#endif
 }
 
 MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers(