From nobody Sat Oct 03 11:37:58 2026 X-Original-To: dev-commits-src-main@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 4hxkD71Kl5z6vFby for ; Sat, 03 Oct 2026 11:37:59 +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 4hxkD70rfKz3Dsj for ; Sat, 03 Oct 2026 11:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791027479; 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=0/qdWgUcifz0tfZJBQ+2t2XDT4WDUWYNhNqXBoL2Iv4=; b=k/EicQjs2LIVfdcnpI47LUtfU1wHQ6qJqlf/qaIdRafqgmFOEVpdC3CPVNvRVGNTuuRP1U Tfrlsz1rRtNdQEx2Qijg2eB9LEU3vAI56p8embuvqEJont7bzsTqL8BjUdjSGKu8nYi8QX 3uzmST1Akfmw0PeY+ITeUKAOsV7botoK4kgk/dr0Nl0+96sdsBzteS9EP4WCHrbk0z5Hl8 VxwsAdY2tGI/EhSrx3ryyty5umTgWInGobauta67vGEmcmxu7V+v7ZcOjqVBy6d94eAqCE +YGGtMCgMGDwv8kl/wfmAc4yavuIGyuZR63E/ZkyPUcneTychV5Tt5P8/B498g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791027479; b=helPQDLIIPr4I6ENuH0f3xv7Cftd2zk/Wgz8EuKT8Z5wLg+oVM8hwgJA+NCFaGhHyiAkXa GCEpLEsPg4j4A+7uM1uMAnYBS6Yq3EvCXIEUQ3xKS1yhb21xZ9FaAxI3iw1yBaZQwbAu6U /Lb1VvdXpPrMSE3tqThwAUwJL8GWVI3H75H5jhbUI6VBje8Nwybi/1ZQSrykiCyksidRGv BgxswCmbPB5DPV4ZkNLLV8S//gLf6lQCKP5E7HYRe/TJOGnysMOtPVqt3E6fXS/Sg3ZeYn TWhoQijgfpCDBRw5vyqmnesXOKBMryCadeJu0ab+nOxP3/nxqIfhvkl7Cr54eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791027479; 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=0/qdWgUcifz0tfZJBQ+2t2XDT4WDUWYNhNqXBoL2Iv4=; b=uA2zj+7Cupj1qV05eX48JKF6/IMa/xInaKQHdHvbZI9eKFuDVge9fUOH5Wt+f6GZnK5Y1S hEzKn6+tlzwFSLnzASOGbQChdVx9z2RwsO2y1bg9lfUyM6h14h5bNi3J/mFQxHm9kK5ptu YtHtMjF3f4Go9zIY3LqLoMDPIXIvhMgIutVM/wKCAMK7k44jiE7r5oZVmZY+Ize4ZQSaIN ImAA5ocvSMpr6mLFO4Y+YNqzy1wXGHwMVDGlmhcxLvStTT9aVo75DZP5UR4vaxKA2zP4du g8ju91SxXcOc3na8sJvF1igU2xIr979KqPGiUy30Hs1CuUzbexvun4f31H7cgQ== 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 4hxkD66jqGz12lY for ; Sat, 03 Oct 2026 11:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d77f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 11:37:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: fe9c7137871e - main - Merge commit c4ce37507537 from llvm-project (by ShengYi Hung): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: fe9c7137871ee0b5c48d4c38b87d80f72e73379e Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 11:37:58 +0000 Message-Id: <6ac0e916.1d77f.223c506b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9c7137871ee0b5c48d4c38b87d80f72e73379e commit fe9c7137871ee0b5c48d4c38b87d80f72e73379e Author: Dimitry Andric AuthorDate: 2026-10-03 11:36:42 +0000 Commit: Dimitry Andric CommitDate: 2026-10-03 11:37:43 +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 --- 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