From owner-svn-src-all@FreeBSD.ORG  Sun Mar 16 16:33:26 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5B44B561;
 Sun, 16 Mar 2014 16:33:26 +0000 (UTC)
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 46776AD4;
 Sun, 16 Mar 2014 16:33:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GGXQ4o054163;
 Sun, 16 Mar 2014 16:33:26 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GGXQIv054162;
 Sun, 16 Mar 2014 16:33:26 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403161633.s2GGXQIv054162@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 16 Mar 2014 16:33:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r263247 - in stable: 10/contrib/llvm/lib/Target/X86
 9/contrib/llvm/lib/Target/X86
X-SVN-Group: stable-9
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.17
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: Sun, 16 Mar 2014 16:33:26 -0000

Author: dim
Date: Sun Mar 16 16:33:25 2014
New Revision: 263247
URL: http://svnweb.freebsd.org/changeset/base/263247

Log:
  Pull in r192123 from upstream llvm trunk (by Benjamin Kramer):
  
    X86: Fix type check. Just because an integer type is illegal doesn't
    mean it's i64.
  
    Fixes PR17495, where an i24 triggered this code. It's intended to
    optimize i64 loads on 32 bit x86.
  
  Fixes "Cannot select" fatal errors when building the audio/jack port
  with ALSA support turned on.
  
  This is a direct commit to stable/9 and stable/10, since head already
  has the commit as part of an upgrade to llvm/clang 3.4.
  
  Reported by:	Radim Kolar <hsn@sendmail.cz> via http://llvm.org/bugs/

Modified:
  stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp

Changes in other areas also in this revision:
Modified:
  stable/10/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp

Modified: stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
==============================================================================
--- stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Sun Mar 16 15:22:52 2014	(r263246)
+++ stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp	Sun Mar 16 16:33:25 2014	(r263247)
@@ -17669,7 +17669,7 @@ static SDValue PerformSINT_TO_FPCombine(
     if (!Ld->isVolatile() && !N->getValueType(0).isVector() &&
         ISD::isNON_EXTLoad(Op0.getNode()) && Op0.hasOneUse() &&
         !XTLI->getSubtarget()->is64Bit() &&
-        !DAG.getTargetLoweringInfo().isTypeLegal(VT)) {
+        VT == MVT::i64) {
       SDValue FILDChain = XTLI->BuildFILD(SDValue(N, 0), Ld->getValueType(0),
                                           Ld->getChain(), Op0, DAG);
       DAG.ReplaceAllUsesOfValueWith(Op0.getValue(1), FILDChain.getValue(1));