From nobody Wed Mar 23 19:59:32 2022 X-Original-To: dev-commits-src-branches@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 D87371A46C4B; Wed, 23 Mar 2022 19:59:32 +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 4KNzhh3p2lz4VNB; Wed, 23 Mar 2022 19:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065572; 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=Zy1ZxrAyBBoVtUkQ95i43fSeNosjlJMLZsSB0YNgTF4=; b=cM2TCGsljdWxwH+pn3a2ZYNc7w9SUk4vG1jdKSAGwknYe2IHMvxG9A+Y8Bz2mw6WSQlFoF lm5qtyQW8IQLMRAueWJ2BU8VcY1XP2k1My8GuXvgoMaXz6ySrXvDZZGUmKbzrkP2FDf7xW 5HLY1V5x9xf1l05K6yaZlrMkHHeYgCaqVFnX7jixjOSSM52z8hv3wsIYkuUqhanCmZo/QJ Ln2krrPcw1ZOIpxENzCFv/V0TG/B88DQwGyzLuYOBw5YuluGmVJjvjPEttO/JiZo76QOKM ue0OrDAlH1v+PV7f37UPtr7She8Ru9Zwe0byRm0OktmuwA5Q9YQvFV61a9SR6Q== 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 486261BD9; Wed, 23 Mar 2022 19:59:32 +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 22NJxWro021342; Wed, 23 Mar 2022 19:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NJxWH5021341; Wed, 23 Mar 2022 19:59:32 GMT (envelope-from git) Date: Wed, 23 Mar 2022 19:59:32 GMT Message-Id: <202203231959.22NJxWH5021341@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: 9d27f016c7a1 - stable/12 - Fix llvm build after 1b3bef43e3cb, due to API change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 9d27f016c7a1c76530a47c66a7fd584f3221db62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648065572; 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=Zy1ZxrAyBBoVtUkQ95i43fSeNosjlJMLZsSB0YNgTF4=; b=qhi59vXfJ9WIQKjUDJ9pcrrHcm7s4pHKfwd1WWeVX86fcIYsV2mRYIMbKh6BPMMW6IWj0E d7CCxZpUs1KnSCzaZK9GgRvcTLYFPwiRxUXw0zy5qUvyEY6hpTn6iCn5vSRrXB+vNIBpMY M/NnMOh1gSZ40vf4NoW0vj5tohlJz98irMHQ5Mi6R+3iZnzPF5Rz8eoxHrQyYRIzrwtY6F hKj5uuUvJKWlaqpTjRR6d6gIIRrQ4d62IVsGCcAHQvTGWg1qr5wsKH+l80nTM3M3Ziy3s2 Nb/nQYGYGB9FrnvmndEVPVjrQ9oGaBynfdxSkolbtoY/IE32zjX6LMzLKPnU1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648065572; a=rsa-sha256; cv=none; b=fc5vSthgjGVa3kpgkb/ywPb50SgFDLx8FOKax+rqI2TgnJBHXcYnb/6uv9R/Gao8smw4kX ZUV2Y5gQP2wvU6x/Ld95EKss4+8nNIVRpSZmCDEAHP4iAna0/rmHhK0g4e+mnSVdvIHuVj oesjHSjVow+bw0RWLlBg8iuupKnGORUqqPzHm+wXueifGGj9JWr5P4IvkLq/iB5gBNzza4 oFLtnavyunJzsEmRq1vEf/OLq02+ZUA1eyeaOQA+F0Onk/MPUZLLf+Slu1cifNckK0vPwi WzhXfmvwci04TY/5cZwa/tagyOKNlb8ViO/SUqJiit3SwoQPZnzbqJDY+JVdCg== 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=9d27f016c7a1c76530a47c66a7fd584f3221db62 commit 9d27f016c7a1c76530a47c66a7fd584f3221db62 Author: Dimitry Andric AuthorDate: 2022-03-19 23:12:58 +0000 Commit: Dimitry Andric CommitDate: 2022-03-23 19:57:33 +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; }