From nobody Fri May 29 23:02:06 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 4gRzQ71d9rz6gFBp for ; Fri, 29 May 2026 23:02:07 +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 4gRzQ66JP0z3CVn for ; Fri, 29 May 2026 23:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095726; 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=4BNALGe+3qLrAL184Jf2PdzpRi/zne9oNbt900viUa4=; b=jNH7bmpUw7I7BJdk4xWznI/Xqv10mi+w3Ae6/vBd+IE8u08t/Fplv4rgXGKlTP7GzSsUyJ pXgnKhf/PUqkwcVwkTS8SVKeyPpJDkbDRFDYc13xoWokk0/zAl9Bz9kaGYJSOV7jr0SCR8 ffArZpntwJI+o9c+U19sxQAORavUyXxHXYo2MEheAnF7MmSgSyJXJ9T5mTDFwU6+vUWAxi YfRVnDfmERyEcGOxSzHuMxpyTn3btp6TmZUA+qJ01Z6z+sF+rBiSVoiq3/EcR+ipjjrouf rdqqc4ya+8f7xOvTC6xPnytF00TxNhw9RDXWldMHv3GRBszo0H7gQZ/nxF9qvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095726; a=rsa-sha256; cv=none; b=dXv2N00Gf4HFbzw0vVrCDAd/bZ5Slpxnpvem7YokqDBvGLXk3hQvD11RaSG3EhP80UStXT FE8RB9UFm97ZM9n2DKcLy8Ulh3y46HF8/aWY7qsCXGEfHzuba2N2I2m5iA6u79BstioOS1 BpgIn6UF5cFSAhhiIlsYek4mIfvhq/DyuH4y93RZHN5RWnp4pIS9fsKPENXjp9f8msXToA +wH8pi7bpwb9grS4v2tTCqKZAJP5tJeKoto5wHsFCLypW7/kBa5VgDF7km/QUrs57fw+t3 ZfxqC3W3cONRnftMmV8+YQo61EgW0IIkLV476rHlc4TlWOx6YUcAxGpZ6a+uEg== 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=1780095726; 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=4BNALGe+3qLrAL184Jf2PdzpRi/zne9oNbt900viUa4=; b=BOMyNotIRtQU+/f+Qwn4gLexS0VPTh/SwNwXbiASGeXor35jNrCN0BpKHWMiHNCmuyQBw1 ppXnYuzB0ELTX35FZ2DEKWL7o/ZS7plGmc7Qq/+P0CRJrqHE0ZWZHydpcApGigzD69i268 TdCQvaAlsNsSaCEcF69ecIurw5hhrZL/8AHMfuj6nJK6tPEoGumrwaWBla/vatfo8iQP+I k2X1A8EcRZ/vuZN7wpZY3bti/pUt2lpf/eK6DgmMGrC+lNrzFVIoBIzkJgvZgRjAFGevlC FBhv1cTTBoq4QKzPFykCjzwWX2iOOtNhyqoP1uAbj1R1ubuwe6pqpAK++KHQwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzQ65dK7ztdg for ; Fri, 29 May 2026 23:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41433 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:02:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e335c7f5daab - stable/15 - Merge commit 787ba2426148 from llvm git (by Matheus Izvekov): 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: e335c7f5daab66a47beb60e76121be139bb0cf65 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:02:06 +0000 Message-Id: <6a1a1aee.41433.1ac6724f@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e335c7f5daab66a47beb60e76121be139bb0cf65 commit e335c7f5daab66a47beb60e76121be139bb0cf65 Author: Dimitry Andric AuthorDate: 2026-02-25 18:06:51 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:32 +0000 Merge commit 787ba2426148 from llvm git (by Matheus Izvekov): [clang] create local instantiation scope for matching template template parameters (#183219) This fixes a bug where a partial substitution from the enclosing scope is used to prepopulate an unrelated template argument deduction. Fixes #181166 This fixes an expected error when building the devel/catch port. PR: 292067 MFC after: 1 month (cherry picked from commit 5ac874516b27474ab5b3d195544c72fb04b4b86e) --- contrib/llvm-project/clang/lib/Sema/SemaTemplateDeduction.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateDeduction.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateDeduction.cpp index ce78ecc2d4a2..d1fb0c45c81f 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -6478,6 +6478,8 @@ bool Sema::isTemplateTemplateParameterAtLeastAsSpecializedAs( if (Inst.isInvalid()) return false; + LocalInstantiationScope Scope(*this); + // Given an invented class template X with the template parameter list of // A (including default arguments): // - Each function template has a single function parameter whose type is