From nobody Thu Jun 4 08:20:46 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 4gWHZQ44m8z6gGNp for ; Thu, 04 Jun 2026 08:20:46 +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 4gWHZQ2xtSz3rkJ for ; Thu, 04 Jun 2026 08:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780561246; 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=lqPK4iXmdiThY+jPHUOQtcLk2t9WgfVND4cYCfBEdbI=; b=iSHPkzsEbq0W74qKZOTz1j2QyuDuLySihmYQmmNj3adOsx1/JnYPD0hd51rQNjcvBJ27f+ bqiioaj15nX/AxHQvGeGL3+KvXeJ/U1MuMF2Fuene2NWr4PkdfvVJcCwDIi3/5aflvYgMP yM+UVrTjcMPuT6sBA43M5UDis2A3qpJVewVj4+vd7CTAnlagyuNqpAA6nP+fq/GsqC5XII ynWFugBuL/Hw1u/8e1YwhSfsoHSw9ICPOlRiPYEwBbdsh8eDAiDs51wCvZ8DiC1dQSSzyV t78uEZ7shL7w9fhd52zABNiYv6uQnSAydBy4k3PCkpR8SJ0i/jr60LHfDIRskQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780561246; a=rsa-sha256; cv=none; b=cvAhCTXv3hTKOth5NHaUL0NcoZLR0inOqveEbvIgz/HlyVVHwtojSfShJySQZPOQ1Ayagn Zl6pTPzgDGuuovspIGNHIl8NBRHWmvEWt+rGGKYrTFbEAS0iZ4TlsH5JcLdh0H17ESnWke 1+jmNUwQp3VHRimhPoKm+OqqWDpTraIMLvKiC69f3QjtZ2N5VXepKVHp9/pVJ9AJMLKScQ ehZyg0bbsvHktcZRmNK4CaJUFZR8W/JZaPaCBbovr71tBfVvoxe5hmPjRFk2aWfMUjqo5c mquJ5+e/IH7pteX9LT2xT4y2msEWOmEmtB3gsLTNe+SZgizjA2sQ73l/BYepSA== 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=1780561246; 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=lqPK4iXmdiThY+jPHUOQtcLk2t9WgfVND4cYCfBEdbI=; b=l4n1QjGz0oX8KrK9u0WxDScXw1n3EiCgQAFh2SrdA5chdIXYLzXItEYZZEMZNma0UvTYL7 whhLo30J/yaTVgEINnvZU+49Z5GEI4qfoGnfKnYwQBUXEGy0Xl9u2j2qjsohjvJpw6CgrG 5QAFfrha5KAMIMSoczsgvSYrotyXqXQ/2Id/VsxVSwWKkEPrTyiJwn2zvrrAx8hCPWpui8 Pu3ekORpqtPH2I3z0LyrXp2tPDIwAoPZ8QoGDGqU3BBzYQ72YYLkXSNys6i705TGy+1BTj LnSX67BUk7Eucfsayngql+OouN+L5od8j5dhp43x4LNS1O5STgl30l82cuLxYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWHZQ2B2qzqnY for ; Thu, 04 Jun 2026 08:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c162 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 08:20:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a8e709c66769 - stable/14 - Merge commit 63c29df8eceb from llvm git (by Dmitry Polukhin): 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a8e709c667693508a31e2e3a9857a1b8f0587c3e Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 08:20:46 +0000 Message-Id: <6a21355e.3c162.12acb467@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e709c667693508a31e2e3a9857a1b8f0587c3e commit a8e709c667693508a31e2e3a9857a1b8f0587c3e Author: Dimitry Andric AuthorDate: 2026-06-01 17:10:11 +0000 Commit: Dimitry Andric CommitDate: 2026-06-04 08:20:25 +0000 Merge commit 63c29df8eceb from llvm git (by Dmitry Polukhin): [Serialization] Fix assertion on re-deserialized friend template spec… (#200566) …ialization in PCH (#198133) A friend function-template specialization declared inside a class template is serialized into a PCH. When the class template is later instantiated while loading the PCH, the friend specialization can be deserialized re-entrantly (VisitFriendDecl -> VisitFunctionDecl -> ... -> VisitFunctionDecl for the same specialization) at the same time as the canonical copy, producing two redeclarations of the same specialization in the template's specialization set. ASTDeclReader::VisitFunctionDecl asserted that this collision could only happen when merging declarations from different modules. Since 38b3d87bd384, friend functions defined inside dependent class templates are loaded eagerly, so the collision can now also occur within a single PCH/AST file (non-modules build), tripping the assertion: Assertion failed: (Reader.getContext().getLangOpts().Modules && "already deserialized this template specialization"), function VisitFunctionDecl The merge that follows (mergeRedeclarable) already links the two redeclarations correctly regardless of whether modules are enabled, so the fix is to drop the modules-only assumption and let the merge run. Fixes https://github.com/llvm/llvm-project/issues/198133 This fixes (well, simply removes :) an assertion when building the cad/OrcaSlicer port with precompiled headers turned on. PR: 295296 MFC after: 3 days (cherry picked from commit 86326398b73b81f84831fb5fc4c12d9219bc0f57) --- contrib/llvm-project/clang/lib/Serialization/ASTReaderDecl.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Serialization/ASTReaderDecl.cpp b/contrib/llvm-project/clang/lib/Serialization/ASTReaderDecl.cpp index b918bfbd549c..87224fae5dbb 100644 --- a/contrib/llvm-project/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/contrib/llvm-project/clang/lib/Serialization/ASTReaderDecl.cpp @@ -989,8 +989,6 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) { if (InsertPos) CommonPtr->Specializations.InsertNode(FTInfo, InsertPos); else { - assert(Reader.getContext().getLangOpts().Modules && - "already deserialized this template specialization"); Existing = ExistingInfo->getFunction(); } }