From nobody Sat Jun 10 00:58:38 2023 X-Original-To: dev-commits-ports-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 4QdKMM0NBhz4bxn5; Sat, 10 Jun 2023 00:58:39 +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 4QdKML72L0z422Q; Sat, 10 Jun 2023 00:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686358719; 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=/NNvJUfvJF34zV6qG5SJCOOdhLcSkqG9SYEf64Ow270=; b=eBJezW7s034dd+1QSIrfcX3/eGHj5pHYH7+ASit338Y/UUfzshCJVYr3g6qTTw3jwx8l5v qaIL0YNT6XzWV0NJPxlvq3aQVb2oDQ0GtAaYMb20EoGHXI5kyg6DMgRTnhEOzXrgKNV5yw rhHDAK9W1NjR4j6cHzvgdrfOZsjVNJLssE57MB4TfG2E/l0gKJwVMNFHTl6WqUTg1VPVn9 YQICGrgIb/YVhlrHfZ7Ai4Z02CiMkGQajcW+5o8NydjzxCjSV70+0TUaWo8qYPUwMquXT5 jcQrunxYCQ90EAnNZhNfPPIvVGMWD17KRV1yANQno+e8I6+qL99fbkkXB34bpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686358719; 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=/NNvJUfvJF34zV6qG5SJCOOdhLcSkqG9SYEf64Ow270=; b=elUdsVwuT0b9hF9Hs9vM42Vof/hGxPVodXekLpsYpzqGdpxYNTrEcuuV9pZMmnxLGeZWJD eLJ3cV/CA2k7IhGGJnybTUjKvQYlY/3BDYCBMfG7rTP/L80lD8ZUZTvidSg71XRHQC9Rej d1pDWVg6p944TE0XC3YH6z4Ics4HV7o7x0+bbX+0+SoLw715aMMDRmHhGiJDxnUdWOIL53 aDaOum/RRjFCwoOUy//kbF86iHVJHOoAOgDdqmtIyPInzX38OxV+OtR0xDuTb/zKhgQQ6/ H84gKgMsBs6Zub+n/79Nls6sV1e6bQAqtPvwQY1yIiFDhD0e99UzHzJDkIGa5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686358719; a=rsa-sha256; cv=none; b=mdENUDOcJXIkKNfNPlx78u5+Cs2zSmBQJAMvVIxKII/TtLxkR8xNxZp/q43kE/8bYo2htK KU7cmyh2kHs9PZd/Q9Ugm8DduLkgqXB3Ouol/N+LlsQ1ZFtd9psT4++yi6JdiY1DQilJU4 S+L1VVzff4Irhwb02DMBYSWFZ3ptFty9XY1SaceIwn/T0t8Ldbehfy7H/8u33kaqX9KDJe 8lgm3tBjnKvLMb+ySEhKyE68blD9vOilKrXSbtzG3Y8bsPKnHxmCPes5wUiqH1EWrhGQqc OE2eoOggwhyYdJbYiMGx6r/CMF0bW23w0Htrll75NBVvb1IF7k4P9jcHbGn3Zw== 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 4QdKML5z2rzx9m; Sat, 10 Jun 2023 00:58: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 35A0wcIX066346; Sat, 10 Jun 2023 00:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35A0wchl066345; Sat, 10 Jun 2023 00:58:38 GMT (envelope-from git) Date: Sat, 10 Jun 2023 00:58:38 GMT Message-Id: <202306100058.35A0wchl066345@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 988341a91ee8 - 2023Q2 - devel/llvm16: remove obsolete patch List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 988341a91ee816a7a2c3be367ef0d16605857da3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=988341a91ee816a7a2c3be367ef0d16605857da3 commit 988341a91ee816a7a2c3be367ef0d16605857da3 Author: Brooks Davis AuthorDate: 2023-05-30 18:46:28 +0000 Commit: Jan Beich CommitDate: 2023-06-10 00:58:00 +0000 devel/llvm16: remove obsolete patch PR: 271616 Reported by: jfc@mit.edu (cherry picked from commit c0b0bd52bbdaa97445caa0dab3a9f8b5815b227c) --- devel/llvm16/Makefile | 2 +- devel/llvm16/files/patch-freebsd-r352318 | 93 -------------------------------- 2 files changed, 1 insertion(+), 94 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index b7708473312b..56ad5326c221 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ diff --git a/devel/llvm16/files/patch-freebsd-r352318 b/devel/llvm16/files/patch-freebsd-r352318 deleted file mode 100644 index 4fe5c836b6ea..000000000000 --- a/devel/llvm16/files/patch-freebsd-r352318 +++ /dev/null @@ -1,93 +0,0 @@ -commit 24b1a5b926832f68fa0a008b2484d4b44f58ee8e -Author: dim -Date: Sat Sep 14 10:55:33 2019 +0000 - - Revert commit from upstream llvm trunk (by Hans Wennborg): - - Re-commit r357452 (take 3): "SimplifyCFG - SinkCommonCodeFromPredecessors: Also sink function calls without used - results (PR41259)" - - Third time's the charm. - - This was reverted in r363220 due to being suspected of an internal - benchmark regression and a test failure, none of which turned out to - be caused by this. - - As reported in https://bugs.llvm.org/show_bug.cgi?id=43269, this causes - UNREACHABLE errors when compiling if_malo_pci.c for arm and aarch64. - -Notes: - svn path=/projects/clang900-import/; revision=352318 - -diff --git lib/Transforms/Utils/SimplifyCFG.cpp lib/Transforms/Utils/SimplifyCFG.cpp -index 11651d040dc0..6e2ef67408d9 100644 ---- llvm/lib/Transforms/Utils/SimplifyCFG.cpp -+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp -@@ -1428,10 +1428,9 @@ static bool HoistThenElseCodeToIf(BranchInst *BI, - static bool canSinkInstructions( - ArrayRef Insts, - DenseMap> &PHIOperands) { -- // Prune out obviously bad instructions to move. Each instruction must have -- // exactly zero or one use, and we check later that use is by a single, common -- // PHI instruction in the successor. -- bool HasUse = !Insts.front()->user_empty(); -+ // Prune out obviously bad instructions to move. Any non-store instruction -+ // must have exactly one use, and we check later that use is by a single, -+ // common PHI instruction in the successor. - for (auto *I : Insts) { - // These instructions may change or break semantics if moved. - if (isa(I) || I->isEHPad() || isa(I) || -@@ -1445,10 +1444,9 @@ static bool canSinkInstructions( - if (C->isInlineAsm()) - return false; - -- // Each instruction must have zero or one use. -- if (HasUse && !I->hasOneUse()) -- return false; -- if (!HasUse && !I->user_empty()) -+ // Everything must have only one use too, apart from stores which -+ // have no uses. -+ if (!isa(I) && !I->hasOneUse()) - return false; - } - -@@ -1457,11 +1455,11 @@ static bool canSinkInstructions( - if (!I->isSameOperationAs(I0)) - return false; - -- // All instructions in Insts are known to be the same opcode. If they have a -- // use, check that the only user is a PHI or in the same block as the -- // instruction, because if a user is in the same block as an instruction we're -- // contemplating sinking, it must already be determined to be sinkable. -- if (HasUse) { -+ // All instructions in Insts are known to be the same opcode. If they aren't -+ // stores, check the only user of each is a PHI or in the same block as the -+ // instruction, because if a user is in the same block as an instruction -+ // we're contemplating sinking, it must already be determined to be sinkable. -+ if (!isa(I0)) { - auto *PNUse = dyn_cast(*I0->user_begin()); - auto *Succ = I0->getParent()->getTerminator()->getSuccessor(0); - if (!all_of(Insts, [&PNUse,&Succ](const Instruction *I) -> bool { -@@ -1539,7 +1537,7 @@ static bool sinkLastInstruction(ArrayRef Blocks) { - // it is slightly over-aggressive - it gets confused by commutative instructions - // so double-check it here. - Instruction *I0 = Insts.front(); -- if (!I0->user_empty()) { -+ if (!isa(I0)) { - auto *PNUse = dyn_cast(*I0->user_begin()); - if (!all_of(Insts, [&PNUse](const Instruction *I) -> bool { - auto *U = cast(*I->user_begin()); -@@ -1597,10 +1595,11 @@ static bool sinkLastInstruction(ArrayRef Blocks) { - I0->andIRFlags(I); - } - -- if (!I0->user_empty()) { -+ if (!isa(I0)) { - // canSinkLastInstruction checked that all instructions were used by - // one and only one PHI node. Find that now, RAUW it to our common - // instruction and nuke it. -+ assert(I0->hasOneUse()); - auto *PN = cast(*I0->user_begin()); - PN->replaceAllUsesWith(I0); - PN->eraseFromParent();