From nobody Sat Mar 19 23:14:38 2022 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 6D2111A360B9; Sat, 19 Mar 2022 23:14:38 +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 4KLcCf2VrVz4g3k; Sat, 19 Mar 2022 23:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647731678; 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=K2yJRX0T3ozAlOMnrJzOW/ImS+Q0XM/4dueAzvM1Ans=; b=XhaHidIrxza4IRTGGn8o9MMDRV9O+odZAjpdnc09Fu7PFgZeL+PiYPW7y65ib+dA3NaAue jU8jsN9z/3JBvygKCvogRHzYMk8Aoo2V8t4ORVQ6qv2KmDHCkW2k8VdDpoFmGhyU+xVqGM RgHAbKwHJqyTI7Zwrz4tTWhnVfKqwlRn/ddZqZhoWFuy9C/uoHe+z8/V/21JjD9kvIiLha O/Tmtd/U0VrQQYx82/iwwQqLxmvauBtdG7ekhFo2hOEM9EEjhWevmC1rXeZGjeFXEhNcdi EXgucw51JJG2NY1mX6QT19ASr0LQ2jDmN/X+Xc4ZFpXTY0+PuESCUZ097InBwA== 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 364511C0E1; Sat, 19 Mar 2022 23:14:38 +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 22JNEc3n036321; Sat, 19 Mar 2022 23:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JNEc8C036320; Sat, 19 Mar 2022 23:14:38 GMT (envelope-from git) Date: Sat, 19 Mar 2022 23:14:38 GMT Message-Id: <202203192314.22JNEc8C036320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8e72f458c6d3 - main - Fix llvm build after 1b3bef43e3cb, due to API change 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/main X-Git-Reftype: branch X-Git-Commit: 8e72f458c6d389870730ae0e95d28a0d8609a018 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647731678; 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=K2yJRX0T3ozAlOMnrJzOW/ImS+Q0XM/4dueAzvM1Ans=; b=tN98J8ssKDo8XbULVPP0BEnDxtZp2roSCcWh37vlD2/mC8z+Wt+MEvtFRg/YUMRMbNu3fj xbyfQCf/DfIvGopTIqlrLTY7SKZrPYe48dgWNptmyfto8g0XgmFcSTpUJYUzxMocTDpi3J RNd04YDULhW08pbfA/7fwMzP12f4vmVvnGPLm1/1YNTPbs8xe/5h80JDWJsheHdH+WeW9B X3IqFg9cQDQy/BrEXOp10j1P/aHhE4C1/HNdtrrzqbLU8ncfxoMlqtAi2SghuaY1ABaEGO RINlGRNjcISxpCN4ri+YLozMc9lAoqA7Q3p0hRAeRlGo3B2rS80Yol46ZIfz/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647731678; a=rsa-sha256; cv=none; b=UPggJzVulvEKXuW0cLLBmBdp7yv4YF510icEtUq7/9qxki0R3zJG8/nPj6RybSHuag1Zw1 sZPLmBis8iPYa517NF6YeZ5/+miy54axIRpxrt8lbulRLHqVOGdW28d7femMYDuW34SXou MDhy0k6ZUntSLIwRYr9f0/3pFhnXcsIPDNYmI1h799KhEKQARu3XrPzF8iap2PPcw8ZeIx pUMYAvsfPPh2DlPkX7OWlb7Rrs2nK7gVVN8+GW9Kn10qm+Oqya7rxIPT+33RnDN0690knl qnJkpzIWGBmsBZzgv4mTLYzubVUml23gLUn8/tqrKnjhS4kX2oY+fmd7mZDK8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8e72f458c6d389870730ae0e95d28a0d8609a018 commit 8e72f458c6d389870730ae0e95d28a0d8609a018 Author: Dimitry Andric AuthorDate: 2022-03-19 23:12:58 +0000 Commit: Dimitry Andric CommitDate: 2022-03-19 23:12:58 +0000 Fix llvm build after 1b3bef43e3cb, due to API change After merging llvm commit b9ca73e1a8fd for PR 262608, it would fail to compile with: /usr/src/contrib/llvm-project/llvm/lib/IR/Operator.cpp:197:22: error: no member named 'isZero' in 'llvm::APInt' if (!IndexedSize.isZero()) { ~~~~~~~~~~~ ^ Upstream refactored their APInt class, and isZero() was one of the newer methods which did not yet exist in llvm 13.0.0. Fix this by using the older but equivalent isNullValue() method instead. Fixes: 1b3bef43e3cb MFC after: 3 days --- contrib/llvm-project/llvm/lib/IR/Operator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/IR/Operator.cpp b/contrib/llvm-project/llvm/lib/IR/Operator.cpp index f9dbed31c44c..272c260d0111 100644 --- a/contrib/llvm-project/llvm/lib/IR/Operator.cpp +++ b/contrib/llvm-project/llvm/lib/IR/Operator.cpp @@ -194,7 +194,7 @@ bool GEPOperator::collectOffset( APInt(BitWidth, DL.getTypeAllocSize(GTI.getIndexedType())); // Insert an initial offset of 0 for V iff none exists already, then // increment the offset by IndexedSize. - if (!IndexedSize.isZero()) { + if (!IndexedSize.isNullValue()) { VariableOffsets.insert({V, APInt(BitWidth, 0)}); VariableOffsets[V] += IndexedSize; }