From owner-svn-src-projects@freebsd.org Wed Feb 24 21:41:29 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C0EAAB3F97 for ; Wed, 24 Feb 2016 21:41:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A8F869B; Wed, 24 Feb 2016 21:41:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1OLfSYa067764; Wed, 24 Feb 2016 21:41:28 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1OLfSnt067763; Wed, 24 Feb 2016 21:41:28 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201602242141.u1OLfSnt067763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 24 Feb 2016 21:41:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r296008 - projects/clang380-import/contrib/llvm/lib/Target/X86 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2016 21:41:29 -0000 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(