From nobody Sat Apr 25 14:20:20 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 4g2sRm4Gbnz6bZXs for ; Sat, 25 Apr 2026 14:20:20 +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 4g2sRm10Wkz3JHd for ; Sat, 25 Apr 2026 14:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126820; 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=aQaBf0TX3GO93HodBut0HvMHZcMtb9uWMiwqxih90hw=; b=CabXqpBJb/XRbvcdw+5N0eoMfu/czP6D3uUwsnksR31MEaoR4lK+JhHD2iHZnZ1lgoubLh aIwda/Qsl63j2nHrrNa9HI6bh0HmQHKIbd1aPXhdDom4ygNx/+a430GITh3jalauGEJ6t/ UU5FGQv7fHCA0I2xOV0GUyq3NNVyXYhgb5VxVuPtn23SbCJLPViwp0m3TXmWmXuRfSRi+g Bics4zGJSqQuxJYDr4OTzeAhB+Va2HdrqcFWuyLoqhiQoMsWr0y2bHUVcQbGDHRuYIXy4R VXjvPNVbAGmhdRDNfUU4WMRnhJG74t9I2zEvEeAneTkZE2hsI2sEmYeccKBcvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126820; a=rsa-sha256; cv=none; b=pqLCCEaPPTwokGKSBk4L63ZxhQdl5g9Z7ymfVs7jH2WuBL8BMwsZ9ozQPMYpAlEAiCWZAf SPvtc8GW+ZVDXuSyctyGo/7Vh1zJWBNkG/YNxZEvxylQ0xkm6oFl13Zko3afA5gAc9V3A2 p99m69MDQV6z/ETrefzi7M+5pBjgdgktRT/r9+AjJwokrAyx5FjgC8KJgm7pFtJCrpsahx 8PNfDBz35rUShA4LlYPookuFDETEpkVvOjqBpDgM8epXi1gTKLjSnJizZwVqPgm4i6esWY Zon2j5MUqT75+dEjdtegWE/bOJrBQI5EOLrEytQse3BlijuuUy6uv2bETcuc/g== 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=1777126820; 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=aQaBf0TX3GO93HodBut0HvMHZcMtb9uWMiwqxih90hw=; b=vkko6DQKziMXuv9ZjhofcE7jgfuuyb2PrZ2IRv11p/vsWCrdXhpDpiUFUkAWB7afXeJqMk 0fB3BorOKQzi/H+6IZwU1W/JYEia5OgygCrRhxXFJSJpc3s3j81Btep+Pcc4AzELxjwNPU Lvw2zNhO0LZXSKi8x9DZwSbdruf/Rpt6JoElUIJowaa6eOgTpD2OB34Q9zLMa34QFs+ME6 kK2hYHcVQt2wHmGxojeYfvWNRx1me1eDaov0rlpXnlWxeG8ORSFN/0PMeQWTpQPX/BOAW+ n8zD+ymfCI3vOROnWK9W4bhnHqMysASpnlfppR6lmavOPq07kCzp2bjzbH1htw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRm0ZP1zd2M for ; Sat, 25 Apr 2026 14:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5ac874516b27 - main - 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 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: 5ac874516b27474ab5b3d195544c72fb04b4b86e Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:20 +0000 Message-Id: <69eccda4.38e87.25869675@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5ac874516b27474ab5b3d195544c72fb04b4b86e commit 5ac874516b27474ab5b3d195544c72fb04b4b86e Author: Dimitry Andric AuthorDate: 2026-02-25 18:06:51 +0000 Commit: Dimitry Andric 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 is