From nobody Thu Sep 17 19:37:09 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 4hm5cP2p6pz6tRnQ for ; Thu, 17 Sep 2026 19:37:09 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hm5cP2Hryz4SL1 for ; Thu, 17 Sep 2026 19:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789673829; 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=8x2szMQ3V1i8pQ8hD00Qppy3w7+Z2AsLRZFXjOl0zmw=; b=IfAxWBsU1dRhvq6xqvMlvud3jEWDu0AsCdWnop4lpG3CoUhNLShDdkvixMunvGJJgnBrFD p1LeEMhBM1MwKqAEwhGMPPrS9rMW20GK/WwhQD6rexjwpAQ2qIyxFi+UmiUqI7pGtBUJ4J q0VyYikhNPHD7yTbDiump09jc1rtEwwnMlogrHa3wo6zY+q+yh+n+C/XRh3hwR0hwYOmu9 1ZKi47DSGpaGkLz9o0BBsJkkGvggiw2vluoriSBh+sSgBtJnAYneQNRG/ACP+Uie9IHliM 2a95Q7yXra489zK4khCK1n9yvKuHMiaTln6uG8vLtTfm63DzPC+KWjXJI1m3Fg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789673829; b=lNKTcKnojHxVZw2l/f228ebyIc4cdjRUuDDEOpWo8Vom3GPcvpt7hvKWNpS/HH/azzr2sN aoCNhhsvdpOIcmmCK58OwX5xJv0NiZs7ewmBA74srTgxn0syLpp3nIYAhWg1W9SUYvBsBL JIS8uDruZkpzoX1i3h0/+QK8T4NiBqEqO4QffhaNaa6bpsBpNHjt3c3CkutnYbUPMtMvoL WtPP1fHNaBhrq8WlM6ot4/sv8J0y3LMybYbDoQqehWDiSIWbiVtJsNCN1Sy6nOQsa63Smm aQcTPBG8n8oIaTFhxwiXTkHYsnRHeJgPsMcdDZ/zzduFLJCnmX/ekJAzjViBEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789673829; 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=8x2szMQ3V1i8pQ8hD00Qppy3w7+Z2AsLRZFXjOl0zmw=; b=cbSMfrWf1jSZ/IvFwK91zEzZmeI7/e4GI025dCL1WvTMLot01RqzEBMJJ/wUU9RCZ5IpuJ JlbELLD8pWSEBDGtg3ckHw+fnYQOrZKVdkTtiyavQbH6VBBiU5f/+IPNzPVBqZCkZvlI3Q Snnkb6APdpeI1LkcCMidqra55goxRpWGoTIZFbUo/V6afEGkQ54x6pPruVP5bWCTKDf3lu LuTL2p8otmEarkYKwXGlxE1YWW9NZ+rWggnPRokOszSEbRWxERutzIp8NLDadN8J54I3BD Ktrv5H6qpN35qu7FJ5dDBGd00sq3Mlexw3BafocCa9iNUI/HdAnmoPXKrALLaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hm5cP1404zmND for ; Thu, 17 Sep 2026 19:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b134 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 19:37:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8a8c14464dd3 - main - Merge commit 1f332ae4f1b3 from llvm-project (by Alexander Kornienko): 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8a8c14464dd372495c9bf4b87c9b88d73f78d587 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 19:37:09 +0000 Message-Id: <6aac4165.3b134.34528883@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a8c14464dd372495c9bf4b87c9b88d73f78d587 commit 8a8c14464dd372495c9bf4b87c9b88d73f78d587 Author: Dimitry Andric AuthorDate: 2026-09-17 19:32:45 +0000 Commit: Dimitry Andric CommitDate: 2026-09-17 19:36:46 +0000 Merge commit 1f332ae4f1b3 from llvm-project (by Alexander Kornienko): Fix -Wformat diagnostic after #190965 (#193704) Fixes libunwind compiler diagnostic when building with clang after 034d4dcad6396d1241e8262e69871b8d61da7e4f: ``` In file included from libunwind/src/libunwind.cpp:31: In file included from libunwind/src/UnwindCursor.hpp:52: libunwind/src/CompactUnwinder.hpp:339:46: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] 338 | "function starting at 0x%llX", | ~~~~ | %lX 339 | compactEncoding, functionStart); | ^~~~~~~~~~~~~ libunwind/src/config.h:215:63: note: expanded from macro '_LIBUNWIND_DEBUG_LOG' 215 | #define _LIBUNWIND_DEBUG_LOG(msg, ...) _LIBUNWIND_LOG(msg, __VA_ARGS__) | ~~~ ^~~~~~~~~~~ libunwind/src/config.h:181:45: note: expanded from macro '_LIBUNWIND_LOG' 181 | fprintf(stderr, "libunwind: " msg "\n", __VA_ARGS__); \ | ~~~ ^~~~~~~~~~~ In file included from libunwind/src/libunwind.cpp:31: In file included from libunwind/src/UnwindCursor.hpp:52: libunwind/src/CompactUnwinder.hpp:458:39: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] 457 | "function starting at 0x%llX", | ~~~~ | %lX 458 | encoding, functionStart); | ^~~~~~~~~~~~~ libunwind/src/config.h:215:63: note: expanded from macro '_LIBUNWIND_DEBUG_LOG' 215 | #define _LIBUNWIND_DEBUG_LOG(msg, ...) _LIBUNWIND_LOG(msg, __VA_ARGS__) | ~~~ ^~~~~~~~~~~ libunwind/src/config.h:181:45: note: expanded from macro '_LIBUNWIND_LOG' 181 | fprintf(stderr, "libunwind: " msg "\n", __VA_ARGS__); \ | ~~~ ^~~~~~~~~~~ ``` This avoids a -Werror failure with clang >= 23. MFC after: 3 days --- contrib/llvm-project/libunwind/src/CompactUnwinder.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp b/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp index a7a8a153d86a..490f61496998 100644 --- a/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp +++ b/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp @@ -12,6 +12,7 @@ #ifndef __COMPACT_UNWINDER_HPP__ #define __COMPACT_UNWINDER_HPP__ +#include #include #include @@ -335,8 +336,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingRBPFrame( default: (void)functionStart; _LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for " - "function starting at 0x%llX", - compactEncoding, functionStart); + "function starting at 0x%" PRIu64 "X", + compactEncoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8; @@ -454,8 +455,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingFrameless( break; default: _LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for " - "function starting at 0x%llX", - encoding, functionStart); + "function starting at 0x%" PRIu64 "X", + encoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8;