From nobody Wed Mar 23 19:59:10 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 B64191A467D8; Wed, 23 Mar 2022 19:59:11 +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 4KNzhG6qKSz4V5B; Wed, 23 Mar 2022 19:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065551; 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=KV+s565ppV3lw0XDnv+pZF/ZvlZNhqBjK3ASxywDMAI=; b=ZyQjOt2sqQlASFl76tPZcNg6DAB/9YP4pCBSf0Tpyxd+Rb+1d75qneqV7X4hVAedbrLENa 3Aj6dKTN95+tFfgeoFUwRFgrdX/xMuURDZQZbH8b6Z99LbN8aDejwb+FrE02iAyaNYWySc 9oFplmjpMcSwDQZOi0C6wi5K/RMk57dwZLEkbuM1HolQOQB8IkP/FkLEnfuPBGYX71NvHz eaxy5QnVoAKAzh+h9MTIGgoBXvvTUvh+XWJ9bYqvbVe5SjnNta4xGpf+zcPZaUNhLcHr+6 BB/1//6U+p06ILznL/3ayh17d0KQpHapCLGoGZ8Vaw84MDOIpjLikfsj4GBQ9g== 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 C32D31E9A; Wed, 23 Mar 2022 19:59:10 +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 22NJxAq5021163; Wed, 23 Mar 2022 19:59:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NJxAmR021162; Wed, 23 Mar 2022 19:59:10 GMT (envelope-from git) Date: Wed, 23 Mar 2022 19:59:10 GMT Message-Id: <202203231959.22NJxAmR021162@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: 4743b9623bd4 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4743b9623bd48ba1e6c7edc19a2cc63b43625b34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065551; 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=KV+s565ppV3lw0XDnv+pZF/ZvlZNhqBjK3ASxywDMAI=; b=gUV8lepD/MLLlltvix07Jo91vmc4rbcSfq9xLbo7g0IYgcq7c7CvvAxc1QFYHIhlNT3inX EgwUMrS34OhYRFjepAkfFi45doHPApHXQDSZOp62OopsWz+2Rm3qN0lSym/5anhLc0qlFE ti0JKxmLKEASeCiHS9xmEVKPStSzsmjQoyHZsITILOkCOIbA5Z8yZ8WywKLwTlvGhZvNBl OY1z6YvbpHr20+YW59VDMxC29UW7jzxNXoHic4WGpOeXEIHPx8tKvrALRKS+p+R6NWgMq9 DzJ7Fh4/2UVQDLfa7To2Ms2twnsnwFEbW4aQNZ58EpDx1934TIKGr49iEXLWFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648065551; a=rsa-sha256; cv=none; b=bwjcozBb4Nw6YAuVvl4XFnVO0asn/6Psdjw+cthCXpmnKuEZpMqLRBDdSEq6M7QNB7HFAF 6ytOxVR8RMYop40ovLC6pGY5Khz3cAXmoHLEhqcXMU81e6hrRXFTwQrYqJWOJICrRA98Fq O8ItEYII85q2BOIpegtQMuO6o3CCgn7vT+l9zlJc+8S93wstF6UNVH4cpRBApUGP/tn8DM y9kpn83TbcWZs6MnPcuBvawBwtu9kTA3Oyof+jxwqXdkfGdzCo9EKgDOu3pVrtSXCUXDCM l6rn6O9PNN3bFTUBu5HIVVt7aeRpf8I3vQqoY7LUTP0JPaLnUdX1ocMjwSgpUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4743b9623bd48ba1e6c7edc19a2cc63b43625b34 commit 4743b9623bd48ba1e6c7edc19a2cc63b43625b34 Author: Dimitry Andric AuthorDate: 2022-03-19 23:12:58 +0000 Commit: Dimitry Andric CommitDate: 2022-03-23 19:57:49 +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 (cherry picked from commit 8e72f458c6d389870730ae0e95d28a0d8609a018) --- 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; }