From nobody Wed Dec 22 10:06:12 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 86FBF1906487; Wed, 22 Dec 2021 10:06:23 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpr94NbDz4YlV; Wed, 22 Dec 2021 10:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE21E1B2CD; Wed, 22 Dec 2021 10:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA6CUC092384; Wed, 22 Dec 2021 10:06:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6CpE092383; Wed, 22 Dec 2021 10:06:12 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:12 GMT Message-Id: <202112221006.1BMA6CpE092383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 58c2274c5dc5 - stable/12 - Merge commit f26fc568402f from llvm git (by me): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 58c2274c5dc57b04979fc8f759d1285ae263fc86 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRcY7im5+hsQwb/rc/mIQ6H1aTPxapoldL44KIx740c=; b=EPzbr5MhNgi6t5j8W8FBfKqROyfpxEsPix/pqQknoT6Qf86U71EBYPDh1osj+cjyEooedQ xcmgVJ0JAtKqLkhC5UoYWIv7euHEYpzRPkfggV+WKrkfMc+vVkUzer0SC1tcEX/5AbPc/z UcSAqvIe6hI1vOnRpWx+N49tvOBRAJLnJ3bG0XWCXl2inDAAV9iSn1ieOsXZtS4kJuPld1 rKOHe6r+StZeiIVFsH69KrFa4g7eVg3MpLfOAVPFBGg0Mm2Ofo0z+5REA6amhSFsEg78Em Us3lrxdXZCgvzFBz8cLxwcpso+sAOhNUEsJ+M0oNySqv86iPzGtKjP25W0VcDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167579; a=rsa-sha256; cv=none; b=H7LvYKu6KvPvHs/kR+YH70sBUI1TVTM63jUaXTy388MDOO6Rg4T8xBKktJ10Op40XFwc1U 1qCBCPnJ66/zzU6QLfjBtTSTFLWudfmzIoYwkYVIBWxFqwhDTX1amfXk6OWTUQSHB5w8aR wcgI/dx6ZiCbXGgen04jvLiJvLDeVWJo1bLAEPyRpVkKYsuPI8qyaUforS44a5GDSO8ZhL mDoyVi8vtTXCCiYm5IkMcD60oSDJ39sStzdCKdEhDDXECU0sFqC1H9SQSsvCVevqAmqsEB 82SLbvFkD2oPOG0MM6aGKuVB9XzLIjY6OQrMQr7cLPPkK3nwZbvcEI9eEts/AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=58c2274c5dc57b04979fc8f759d1285ae263fc86 commit 58c2274c5dc57b04979fc8f759d1285ae263fc86 Author: Dimitry Andric AuthorDate: 2020-09-03 18:34:01 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:15 +0000 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 (cherry picked from commit 031db28b2b2f7a0b367e7fb60e6658e9b4e5ca00) --- contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h b/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h index f8c8fec0ec9e..0a7dcfe22631 100644 --- a/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h +++ b/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h @@ -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;