From owner-svn-src-head@freebsd.org  Mon Jan 30 18:35:26 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 069F5CC8456;
 Mon, 30 Jan 2017 18:35:26 +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 CA40936E;
 Mon, 30 Jan 2017 18:35:25 +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 v0UIZOcB005212;
 Mon, 30 Jan 2017 18:35:24 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UIZOhO005211;
 Mon, 30 Jan 2017 18:35:24 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701301835.v0UIZOhO005211@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: Mon, 30 Jan 2017 18:35:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312993 - head/contrib/llvm/lib/Transforms/Scalar
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2017 18:35:26 -0000

Author: dim
Date: Mon Jan 30 18:35:24 2017
New Revision: 312993
URL: https://svnweb.freebsd.org/changeset/base/312993

Log:
  Pull in r279454 from upstream llvm trunk (by James Molloy):
  
    [SROA] Remove incorrect assertion
  
    Confirmed with aprantl, this assertion is incorrect - code can get
    here (for example 80-bit FP types) and if it does it's benign. This
    is exposed by a completely unrelated patch of mine, so stop the
    compiler falling over.
  
    Original differential: http://reviews.llvm.org/D16187
    aprantl's advice to remove assertion:
    http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20160815/382129.html
  
  This should fix assertions when building the math/opensolaris-libm port.
  
  Reported by:	marino
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp

Modified: head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
==============================================================================
--- head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp	Mon Jan 30 16:32:53 2017	(r312992)
+++ head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp	Mon Jan 30 18:35:24 2017	(r312993)
@@ -4040,9 +4040,6 @@ bool SROA::splitAlloca(AllocaInst &AI, A
           Size = std::min(Size, AbsEnd - Start);
         }
         PieceExpr = DIB.createBitPieceExpression(Start, Size);
-      } else {
-        assert(Pieces.size() == 1 &&
-               "partition is as large as original alloca");
       }
 
       // Remove any existing dbg.declare intrinsic describing the same alloca.