From nobody Sat Apr 20 10:34:57 2024 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 4VM7Dz0d7jz5HWbT; Sat, 20 Apr 2024 10:34:59 +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 4VM7Dy095cz4TQm; Sat, 20 Apr 2024 10:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609298; 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=1oQmA52zT7Bzytb+tLfByQe5DXXGfPpsnQLjPdzX+DY=; b=m94dDMEkRnm0hgxev8It85dZv4gPjC4BUFfsLh7+1gGKlKD0p2qeqSJEvXp6lOIQBVQZ7p igQybABPDTAlQiq3ZOl17RYVH1UhOJKgYsjIP6+OUHnjOac6gyLHeaDs8kdygj6t+T7/0x BbQIc/A9AxSAj08rCt8YnYTB0CMIspzzXQazObOr6Q+AfTXPYKSG28XpmRKz5CooGu5A2c DFYKCtRS0pOiunx10Dv4JDdzoqjjePxFmkYvortHrzRKXbNS+Vl6mLgTaqjTybF7ZTW6Uz 9ENe5WdPR7oy/qHZFDo8ZZD64fON1O5HdjhCI0bRz9OE9FL//52sD6LCjfxyLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609298; a=rsa-sha256; cv=none; b=qmqX94U+86aaC59HD9JlwwEl/Pz96ZrDqrQ2mW43xORWvKJkWo6V8sSG0Gai/ccOy2LVTT ZKs+FRp2fQknVec2H7NoWdd/mUAhJ+XlIkaLzNwwS1HsISqvYvJWF7F7o9lxjZREH3MCc1 spr9o+xaAMbTy4Pqymuom9TsSUmH66JC7BbR0xWQxH2dnUf1dyRHg6i9pCzi6azJ/Js5Gg Tf255zEJJ4w00WndVO8AHvoBVJgObbwBYIW/e9JZupzAwneMUdmHLKpBEz+Z9200H2nPVf dk41g6W1z6+M8sH2IXEemK8Kl9bf6OjKJrAtChHd9dJAu9lNPoGZs6ZB8eJTRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609298; 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=1oQmA52zT7Bzytb+tLfByQe5DXXGfPpsnQLjPdzX+DY=; b=XDiNSjJdNyXG6o8wQQDH6AQZ/ij22h7sO7jOc1qIAqSENvPCBwL2nZcZ/7oYrxqJYbLre3 dZtYNmbVzg3c79qWmaj3zvkq8RlR1OwG/AfjiZhtUWoctZF/MnewUIRieWJgHdmyQGeEnP iXVQcceva2PuBjn++x/s0yjV+9snkkxCgPfXg1tYTCd4S3WsVjh+nrctsnJ1oujHakPSR/ iD/1zD2sAEjGxrEjtX8w94jnDOBlLkziJhTcKfknYmw8ZbalVPnyUtC3hwariBmQASmhzF f4gi9iu2TfmITVCF+yamvgZvHSQ07/Icx6Tu8Qt4lzbVIq+d1e1ohSwyOcxKLA== 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 4VM7Dx6vWnzYkn; Sat, 20 Apr 2024 10:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KAYvEU014777; Sat, 20 Apr 2024 10:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYvcI014774; Sat, 20 Apr 2024 10:34:57 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:57 GMT Message-Id: <202404201034.43KAYvcI014774@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: 5b763c0e1f30 - stable/13 - Merge commit 37b7207651b4 from llvm-project (by zhongyunde@huawei.com): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 5b763c0e1f30583f8447a0818e2a72498d2e2bc3 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5b763c0e1f30583f8447a0818e2a72498d2e2bc3 commit 5b763c0e1f30583f8447a0818e2a72498d2e2bc3 Author: Dimitry Andric AuthorDate: 2024-04-15 16:24:39 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:10 +0000 Merge commit 37b7207651b4 from llvm-project (by zhongyunde@huawei.com): [SimplifyCFG] Fix crash when there is unreachable large index (#88616) The large case index out of scope is dead code, but it is still be created for TableContents in SwitchLookupTable::SwitchLookupTable, so make sure the table size after growing should not get smaller. Fix https://github.com/llvm/llvm-project/issues/88607 This should fix "Assertion failed: (idx < size()), function operator[]" when building the science/dynare port. PR: 276104, 278320 Reported by: yuri MFC after: 1 month (cherry picked from commit 514c98ba14a0f590891844d1a6bec0ac4de54489) --- contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 13eae549b2ce..f95dae1842fe 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -6710,9 +6710,11 @@ static bool SwitchToLookupTable(SwitchInst *SI, IRBuilder<> &Builder, return SwitchLookupTable::WouldFitInRegister( DL, UpperBound, KV.second /* ResultType */); })) { + // There may be some case index larger than the UpperBound (unreachable + // case), so make sure the table size does not get smaller. + TableSize = std::max(UpperBound, TableSize); // The default branch is unreachable after we enlarge the lookup table. // Adjust DefaultIsReachable to reuse code path. - TableSize = UpperBound; DefaultIsReachable = false; } }