From nobody Sat Aug 30 10:00:17 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 4cDVxY50snz66KhY; Sat, 30 Aug 2025 10:00:17 +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 4cDVxY4Bybz45C6; Sat, 30 Aug 2025 10:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756548017; 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=d0DEj7PsafM9IJXpjII12Ekk8uQZw9DZZxnrRRgkCkE=; b=tstFEO+LNfN/fzmRb/X8OXoIrGJPOKsmlujPN/Bxd0T4bZmrLzyzKqp1B+w3sYMo2lpCKV KHXen3CIpauSvtLq9pARmriGQCQxzT+m5S/hHW7Cp2qYp9r0an+ilV4yZiCVYeJ/tJWEsf ScEBG9waSZ1/vpPLZdgmzYeFrpPjdTUktII7svhxV8xogWUCMmu9N96IOV1xSf073l0UI/ KIy7A1R+oX4slKTCkpIJeN1UyKfs9z8SVxpYs/WODAneS7bD9g+qPuFjctZvLaZFoep24Q wwaIw+v8Ncz06aT12OYG/trlvTc0OGhqiW0iJ8b4JuUEJK2IYhP+lQnKSsbtKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756548017; 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=d0DEj7PsafM9IJXpjII12Ekk8uQZw9DZZxnrRRgkCkE=; b=vWU4cp6A3Ixhr0yXnotZ8CBfVWxyO+YdTpm26Wx8eI1Ajq3CizsRAktfBUhOoo1Ht9k84K xMoMpldAYekEUb9Wr6G14BfjcQjtoLofkiAHIyWuf48FD1lEFG6OAU1H2mEqVC8IIAd2nO g+NtD8PrBLET0b04DQA038H086Bn7eiWe/ApBgG3t2q7od9v+BLfnmOeHdnsbj47IAS6RB 9irkhdgttJFYgb/01EMCUBe6vY8Pzxwqbj8JDsMnIzjirgNmmmTqNbrCZwazRkcWw0W8Ul lTjhIQkhi5JvGs0YlBCsv2m6V+K3RA4xi3fvS2sA6YXQ6xn0pxEkvMTBT+T8hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756548017; a=rsa-sha256; cv=none; b=QEkSSyTNR5NsRlfVg1YkW/RjOCO//SGpfZk/jRt1q25kkQPGk+I5VVZjgWGjBdrOBVQpXw UTr9ninmHWIpddUcwNKYCvMeUhz5sGggGluD4MSVdn6N9fewCXCK+NK5muqJtZuzrTspOk Sh3WzVhiWGlKGY2akkpQZDFOtFsqhzuQm4gIeQv+Arz0TtMU1XbHxq7hvEv/wCeludUQoJ FjuahmPLfp4eOJHLUw5D6D4NfJ3ECk140ReQuEBpF+6eQhD1YLE2mZ+k0cQjBsF3+I73FR siaKlN10dbBZoK+Jndqg4vULKbK2N/AjqNrkuG0i8lLcfhIg1I/C4fXfjcpgAQ== 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 4cDVxY3pT3z5dD; Sat, 30 Aug 2025 10:00:17 +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 57UA0HBl021039; Sat, 30 Aug 2025 10:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UA0HnZ021034; Sat, 30 Aug 2025 10:00:17 GMT (envelope-from git) Date: Sat, 30 Aug 2025 10:00:17 GMT Message-Id: <202508301000.57UA0HnZ021034@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: 17c0ecb14df1 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 commit 17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 Author: Dimitry Andric AuthorDate: 2025-08-27 18:51:58 +0000 Commit: Dimitry Andric CommitDate: 2025-08-30 09:58:12 +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 (cherry picked from commit cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e) --- 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