From nobody Mon Jun 1 17:13:24 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 4gTgXN6qKFz6gND9 for ; Mon, 01 Jun 2026 17:13:24 +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 4gTgXN668Yz42nX for ; Mon, 01 Jun 2026 17:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780334004; 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=TiCvhavU/rer+YcPAfrZxCe+rcgtdgkd2roiSPKjO9Y=; b=H1T+Mu15jtObhF+X505HARi0MqNInQGny7Largo8dl+iUls8KA2kKy+iHHvG9KkKyznL1I KI059CYYLiZOQQRXh4GzMrpxJI2gy3zd+USo+mG/nubs/i7IFhPhQ5heqaTh51mBGhzCv0 qEKzdAqDSq+IZNmmvx08vfB3ECyroY3BZaZq4TxBUJrLPBcGxowSdPMQ/S0u9nOTbY7pkw nkKatNKkx/sjrfylcEVTJdz8FYfD+Vw7CcmDOQCtD5I/tcMmvrwDC3ABXIJETQCkmf3MKH S4nEkRQvbqjXpvOULHa2cTFISHorltjZjbQYzw91pPQ5xipkpTiTkBovE7mPYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780334004; a=rsa-sha256; cv=none; b=svCP3zKU43enwg4w9vkkUHSzlp2eQ8gcEZingGkYyU3dYNJ/cwbQY58juC+KWW60MCkj68 fqw88oqYV/rXW4M+QAjPGJ6jpjoitS08UmuPFf0B+gyuqKsDCo33khXl5ikTXjdACmjQHz eTBsCzU7CYFsL9cSrU/as8aEmHshn/5Ui0mGd31BaF4s01+v1gQJ++BeH5ZJJPlgSMReVM LifRtmJeB+uCkOvdO7/8QkJ7j+njIVL5sensNjXIJEkg5tCGAtr7R2wTbuh0VhBaAk2gqd CFtXj4PYGEe+YAhzNjXQLAI+TBChdxCCCUuy2fAt/zIZeXZyu7Y8//lHhCRd9Q== 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=1780334004; 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=TiCvhavU/rer+YcPAfrZxCe+rcgtdgkd2roiSPKjO9Y=; b=hmZLsv9jnZWQ7JpRV5TC96doP3bL4w75fQRRfuZkdJPvM2/VbZ/dc3aAIWVAL1y0dWz4GU kN3bZVPyOHqDgtvDZozx4Xxi5BpvxleiXXEGyyDDbI9nQQ+tyW7P1AKjbWgWwtY9rO1F1F 5A6dz3oShVjLgbZdEarCz5KOfzKuOTuUd+suFqP5K1NpLc0QSm0zoiFAAGjYprZbibqq0W B9yxDD4hyv8xRHJveL3zIJj/gBWib3CYCNzD7vNH2JbsOYLmJdCNBDQiog7UhEjjmLP5WD ZLM50DvrILNbILX7kPn1LV9xRLwtq9QG9NoL9o2yrCZcqQRfixbQkEO3MOZhcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gTgXN5Q3SznZG for ; Mon, 01 Jun 2026 17:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Jun 2026 17:13:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 86326398b73b - main - 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/main X-Git-Reftype: branch X-Git-Commit: 86326398b73b81f84831fb5fc4c12d9219bc0f57 Auto-Submitted: auto-generated Date: Mon, 01 Jun 2026 17:13:24 +0000 Message-Id: <6a1dbdb4.18f1f.11efe144@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=86326398b73b81f84831fb5fc4c12d9219bc0f57 commit 86326398b73b81f84831fb5fc4c12d9219bc0f57 Author: Dimitry Andric AuthorDate: 2026-06-01 17:10:11 +0000 Commit: Dimitry Andric CommitDate: 2026-06-01 17:10:11 +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 --- 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(); } }