Date: Sat, 25 Apr 2026 14:20:20 +0000 From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5ac874516b27 - main - Merge commit 787ba2426148 from llvm git (by Matheus Izvekov): Message-ID: <69eccda4.38e87.25869675@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5ac874516b27474ab5b3d195544c72fb04b4b86e commit 5ac874516b27474ab5b3d195544c72fb04b4b86e Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-02-25 18:06:51 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-04-25 14:14:22 +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 --- 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 ishome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eccda4.38e87.25869675>