From nobody Sat Apr 25 14:20:04 2026 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 4g2sRS700lz6bZTt for ; Sat, 25 Apr 2026 14:20:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sRS3pYKz3Hjy for ; Sat, 25 Apr 2026 14:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126804; 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=+cLtTm1vU+N2lXJtBq/ZJxx+cDt1AgtzBm02SHUGt+Q=; b=jj9qofnRkIkWtbC2ofLQQaf5x4fBFOrD8GLEjQt82JKaYBRa4BsFAqXWoHJV2xj2EOyrTZ Y+6XyM0xYi0j4CoOxzHmjgrCjKstVy+OXKzAaFdU7cHeMhuWarPoQZokqIr7FvZp4qHdc4 fp4EXnaCPgxGg08jBwkf3oBEmDftJ/UbFFiz2fbAyS+PRrQVySfcn6GzoldJ69ql3wbP1a QWtma4gH4OY5DPJ0KmTdTaIqlSYUMtq5KsXqa9S55nwPHpQpnf+evvHTILeKVJweb8qCwz USFeHv6TYaLO1xN6ubX/5S4Af42g4QkTP+/dyIae/iUOSt9UMjKUqBmPdWCVig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126804; a=rsa-sha256; cv=none; b=xnGSCOFTEXT0HWlynekgJHM8mM3nlZi9QLiWJ2IdmxmhKzs4S2Vl6td9zTH+R5pKe4xulX X9q6qrzRpflnlXBbn+527hDzxatObnTumN6gKRJy1Jbc9cg4cy18wHcxENGt14aq7ReLva UsLhvDPIhbnhGHa2kbqV6YQJ+DtcYRu1xknaxc7o+N3cVs0c3rKyrs/eIAS+G6Uh5o6/Ay IQGRai2JtexfzK3ZIQzGmAChHPsADfAY8M2qgch3KsTEuuWiy25qFjhqFpJqsoRLSd3Ly/ +71zAE9MHKMkibMjGOIroeCZDRiK/yCa07FF80lhfk5GjQAzybXst1FlaX9WFw== 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=1777126804; 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=+cLtTm1vU+N2lXJtBq/ZJxx+cDt1AgtzBm02SHUGt+Q=; b=xkMi70giBL8GOgTff2ufWsmJSkTwKmVzwkyvNAcHrMPjcXQzb1F2EnPoDhej+G+Jcp5Zzs RnEPI6mVQlhVEAdxyPImrrmGQ18aAYsbj3JbR8dddcnnmnUewPKMvJuVNK7yiZ/YWTxomC THmHeC1x6YM4C3OmwuS0haPqQYBDFdaGak2nPv47erzZFxOj79hTo9Nd3sSSaqaynngK4X Tt/zNKbBsLXo7nee3U40cbQkVuah6EhluVKCNiTY1fTxyzeABpDPyKYxVO6zEt1ef9a0u7 nmkNP0JIxdeQAyW6/oyPvzWqMeDhw+ZCI5LIRgZwfpGahImcLZRP9dWAPX7nGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRS367gzd2G for ; Sat, 25 Apr 2026 14:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36ae2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 48c35ae6ebfc - main - Merge commit 598f21e9fcf7 from llvm git (by zhijian lin): 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 48c35ae6ebfc6d9a2259979d915fd3bc5d6c01db Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:04 +0000 Message-Id: <69eccd94.36ae2.7823cedb@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=48c35ae6ebfc6d9a2259979d915fd3bc5d6c01db commit 48c35ae6ebfc6d9a2259979d915fd3bc5d6c01db Author: Dimitry Andric AuthorDate: 2026-01-10 14:45:16 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:12 +0000 Merge commit 598f21e9fcf7 from llvm git (by zhijian lin): [PowerPC] need to set CallFrameSize for the pass PPCReduceCRLogicals when insert a new block (#151017) In the [ [CodeGen] Store call frame size in MachineBasicBlock](https://reviews.llvm.org/D156113), it mentions When a basic block has been split in the middle of a call sequence. the call frame size may not be zero, it need to set the setCallFrameSize for the new MachineBasicBlock. but in the function `splitMBB(BlockSplitInfo &BSI)` in the llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp , it do not setCallFrameSzie for the new MachineBasicBlock `NewMBB`, we will setCallFrameSzie in the patch. the patch fix the crash mention in https://github.com/llvm/llvm-project/pull/144594#issuecomment-2993736654 This fixes "error in backend: Found 1 machine code errors" while crypto/openssh/packet.c for PowerPC64. PR: 292067 MFC after: 1 month --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp index 0ffd35dfa279..74bce436b53e 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp @@ -248,6 +248,10 @@ static bool splitMBB(BlockSplitInfo &BSI) { } addIncomingValuesToPHIs(NewBRTarget, ThisMBB, NewMBB, MRI); + // Set the call frame size on ThisMBB to the new basic blocks. + // See https://reviews.llvm.org/D156113. + NewMBB->setCallFrameSize(TII->getCallFrameSizeAt(ThisMBB->back())); + LLVM_DEBUG(dbgs() << "After splitting, ThisMBB:\n"; ThisMBB->dump()); LLVM_DEBUG(dbgs() << "NewMBB:\n"; NewMBB->dump()); LLVM_DEBUG(dbgs() << "New branch-to block:\n"; NewBRTarget->dump());