From owner-svn-src-all@freebsd.org  Fri Nov 11 21:01:47 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 0DA6DC3B67B;
 Fri, 11 Nov 2016 21:01:47 +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 D39B21E88;
 Fri, 11 Nov 2016 21:01:46 +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 uABL1kG1038133;
 Fri, 11 Nov 2016 21:01:46 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uABL1koq038132;
 Fri, 11 Nov 2016 21:01:46 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201611112101.uABL1koq038132@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 11 Nov 2016 21:01:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308559 - head/contrib/llvm/lib/Target/AArch64
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2016 21:01:47 -0000

Author: dim
Date: Fri Nov 11 21:01:45 2016
New Revision: 308559
URL: https://svnweb.freebsd.org/changeset/base/308559

Log:
  Pull in r263169 from upstream llvm trunk (by Tim Northover):
  
    AArch64: only try to use scaled fcvt ops on legal vector types.
  
    Before we ended up calling getSimpleVectorType on a <3 x float>, which
    asserted.
  
  This fixes an assertion when building the print/ghostscript9-agpl-base
  port for AArch64.
  
  PR:		213865
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Modified: head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp	Fri Nov 11 20:44:33 2016	(r308558)
+++ head/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp	Fri Nov 11 21:01:45 2016	(r308559)
@@ -7581,7 +7581,8 @@ static SDValue performFpToIntCombine(SDN
     return SDValue();
 
   SDValue Op = N->getOperand(0);
-  if (!Op.getValueType().isVector() || Op.getOpcode() != ISD::FMUL)
+  if (!Op.getValueType().isVector() || !Op.getValueType().isSimple() ||
+      Op.getOpcode() != ISD::FMUL)
     return SDValue();
 
   SDValue ConstVec = Op->getOperand(1);