From owner-svn-src-all@FreeBSD.ORG  Fri Feb 15 23:12:59 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0DD569CF;
 Fri, 15 Feb 2013 23:12:59 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F389CCFD;
 Fri, 15 Feb 2013 23:12:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1FNCwUP038810;
 Fri, 15 Feb 2013 23:12:58 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1FNCw4D038809;
 Fri, 15 Feb 2013 23:12:58 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201302152312.r1FNCw4D038809@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 15 Feb 2013 23:12:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246858 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Feb 2013 23:12:59 -0000

Author: dim
Date: Fri Feb 15 23:12:58 2013
New Revision: 246858
URL: http://svnweb.freebsd.org/changeset/base/246858

Log:
  Pull in r175057 from upstream llvm trunk:
  
    X86: Disable generation of rep;movsl when %esi is used as a base pointer.
  
    This happens when there is both stack realignment and a dynamic alloca in the
    function. If we overwrite %esi (rep;movsl uses fixed registers) we'll lose the
    base pointer and the next register spill will write into oblivion.
  
    Fixes PR15249 and unbreaks firefox on i386/freebsd. Mozilla uses dynamic allocas
    and freebsd a 4 byte stack alignment.
  
  MFC after:	1 week

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

Modified: head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp	Fri Feb 15 23:12:35 2013	(r246857)
+++ head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp	Fri Feb 15 23:12:58 2013	(r246858)
@@ -202,6 +202,14 @@ X86SelectionDAGInfo::EmitTargetCodeForMe
       SrcPtrInfo.getAddrSpace() >= 256)
     return SDValue();
 
+  // ESI might be used as a base pointer, in that case we can't simply overwrite
+  // the register.  Fall back to generic code.
+  const X86RegisterInfo *TRI =
+      static_cast<const X86RegisterInfo *>(DAG.getTarget().getRegisterInfo());
+  if (TRI->hasBasePointer(DAG.getMachineFunction()) &&
+      TRI->getBaseRegister() == X86::ESI)
+    return SDValue();
+
   MVT AVT;
   if (Align & 1)
     AVT = MVT::i8;