From nobody Tue Oct 06 16:38:32 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 4hzhlX41CGz4n9Yb for ; Tue, 06 Oct 2026 16:38:32 +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 4hzhlX25JSz4mbs for ; Tue, 06 Oct 2026 16:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304712; 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=nsMJJxOT5Erdhdo9+Mjp0IBoGKS/hMqmfQ67rBPaNbg=; b=xaXJWFNDXqlKE5QIf7z2KF8GBAUhrBoiqYTyuDDTJ24nshMYxFA0hHz9d8kAv2tJ48BzAr vNK7cUC3zPtbEoqPtlJDKvuTG/v1ZyuQle8KWUwBv1yiPGbQQvWHSVIqJXitzjmYcKS6N0 9j4czmZ08SxUVFWReIeW93FZtC1ekio3WJCUwZ+GmoCOsll9JkuA3+GIA7dJP0XhIXu9tg Nkt/3YgPa8BlxeZWMZCaZd3VY1V/TGvVPLirsK1507hafTV7Ya9MwsmN/dkLudP4wsrbXm 8BKS6o+6jhsjgPnhs/GA4tKzMOfMpLDQRvMyijLG/6Osqu8kOzba1OVvwPZISA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791304712; b=Y3DTgzsIbfK7KZIKM8z6q5mrzmBoOlxElvGBvWbtgF15XqSc6B6Y459CjkSd0SOHHZiNEg ctJ575jVfEeoH6WLjqr2piMLS5yF++SrisJa0k/KC1ghp0xYPoa3k+2U5JLCc6Usf6uKPW vwp6K2u9KZ529uefXu8pgOxvrbPoYod1JAyFfXHuz9OkLPPltRtkrvln/dZU7RppucFeyN H/IfPmvqZcgUsKyY5e0sVclJ5Ucu6wdPOXla+0z4mmmZu2fGg+xJA+lXVGBwiFVvkc+4zn htO56XNzoLsec2EvVirg931oP5IprFKwv4H7hjorPzzPU/z86ESb0JrUCRbf/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304712; 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=nsMJJxOT5Erdhdo9+Mjp0IBoGKS/hMqmfQ67rBPaNbg=; b=o8zdKCo/UR/ngnuO8c8BnPgCtErUwDddMFWcQIbeKlHu1nfqypqKgeCOBX5MkJKl1yyuY2 dMf8iJaQtVE/uNdQ/Htgqy6eZ0jXwTRm/8fTspDzXqr5AZ+sV+/gyx5t/ZNXL18CheHd/X I8Ohuacl6+uuN3zSKvLU06GymCef2atiyOx2pPKQIOsurC0kqQZsL51wBRs9ZFo9d1p4v0 hwwI44b2m6x7V9EllwVp+bNVf3UuYowKiLoY9FXxbpp9BTd7uetzudefjXtcWHlERbEmoN YG0hilDMC1M6H4AWOCAaGSZq7zQMs26ZQIW+G76pyxoN5mPWgn2F3+cDBw3umg== 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 4hzhlX19GLz1CmD for ; Tue, 06 Oct 2026 16:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31840 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 16:38:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0c409a56237a - stable/15 - Merge commit c4ce37507537 from llvm-project (by ShengYi Hung): 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/15 X-Git-Reftype: branch X-Git-Commit: 0c409a56237ae09be7ba491750bbbbdb25ef2e4d Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 16:38:32 +0000 Message-Id: <6ac52408.31840.2e8beebf@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0c409a56237ae09be7ba491750bbbbdb25ef2e4d commit 0c409a56237ae09be7ba491750bbbbdb25ef2e4d Author: Dimitry Andric AuthorDate: 2026-10-03 11:36:42 +0000 Commit: Dimitry Andric CommitDate: 2026-10-06 16:38:03 +0000 Merge commit c4ce37507537 from llvm-project (by ShengYi Hung): [Clang][Sema] Create LocalScope for Variable Template (#228280) A variable template should create its own LocalScope, as it should be opaque to other instantiations. This can occur when there are multiple instantiations in the same lexical scope. The correct behavior is that these instantiations should not be chained together. Assisted-by: Claude # Test ReleaseNote Fixes: #134148 This fixes an assertion while building the devel/glaze port. PR: 276265 MFC after: 3 days (cherry picked from commit fe9c7137871ee0b5c48d4c38b87d80f72e73379e) --- contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index d2b87f2702a9..a9755bcc73fe 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -5901,6 +5901,10 @@ VarTemplateSpecializationDecl *Sema::BuildVarTemplateInstantiation( if (Inst.isInvalid()) return nullptr; + // A variable template specialization is never a local declaration, so it + // must not see the locals of whatever instantiation we are currently in. + LocalInstantiationScope Local(*this); + // Instantiate the first declaration of the variable template: for a partial // specialization of a static data member template, the first declaration may // or may not be the declaration in the class; if it's in the class, we want