From nobody Fri Apr 05 15:45:15 2024 X-Original-To: dev-commits-src-main@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 4VB2qv463kz5GhNK; Fri, 5 Apr 2024 15:45:15 +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 4VB2qv3cmzz4Qnn; Fri, 5 Apr 2024 15:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331915; 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=vPq0dgtVWZ/es/3W/zRbWtjmMWOCTzNidW1Fn0pnNnc=; b=Um7i+pwgjX2fsK2UTvvIuXIJBpwB42yBSX+i8atIYeP4Ylaz4ldINBxbwmkHua3v4z/Le9 GGH7eA/c0KZ+lkvA5ZQDEpWquApeAys7wIqYdZuarz8XY0GZAMwQKU18Ego54Rl3VVYfyL y/ZCgIQNJmzRZA4S4dxYZibSKo+HprQCujagDSI3G0C/O+4Inm+MgvB90GHP6xaIkk9lOU yJvv47IEXySHkJK4JjOHR8u4vT1+VCYhVTgEvfPBK24KiZY8jU00t4G2e1B+Sp0W/6rhhS 5ievrvuKMvdMvq/iHKL+Dgq3t8AcVvVKwt63Yn8qtlWSMIvwDa1noUIu/tXnNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712331915; a=rsa-sha256; cv=none; b=nBWtoYELlEPiiAHiIWtSdlhxTw4kT6iVdJdTctotc7oPMfqUp4R2m27qoj5pHcZIn7xHUf U9Kbccb6GlJJyE/JaDn+/0VqzPsrnPgaHImlS+wZJ5w+CH7ClMTAxtUGmpv7CMZP97kAbT 2IsZAxK4VI8oTQMy+8JJ5HX8VuWkzQkLzUoeaes52FaStOwCEU1811X8E9mPQe8SwEkYJP MkY3OlfflMuX60Sh2Z1nUFsWx7Hkkw7JAcGZZDyvOQkjmCXFHjwzrIHANC5cxSHYMSEgqu DoNaY3gNjK7Qhs+nR7xxKXK6/Kqt6+dD2m2o1cB5EYHjR8+C8s6vdyMO7FVUHA== 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=1712331915; 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=vPq0dgtVWZ/es/3W/zRbWtjmMWOCTzNidW1Fn0pnNnc=; b=EYeUma3O82a3IFvm2KztqsRs9edt+ApN4wXGtm18ykn/dYkf07QrOWhK0+Id4kX2NruWzD 6BGemF/3KHlh/PGTKsJ24zvguumWVfd0Q6+ptIGgi6h1yLGwuwmk8e6kTWTh48sfIiZ3kY uYGf6tFtTzk0mtvaK7m1o6nSyHlJ0jpi7YuW6bzFhLS3SJOmJ0NUN3Lbzfz5Vp6X1+ADUg x7HMr/oL6zLsuAOeAYevQH85yT27+qi8a98CkB8Ji5Y3qnsx4yP116yNOLjMneiUZtKHqB BlxDwXmUI+E5+rqBSTIDX4m3x5oQzbnRptOFDnczgBC+Fe+jhymmgn9ptjM8Xw== 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 4VB2qv3DGRz14kL; Fri, 5 Apr 2024 15:45:15 +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 435FjFvY028159; Fri, 5 Apr 2024 15:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FjFVJ028156; Fri, 5 Apr 2024 15:45:15 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:45:15 GMT Message-Id: <202404051545.435FjFVJ028156@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: aaabed1dea7c - main - Merge commit eb8f379567e8 from llvm-project (by Florian Hahn): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: aaabed1dea7c1d16cdc5457bf6dee74164104e26 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aaabed1dea7c1d16cdc5457bf6dee74164104e26 commit aaabed1dea7c1d16cdc5457bf6dee74164104e26 Author: Dimitry Andric AuthorDate: 2024-04-05 13:00:12 +0000 Commit: Dimitry Andric CommitDate: 2024-04-05 15:44:49 +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 --- .../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; }