From owner-svn-src-head@FreeBSD.ORG  Sun Oct  6 16:12:45 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CE622D06;
 Sun,  6 Oct 2013 16:12:45 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BC02C2217;
 Sun,  6 Oct 2013 16:12:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96GCjf5048277;
 Sun, 6 Oct 2013 16:12:45 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96GCjVr048276;
 Sun, 6 Oct 2013 16:12:45 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201310061612.r96GCjVr048276@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 6 Oct 2013 16:12:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256090 - head/contrib/llvm/lib/Target/X86
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 16:12:45 -0000

Author: dim
Date: Sun Oct  6 16:12:45 2013
New Revision: 256090
URL: http://svnweb.freebsd.org/changeset/base/256090

Log:
  Pull in r192064 from upstream llvm trunk:
  
    X86: Don't fold spills into SSE operations if the stack is unaligned.
  
    Regalloc can emit unaligned spills nowadays, but we can't fold the
    spills into SSE ops if we can't guarantee alignment. PR12250.
  
  This fixes unaligned SSE accesses (leading to a SIGBUS) which could
  occur in the ffmpeg ports.
  
  Approved by:	re (kib)
  Reported by:	tijl
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp

Modified: head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp	Sun Oct  6 15:59:06 2013	(r256089)
+++ head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp	Sun Oct  6 16:12:45 2013	(r256090)
@@ -3881,6 +3881,10 @@ MachineInstr* X86InstrInfo::foldMemoryOp
   const MachineFrameInfo *MFI = MF.getFrameInfo();
   unsigned Size = MFI->getObjectSize(FrameIndex);
   unsigned Alignment = MFI->getObjectAlignment(FrameIndex);
+  // If the function stack isn't realigned we don't want to fold instructions
+  // that need increased alignment.
+  if (!RI.needsStackRealignment(MF))
+    Alignment = std::min(Alignment, TM.getFrameLowering()->getStackAlignment());
   if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) {
     unsigned NewOpc = 0;
     unsigned RCSize = 0;