From owner-svn-src-head@freebsd.org Thu Sep 3 18:34:02 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C6223C7010; Thu, 3 Sep 2020 18:34:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8bG1q23z3ZbK; Thu, 3 Sep 2020 18:34:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21AE51FE62; Thu, 3 Sep 2020 18:34:02 +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 083IY2hf012445; Thu, 3 Sep 2020 18:34:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083IY2uG012444; Thu, 3 Sep 2020 18:34:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202009031834.083IY2uG012444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 3 Sep 2020 18:34:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365307 - head/contrib/llvm-project/llvm/include/llvm/ADT X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/contrib/llvm-project/llvm/include/llvm/ADT X-SVN-Commit-Revision: 365307 X-SVN-Commit-Repository: base 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.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:34:02 -0000 Author: dim Date: Thu Sep 3 18:34:01 2020 New Revision: 365307 URL: https://svnweb.freebsd.org/changeset/base/365307 Log: Merge commit f26fc568402f from llvm git (by me): Eliminate the sizing template parameter N from CoalescingBitVector Since the parameter is not used anywhere, and the default size of 16 apparently causes PR47359, remove it. This ensures that IntervalMap will automatically determine the optimal size, using its NodeSizer struct. Reviewed By: dblaikie Differential Revision: https://reviews.llvm.org/D87044 This should fix 'Assertion failed: (Elements + Grow <= Nodes * Capacity && "Not enough room for elements"), function distribute, file /usr/src/contrib/llvm-project/llvm/lib/Support/IntervalMap.cpp, line 123.' when building the x11-toolkits/py-wxPython40 port on a i386 host. Reported by: zeising MFC after: 6 weeks X-MFC-With: r364284 Modified: head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Modified: head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h ============================================================================== --- head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Thu Sep 3 18:27:13 2020 (r365306) +++ head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Thu Sep 3 18:34:01 2020 (r365307) @@ -34,15 +34,14 @@ namespace llvm { /// performance for non-sequential find() operations. /// /// \tparam IndexT - The type of the index into the bitvector. -/// \tparam N - The first N coalesced intervals of set bits are stored in-place. -template class CoalescingBitVector { +template class CoalescingBitVector { static_assert(std::is_unsigned::value, "Index must be an unsigned integer."); - using ThisT = CoalescingBitVector; + using ThisT = CoalescingBitVector; /// An interval map for closed integer ranges. The mapped values are unused. - using MapT = IntervalMap; + using MapT = IntervalMap; using UnderlyingIterator = typename MapT::const_iterator;