From nobody Fri May 8 18:15:34 2026 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 4gBy3J47nMz6ckph for ; Fri, 08 May 2026 18:15: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBy3J2kfbz3b7G for ; Fri, 08 May 2026 18:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778264140; 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=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=YInEWT50PlVJBZIQNnedct8tH9UCWShg8QVOUZj2mo21e+qKJ5HCQo+wB7uCTqTtBXVkw+ g8DsUjR1OYTEAQFSOkgzjJ4zhswPT9DpKVdsmzuXRlRDvwyb4BrmOUUqs4BPQyMFAV5YhZ iMnIwkLIZ/VXijYSBvH9i5Yyd3JcwiWX4NSyNbfPzt9vCGSGYvJmQU8JLxNRcbsFef0FfO CU/d5rTto39kd7gzvEdHi6eJRPDHFaoXlYRz02IpFxiAZs+Ki2nHxcZoRyE9E9vyacVP+m W7+YuGAYC4TuzgZ3iZxGL1nMc3XYiYJPGfQdmApnYB+pd+ph7diu4d9jl7Wpzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778264140; a=rsa-sha256; cv=none; b=Fsq4Y4Ncj2aDoAK2CUo8hogTY1iCOCnFR7bnhO2NVwIeDHxZ36A1IexDkocIQvrBhrDxWW T0+jONvv8xutGcMaOLstDvg6q5Qbe2HTILJ70Ma7i4WyRQ/5fr4oIFNfLabQjYSbVdWuaU FuutRq2P0PcuDtJz2SWF9yiZCCcrO7pEKiMqkma1Y8dwN6LGjqVJjngIG9bKw/Z0Bvbsq4 fPtgnbQnQ8eousWXWl5/YKr2TNYFAw1/Y4aRE6hslPPWYpCcI0ExsR6RgqIde5OOnnO3cW mDz9S9ln68D3YLOlCUHllr2d3/YaaQ7xAZLkbmdGb4tlNryyFqbxJthmtXyqzQ== 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=1778264140; 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=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=Y29VTQrH0tELLPWnlgdHKKl5RkEPn7YanWkjdzgTYEU4iIxvuTcXC7VrE25k6MmWCoVxZb qLD4BSf1qaeIOAQB4FoCE//CX9B6f071sdh6z7eRsIYZfvXeyotd9rkrDdlCnp0uC/mayz yNYI5Np9TChrLZSdNV6Xau8SzGrRIt2RkBr+k1XFmXDxwZgezWc4GTVeFeIgkmNC7CwCnp 5e8A7VEWpKgAYALlYOak+sjdplbrOJsiK5/DCmqB2pA/xayt+RfHJzV2AOjVJcy0oy2ruA CIHaXUDBklmfb1ovWp/d6E63FcjMqHQKLh71Sijd3F2kS/CUMVmU8s/fRQ0noQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBy3J0jbbz82j for ; Fri, 08 May 2026 18:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 18:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): 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 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: d9b272a19d39f71665b529860bfed731bcfd99f5 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 18:15:34 +0000 Message-Id: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b272a19d39f71665b529860bfed731bcfd99f5 commit d9b272a19d39f71665b529860bfed731bcfd99f5 Author: Dimitry Andric AuthorDate: 2026-05-08 17:59:54 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 17:59:54 +0000 Merge commit 871038759afb from llvm git (by Marco Elver): Thread Safety Analysis: Fix pointer handling of variables with deprecated attributes (#148974) de10e44b6fe7 ("Thread Safety Analysis: Support warning on passing/returning pointers to guarded variables") added checks for passing pointer to guarded variables. While new features do not necessarily need to support the deprecated attributes (`guarded_var`, and `pt_guarded_var`), we need to ensure that such features do not cause the compiler to crash. As such, code such as this: struct { int v __attribute__((guarded_var)); } p; int *g() { return &p.v; // handleNoMutexHeld() with POK_ReturnPointer } Would crash in debug builds with the assertion in handleNoMutexHeld() triggering. The assertion is meant to capture the fact that this helper should only be used for warnings on variables (which the deprecated attributes only applied to). To fix, the function handleNoMutexHeld() should handle all POK cases that apply to variables explicitly, and produce a best-effort warning. We refrain from introducing new warnings to avoid unnecessary code bloat for deprecated features. Fixes: https://github.com/llvm/llvm-project/issues/140330 This fixes an assertion while building the net/openvswitch port: "Assertion failed: ((POK == POK_VarAccess || POK == POK_VarDereference) && "Only works for variables"), function handleNoMutexHeld, file /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, line 2120.' Reported by: cy PR: 295101, 292067 MFC after: 1 month --- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp index ec39bca6039f..ab55cbceeaa8 100644 --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public clang::threadSafety::ThreadSafetyHandler { void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind POK, AccessKind AK, SourceLocation Loc) override { - assert((POK == POK_VarAccess || POK == POK_VarDereference) && - "Only works for variables"); - unsigned DiagID = POK == POK_VarAccess? - diag::warn_variable_requires_any_lock: - diag::warn_var_deref_requires_any_lock; + unsigned DiagID = 0; + switch (POK) { + case POK_VarAccess: + case POK_PassByRef: + case POK_ReturnByRef: + case POK_PassPointer: + case POK_ReturnPointer: + DiagID = diag::warn_variable_requires_any_lock; + break; + case POK_VarDereference: + case POK_PtPassByRef: + case POK_PtReturnByRef: + case POK_PtPassPointer: + case POK_PtReturnPointer: + DiagID = diag::warn_var_deref_requires_any_lock; + break; + case POK_FunctionCall: + llvm_unreachable("Only works for variables"); + break; + } PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) << D << getLockKindFromAccessKind(AK)); Warnings.emplace_back(std::move(Warning), getNotes());