From nobody Mon Apr 08 07:46:31 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 4VCh472QxYz5GSQ6; Mon, 8 Apr 2024 07:46:31 +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 4VCh471Xtyz4H4J; Mon, 8 Apr 2024 07:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712562391; 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=FRh7f6nKHSrOcpcbHShECgDMBMEHhhaxvckeY5dv8Iw=; b=Gi7lVSTqFEYH+voaU7HYv4DS58IOcYlxR7fEJvG761YA+lowDYwj5RO+iqZkGU3mRhjy3M eVLo2tWNX/p0ZYrvbvQOfM0oNjLFhBx5aWdCRWsiXSOOXEV29GxQDfmBk4EkkXfnvgD+NX MQjWIV6maHFdrwIfLgn8wbQ9JF2WJDt5yfEOXEUdOrMEIdceWj3yefATLHvcH7JFU8PaUN WSglEHsfB6ZrfuDTR5u6OtiedXhcourCUsAag4oSuaicNnR/r70lWFex6w/AyXKPsfTkzk yw8jsLLqaQDPck9wq2lKGQpLPbXdStWmtpWdmkQ1SI1iQettBDkZNLiTp+7BHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712562391; a=rsa-sha256; cv=none; b=FABI+PlQsSR8e3Fk3Qs1QnbuamHhyKOunQcJ/ziEdSmpgqC+BFpAEhZrmwqVCV0daB06HR cMlO9vmZWviqKmgqNt4etWKiLyQlp2BiS8pIfl456t3CJE3lQ7CCUSkIXSNJl72iFZ56z2 afTMidhB6LEy37fJ0TCx+WgdPINJGmfYbydo/dUThUSGB7DRfQ4oZCNY0szvQGiQ0h4cz8 jEd9Y/KWRsYDyBGuhBoEZ7xTiJMgvyTDcbJJEB8Ri/1AQ71GjHsLRUGweoLbSi+xZUYEpY 2SrxwRgbNStH4Y8JdXet09iNX9ieIgShdp7CA0IpSKCxg8bS98ntMHFfYr6gYg== 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=1712562391; 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=FRh7f6nKHSrOcpcbHShECgDMBMEHhhaxvckeY5dv8Iw=; b=BEwaso/0LhAOzPDgvQzgnd4m8ZV0fpDn1OHtewEjYelgV8d7rjs79//j5/7KsqpZgDcmg8 igut+DbnSF9ofuUb9PrEKP8bCb3sS9WnFUZnF/JEglAR2AYpaya5qJwQnA/vi2ORuVdGqC hQ5auMWtzRhe4Z8oI+ioJ/yq5+JpdkLtPxVC1Y2CI98UKnf491beBFgpCapGR2990mzH86 AMYPGzTYuGI6EfIcnTTBCxmp9gskyGP7MAn1Nae6sMw1Vatv6ftXesyQ0NcpRy+JPd8W8T JBUvPJhXSCLdpekP+lRdHPHylDW/1Eo0rmuHW8YiMAfxeKv9VTFISaVVLR9dww== 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 4VCh47127Gz1386; Mon, 8 Apr 2024 07:46:31 +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 4387kVMa043412; Mon, 8 Apr 2024 07:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4387kVEZ043410; Mon, 8 Apr 2024 07:46:31 GMT (envelope-from git) Date: Mon, 8 Apr 2024 07:46:31 GMT Message-Id: <202404080746.4387kVEZ043410@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: 928ea8066dd0 - stable/14 - Merge commit eb8f379567e8 from llvm-project (by Florian Hahn): 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/14 X-Git-Reftype: branch X-Git-Commit: 928ea8066dd0dee458633b1ebd5d0b6dcdc83357 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=928ea8066dd0dee458633b1ebd5d0b6dcdc83357 commit 928ea8066dd0dee458633b1ebd5d0b6dcdc83357 Author: Dimitry Andric AuthorDate: 2024-04-05 13:00:12 +0000 Commit: Dimitry Andric CommitDate: 2024-04-08 07:42:16 +0000 Merge commit eb8f379567e8 from llvm-project (by Florian Hahn): [DSE] Remove malloc from EarliestEscapeInfo before removing. (#84157) Not removing the malloc from earliest escape info leaves stale entries in the cache. Fixes https://github.com/llvm/llvm-project/issues/84051. PR: https://github.com/llvm/llvm-project/pull/84157 This fixes a crash in clang (usually a bus error, but can also be another memory error) when compiling the science/siconos port. PR: 278174 Reported by: yuri MFC after: 3 days (cherry picked from commit aaabed1dea7c1d16cdc5457bf6dee74164104e26) --- .../llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp index d3fbe49439a8..62a9b6a41c5b 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp @@ -1893,6 +1893,7 @@ struct DSEState { Malloc->getArgOperand(0), IRB, TLI); if (!Calloc) return false; + MemorySSAUpdater Updater(&MSSA); auto *LastDef = cast(Updater.getMemorySSA()->getMemoryAccess(Malloc)); @@ -1901,9 +1902,8 @@ struct DSEState { LastDef); auto *NewAccessMD = cast(NewAccess); Updater.insertDef(NewAccessMD, /*RenameUses=*/true); - Updater.removeMemoryAccess(Malloc); Malloc->replaceAllUsesWith(Calloc); - Malloc->eraseFromParent(); + deleteDeadInstruction(Malloc); return true; }