From nobody Fri Jul 01 23:16: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 E32A88A1AB7; Fri, 1 Jul 2022 23:16:10 +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 4LZWKQ5vs4z4cyC; Fri, 1 Jul 2022 23:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656717370; 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=J38fcWgjlbWbmaJirHNBAyUrg2gWWiY53b7tjE922I8=; b=HeLNyh72k8akCL7EmdFpsGrbHJTnwkvHCzaYsziQygUF6NmX57iVgnOboAHPT3tPik63fd 4aNXvUBfJCISWE5+M5ty/5/znJ9L1zXh9dSnAJSQmFnF0zSwZS/URhg0DrcDvVgFJ+zOc/ dWWqtiWFL9lgWe/0c17iHYfZ1zA568YaT2/FPA3y/HtU+db49IVOrPxhXNuTASDL4OOMVD yQeZuqwmYN0egL8glEB+jHYyRVavOU2rk5llE5KeCskq1a6PkKA2PY0GNhFttUYP172/RW 7cTqItv/y1K3grbSA4kvtbfQg3tmPOlb+putclkhTJLU/ePPJMoMxIBtV0vmIg== 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 AB8DB24650; Fri, 1 Jul 2022 23:16: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 261NGAj5035370; Fri, 1 Jul 2022 23:16:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261NGA3I035369; Fri, 1 Jul 2022 23:16:10 GMT (envelope-from git) Date: Fri, 1 Jul 2022 23:16:10 GMT Message-Id: <202207012316.261NGA3I035369@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: 836d47d38e0a - main - Apply llvm fix for assertion/crash building archivers/c-blosc2 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: 836d47d38e0a586c9b307fd7fb46bf563acba151 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656717370; 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=J38fcWgjlbWbmaJirHNBAyUrg2gWWiY53b7tjE922I8=; b=QrhkmpzRVJuZJkk3ZFo7h88VMJKsEgGa3dsO37F2UOykmIYLXl1GC2az6JUHB1QuifnZeS +c92I0KdHV4Z21uRRV/s5fZctcGZBBDLLrpc7kC/4Z3oD9DtHBZeFT+2LhA78Z2jS3vG0W /y89Md6qlzOHty7EKetj+EGPXvF7VmWXIpXxLymKq9cj8/cCmFJ7gLbhDc/z1oRrBq5daJ 2V/lWx2Q7Qo62TH3j9UHBNUcU21LBWYtvo4x5VKAL5EEQn1xI8jxho4qX+8xFuUbYhb8c+ 1OiZHh4aNBicUXhTuloHhovMeQriTNoVa2+ZQELRk6jVRbpHfdRmngkCO+PCrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656717370; a=rsa-sha256; cv=none; b=DnaLPzwHnh2ZViX5oN1p9FKaj0xsM6eJWb/vqUZ8af19IiilBvICkv84hD0QH2PvEAng1a bL1Y4I9TECB5KC3BUgQGI5IPl+wZgrsR0qvVP72QzWPyILeIRelmSrCr4Bh2nKAyWcFuB6 pj5wTAHb6RS1RmgIZ911uO6tbO+SxP1CqVRLOn9KJBUeMhPnKp0vaVSdAcKilHsTKpotCm vqUsfIALha7K8tUVYaW3Ds047OQZ5W2yYcbAO5OlLy9Ux9PQEPOq/3Ua25NovsXX6Pq0aG 2CRGsw0nckhWOGkxM8lgIs1OMwHTAJh/BZF6zh67TnUQ2CTcdMnjwGqkejpM/g== 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=836d47d38e0a586c9b307fd7fb46bf563acba151 commit 836d47d38e0a586c9b307fd7fb46bf563acba151 Author: Dimitry Andric AuthorDate: 2022-07-01 23:13:46 +0000 Commit: Dimitry Andric CommitDate: 2022-07-01 23:13:46 +0000 Apply llvm fix for assertion/crash building archivers/c-blosc2 Merge commit 88ce403c6aab from llvm git (by Florian Hahn): [LV] Add new block to place recurrence splice, if needed. In some cases, a recurrence splice instructions needs to be inserted between to regions, for example if the regions get re-arranged during sinking. Fixes #56146. PR: 264979 Reported by: Robert Clausecker MFC after: 3 days --- .../llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 46ff0994e04e..0fdcb8be59ac 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -9266,7 +9266,11 @@ VPlanPtr LoopVectorizationPlanner::buildVPlanWithVPRecipes( VPBasicBlock *InsertBlock = PrevRecipe->getParent(); auto *Region = GetReplicateRegion(PrevRecipe); if (Region) - InsertBlock = cast(Region->getSingleSuccessor()); + InsertBlock = dyn_cast(Region->getSingleSuccessor()); + if (!InsertBlock) { + InsertBlock = new VPBasicBlock(Region->getName() + ".succ"); + VPBlockUtils::insertBlockAfter(InsertBlock, Region); + } if (Region || PrevRecipe->isPhi()) Builder.setInsertPoint(InsertBlock, InsertBlock->getFirstNonPhi()); else