From nobody Wed Aug 27 18:52:39 2025 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 4cBtvD08pjz65TJx; Wed, 27 Aug 2025 18:52:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBtvC54L2z41CW; Wed, 27 Aug 2025 18:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756320759; 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=dn4cUWiDzeaE2DZHCe6Vn2TipRxTWZ12rbS3lOm7Cww=; b=qWDSjtjgnYCkWdekhq3GPpTAye78d5XIdrruj2WdytO50De+UOqr+ubnt1WsrJGqRAs/Q3 gPSOhbmCpm0QoLSLT2E33aKFilVdTTFC3MYnL9Wzzu4hwNnLAv3BdcfvAyY6E0QpSGGeo4 1FbuP4/pOyucYwNW6F0+czRO2lousHjW5xmnB4GlmPuWiwZ2d+LZ23aU9fUDMmkguAjH4Z LDs+HEK/LgO/wPJ/clcpsVnMXWGnT9+e2clAEWc+n9pmnptApaudAXjG0vN2kwNbGWb+v2 EEE1dyaKL3ox9STcljSREA1thk90J8X7RYP+zPgyXz0lRZ0ttJif+1rPn12NQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756320759; 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=dn4cUWiDzeaE2DZHCe6Vn2TipRxTWZ12rbS3lOm7Cww=; b=wiLU6hHlrnIfm48H5zurXk82BoTvI7V0TW1MzIFuGmmyy7KEaJWhN9n/dIEziecin8y9UK UsFpRjnDPqHxqafYxYx/hJ2PpRbYAaHYdHnr2tqlSxPc7wTRj20zqhDH3+zzXjhC+EbcET NFp3/M2CGGHBlWeYnJtBM65eOuKot2xwZRcbcVvwKwepDcnIMhqZM/y4WWxFjh1kPAqN2C orQWKn9wE6TQzJ7kqV11ruuKFygvhG20WIYniT96SQffH/qUsbkXBojKd8pa0X22kUNXRA 1bGlUqA1OKzjrZXVdEOEW23yuagwOSFiJEKRR+FXuj7lyL6gIQdxil5/zhr8gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756320759; a=rsa-sha256; cv=none; b=pBtODRNdFyZ8WP5sa1gq5fF1gT4uUA3D8YieffzD7Oml7Cp0bvm5vf7S2SYh17JPX072O7 2W+2K5lgyreotuC1XCVPbYMy8iBW5tr2cSjBlo0opoFCem0jOglBWzI0+jy6s8hNEt5OwF axFjR5a6uBmac5QUj0J83ah1HbjGoVvzKaipP/wFTN6qhNUyEnBL7S0Z/DM2R8MTuNjh72 /3pCu0NMCDXv4xLTDvPsqVOJjEXkqvh/ANiZe08voeS2IlyAfYLlcBvKODYQ/17qBLyKvT m8HRYWu/zOdEzNKHPdlW5t30RtPWo8R8ShA0BbI5TDEtQ0uGvvjeMG0kMROPKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cBtvC4cRpzbVf; Wed, 27 Aug 2025 18:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RIqdIh084717; Wed, 27 Aug 2025 18:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RIqdP7084714; Wed, 27 Aug 2025 18:52:39 GMT (envelope-from git) Date: Wed, 27 Aug 2025 18:52:39 GMT Message-Id: <202508271852.57RIqdP7084714@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: cb2887746f8b - main - Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e commit cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e Author: Dimitry Andric AuthorDate: 2025-08-27 18:51:58 +0000 Commit: Dimitry Andric CommitDate: 2025-08-27 18:52:30 +0000 Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): [PowerPC] Do not merge TLS constants within PPCMergeStringPool.cpp (#94059) This patch prevents thread-local constants to be merged within PPCMergeStringPool.cpp. The PPCMergeStringPool pass primarily merges non-thread-local constants together, and thread-local constants should not be mixed together with other (non-thread-local) constants. In the event that thread-local and other non-thread-local constants are pooled together, the llvm.threadlocal.address intrinsic can fail as it expects its argument to be a thread-local global value, but the merged string structure created by the PPCMergeStringPool pass is not thread-local as a whole. This fixes an error "llvm.threadlocal.address first argument must be a GlobalValue" when building the math/nauty port on PowerPC architectures. PR: 289122 Reported by: pkubaj MFC after: 3 days --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index 309938accdf4..daf6a0e65d54 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -170,8 +170,9 @@ void PPCMergeStringPool::collectCandidateConstants(Module &M) { LLVM_DEBUG(dbgs() << "hasInitializer() " << Global.hasInitializer() << "\n"); - // We can only pool constants. - if (!Global.isConstant() || !Global.hasInitializer()) + // We can only pool non-thread-local constants. + if (!Global.isConstant() || !Global.hasInitializer() || + Global.isThreadLocal()) continue; // If a global constant has a section we do not try to pool it because