From nobody Thu Jun 4 08:20:38 2026 X-Original-To: dev-commits-src-branches@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 4gWHZG5j6Wz6gGNl for ; Thu, 04 Jun 2026 08:20:38 +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 4gWHZG4svwz3rQc for ; Thu, 04 Jun 2026 08:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780561238; 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=CvAVXKRGuWkpXdjbFyE5y2npbUsmCfGgl5ZFlvxeBPo=; b=Qot44KgMNE9doPIcwDVoGlWPR3yjn4xVRsvTTNgU1k4s+rSPke7ofgS1K647atiuiEHZEQ ka+Dxrn2xISpOyKzr8hZCGYlW/1/j+lk7YPAZglxr4f0hIHJmqprcJRcZHTbLrK1NBBxZf sqe1ugqugvVmxJw/sNOaU+efb3tz6nvznyaTVnbIb1n+SGyqhusw6OHggO0foZz9Jq1rrB q3Xx3Z8ogoNxNQYo0saPLOvFaauwE4i+UVl0olEdpZPLxColkqGB/UFcTX9ZuRiPS4c8+Y BxpqFfeVtDO+fcsfObSCuMkmPPKresrtA4DdeIB2GJpzBW8eq+HZQgruTTxnXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780561238; a=rsa-sha256; cv=none; b=rqiuLG08zdEF1NM/j7lfxJLYZoshL1cq2ITkmyNM0E74sNxEbjXYZBh1sf9OeodbMijrgX /aHM7/McLfYb7BcwEOTsuQslX5ZFO7MT5v1WLCGX37VhuC7UKlnfYg1FEByNwTiM6qt4y9 sLPAE0msu503PTjwv4yNkcsofunfd3KK1bJWbZBKj0l/sELltpkzxPOdFv0Fs6oTAy4gW8 wdT2CcZ8pRcVGG7lsjwt5njP30kJ4B4UnuKJijRlwD6M0Wr69cbYQ0lg2F0FjQjn4zxdB2 SkL24EuY/4iD3LFgCYz8NaWkGUjFyqal3gWGguGGIOVHGTMmynlonrOQjDksmg== 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=1780561238; 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=CvAVXKRGuWkpXdjbFyE5y2npbUsmCfGgl5ZFlvxeBPo=; b=vRZCGz8lROrB9uK5MC8RH+8smjMWO98UnKIAVXfLFC8QmxDj5UrSEbVd+RtGrTK3d2NGIX MbE1aadLQJOYHQiDOSvMUfgFcwN+d7reOMBgcJChaljOnlQqZLxojRHh9WlPAiBn8eoZyA cixbVbBhOw7Mfsgbz35xBbb/nmF6t6D1V8vYu3o21ntEY87Q8d29m4ij7pgk4Nj9Yf2kZf qy/9EsVoFk6EuekCLWwz2R+6QxUvatr6f/Xe+VyMUqqxs1X+9SfOJZoTJX3RNUG5OpU9a4 +IFOR5isYfRuWy+SDC/B/Jn1+Mv9Oo8YU7T0qYR8ArITcY4oDkUs8GeEDFFFPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWHZG4HNXzr2Q for ; Thu, 04 Jun 2026 08:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b032 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 08:20:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2cdb0c07e25b - stable/15 - Merge commit 63c29df8eceb from llvm git (by Dmitry Polukhin): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 2cdb0c07e25b5b4782a94e18abf5d39e763a1b13 Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 08:20:38 +0000 Message-Id: <6a213556.3b032.36d1edd5@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2cdb0c07e25b5b4782a94e18abf5d39e763a1b13 commit 2cdb0c07e25b5b4782a94e18abf5d39e763a1b13 Author: Dimitry Andric AuthorDate: 2026-06-01 17:10:11 +0000 Commit: Dimitry Andric CommitDate: 2026-06-04 08:20:21 +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(); } }