From nobody Tue Jul 5 18:22:50 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 E9BE31CF845F; Tue, 5 Jul 2022 18:22:50 +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 4Lcrd65hbLz3DJ9; Tue, 5 Jul 2022 18:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657045370; 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=hLxuPmocodSSmqYb4Qnyr6sGJ0ZORsULHIVRkfrXKx0=; b=q9GsMxi4sXkB0GTCiK7HcsD5H/HhWmXYRFml0lACxq3oCcp00qLOighkunMah9IxjgXIgB FnzTQeCe9kHEzlxJAjHG65HMxLE93Zj1FmtrlqlAWQA7r0zDTqvCB8RT+eEc6h04gfY+Zy X1FQm9m1UmE8tcgtu5pEjgXMnOS1sxoCLoxl32cS4fzpDqR5HUe7Xhhe9gv7KbCaa3W7oC shVsXEJjwudB3CQjkS4NHstpb33xdGNzfZ6njooSEnTV3hbatLb6QiDNAyoUWu9Y54ymV6 bS4SWR/h0Cfrf4kZtvAX/C+KhovmMGUA0Z6pssXUyTN6Yxck7FSf2OIPr7Cl9g== 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 A28482925; Tue, 5 Jul 2022 18:22:50 +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 265IMoZm041978; Tue, 5 Jul 2022 18:22:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265IMoQ1041977; Tue, 5 Jul 2022 18:22:50 GMT (envelope-from git) Date: Tue, 5 Jul 2022 18:22:50 GMT Message-Id: <202207051822.265IMoQ1041977@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: 92f7d05dd251 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 92f7d05dd251b111913d642a8562567bcbd9b539 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657045370; 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=hLxuPmocodSSmqYb4Qnyr6sGJ0ZORsULHIVRkfrXKx0=; b=a912YAXhHyRT7wudxoVqPe+rANH6nGDPuNVtUPhJnsMIYob40lFMOq4UE7E1NP6zfUji1k Ir25NwIXVsT+qlQgIjShOQCEyMRLNzMyrAk2H2PkjzDllFJeBLEquRJ0soyGBDL7M/0Cx+ 7t0SXIgtO/I+Y7SimgIRwy2WAV0nvciLgqVRvaKAYBSZly3k3OTHTV1IWsiZp3X+NMmsk2 c2RI+Q5n6rBFmtVi7JgGaPbXbuLvP5cGNtUtcXwuY0y83QRwlcnEKm2UfHLUAb3GzVs2Go AcLFUtfZf3G5q4AuBT0Kiq0F0PHzYWngyIxXP99HZFS4bSeDduaiFcNmoVRMUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657045370; a=rsa-sha256; cv=none; b=d0zAo81EBXkw+uhDjPDObSoBp7d3u2D3c7VCMHEkGR8/Cuqqm1onMlX4dICQv0L9ZAd613 XYGYnlP4sHRxCE3PeoXVVImnGqxJATD6GTd2YU9NetQkQdXc7WkWEh8gDwwSDTSBka1R6O lu1AGw043PpaIrYFLy/1dv2Q21VKSibZHZ+IiSQrRSc548e/yGmQctfVAtUoANY+SsqLsn C6XFtdIMVYU1r/hCrN7PQ7DIjkStPEpcl/nCUuSXSIMFGnNEIQxb/U1fjUYSKXxyrMeRKN xinrGc7KPkY6dPiuqLDRSmvQ8WhRq/6PEAKp87jMysZ72GU0DbD+D1jpdiBBdg== 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=92f7d05dd251b111913d642a8562567bcbd9b539 commit 92f7d05dd251b111913d642a8562567bcbd9b539 Author: Dimitry Andric AuthorDate: 2022-07-01 23:13:46 +0000 Commit: Dimitry Andric CommitDate: 2022-07-05 18:22:20 +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 (cherry picked from commit 836d47d38e0a586c9b307fd7fb46bf563acba151) --- .../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