From nobody Tue Oct 06 16:38:48 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 4hzhlr6q5dz4n9rl for ; Tue, 06 Oct 2026 16:38:48 +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 4hzhlr3vPxz4n7H for ; Tue, 06 Oct 2026 16:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304728; 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=x5ydXWz+tEyuxkrswT57mVnkgKh+ee/bDoUupNjUSgk=; b=yDlQpc2Mm8DCkUWLMquffWy1zHB9QwKbQ1VtDsgTgwlIK9L7eBtwNUR7UtbRDpjzo+H/k8 mtyBES238yRKWlry8bK0oTVQgJr4eozpyUcOfwedZWD/CO2iAEre0Gt05ri9M9Zcr2z7fJ EZGi674CqX/MO9IKsJWCNayapIs0GCLA6B74wyWE8OqIXzuqMJYiJHw8GUI0oGYrIfofl4 2/cmC0pprUR6rulEQA3iqK9D8DwHC7/A80oga6xaQGs5fJY7nca9FGHJR8Uvd9ZHYn32so jqTnPLdk/b5wFuGGR08bVJh1gTrnQlTp/7UVwEUY/V9ib5UP/r0PZWzPRekguA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791304728; b=L6ze/wIkVq8WejMYMiIIvVEFo9sCoQ9zNc53g7FAnymBJL//lr8R0vvBdwFFuVQEFAG9cG X6iGdaBjae9wvQk66A8CwmROoAJSkNZFWmS9g7YXyj3yN1Z9047faW2QoZSimcF6eClmhT YQS7QitUQqKDEmRLE+aBFTJFuLQpBKeaYL0i8FLv5ouVtLdS05XuMf5OJjfca2xYtV5ktE GpzlgT1c+mtEtPnfc7CXJ3B1AFUcuvS5kAM46aYN5ddjLnI87cSCdqXrM8tFEPxlViWJ3m jfrOS4MZH5D+Pd9Ji5z4ey44dsMBY2r80M+eTFankggV4Fgyfta0SrJClYNbWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791304728; 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=x5ydXWz+tEyuxkrswT57mVnkgKh+ee/bDoUupNjUSgk=; b=LrsCs+8/mSGNjHVawvmo7h4XOxHAkYOjyHRB3qcWAlVYGKHS7MkKPTilr6AJJTFj3xi3Mz vA7qfLLbPBgOqaDXHeg1HPGVrEWzgMpM+9c4ByOk6SRO4frMIMiKp5mbJOJ9AbwkA4ef1/ aQ9T6d4BKvZ4YZb+312KDieT/rEbvVslvE7cU4btIqBB7Gm2DJMgmI+e9Af589TjkQcceY GUaCDGs+DF1MD1LC07JwRDQ3lf1ci+3+JLHMaYk0Roq4YasQRbFajbmIbErtC9lDA0ZZVf e6gxLlcy0eGKjyI1QxUS/h4FW1awdeZN6tMXZ11hMLHgtFsOj6Uu85zUuZA9+Q== 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 4hzhlr2pRvz1Ccv for ; Tue, 06 Oct 2026 16:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 274d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 16:38:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: fb099c133cae - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: fb099c133cae7bf6c7b9625a3d81d6a3e4bb5cbe Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 16:38:48 +0000 Message-Id: <6ac52418.274d9.381aff11@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fb099c133cae7bf6c7b9625a3d81d6a3e4bb5cbe commit fb099c133cae7bf6c7b9625a3d81d6a3e4bb5cbe Author: Dimitry Andric AuthorDate: 2026-10-03 11:36:42 +0000 Commit: Dimitry Andric CommitDate: 2026-10-06 16:37:58 +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