From nobody Sat Oct 03 11:37:58 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 4hxkDD309dz6vFwv for ; Sat, 03 Oct 2026 11:38:04 +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 4hxkDD1NG3z3F25 for ; Sat, 03 Oct 2026 11:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791027484; 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=CWjq1WCuVFa+dN4pl/NYJ00423oJJqb4sGGzK7H4fBjvf9BMc4FhKDzVlFB3WPjL7gIWX+ f2A/J1nKAjIFdidjJYIsXeacMWoMoUU1m65iXcG+gjwtBZ2BZ7cBXlyGXYip23dTdAT8zb LpeCT4bvUyshxh3IvhBU3UcbwMrF2tFxs2ZX/hM0HtS59WsuYMAaj37LGKEGFGcWE1CpuU Bpb4h93WV5XUmXaFUvvow7e/FpQ+pHLEBW0h5yirmlpEQc8ta1LUy/G3+/4GM+BSKF+YsG MM1YYN5v56HxdKjdR4g1kictTZNEL5hqGSGxgjhb5NDBlBJg6F2qr20DgCsHeA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791027484; b=h5bEpFsqiTnN+x5IirR2Ts8uPZNG3vTfGQ2VhKrwIq2WadxEvx8wPOd76Jm5ZzCqAMAPw4 giabvPtvw5L35xnvcyoDmI8Ir4WZeysHeIx1O13o+giKRx+B/9LoGIDFy7gI6vERGIAoW4 BsgtdHwhaByZm/TuSuenH/SL3AuX3EzIs8IhSqAQtba/uofjtWFIIv7/WqsZtgeSEQmw7m 2x6AdzMobMD9DCXuik+1MAzych3f4mDUn27FneV4FVIJ0J5YGzPSK5g1/Aw0K3ympFHNOY aMDmIhXmnTbMMNOfmmlXQzyCj5rBf/PTfXcE4mFYJ9dGf96F9iotsu/1I+Te3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791027484; 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=ZXHfoUfA/rFv2rNTARGr4AEah6Mb27tO0KgAtJzwArcYQplObrbo5nBSeAhbgx/+jJuEYB dfCUJlQuEqSjoVUWAbgaWiOELLsqHev2BDyJ3IJerxYfNApISknWsj94GbrTY+k3H8P6No XZg6vbAB3QzeIzso1trMgKgEOkK6CHFM9kfR1TXspXcBE6PdLI2mzU7QIfgYPLFF56GlfN jjiyeJhEnHv5KupCg1VmWA7cNCNG4b6YAYeqP5+vLdud79Ose861wtDAQm5vZJLv+tkTU9 FcdoG3TRN9YHqR+Uo077aZJwWEBX1lFr5CFcdKbvkYFrqRA93F/5G5yxDucO2Q== 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 4hxkDD0SNMz12J7 for ; Sat, 03 Oct 2026 11:38:04 +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 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: 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