From nobody Fri May 29 23:04:43 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 4gRzT92xrCz6gFwr for ; Fri, 29 May 2026 23:04:45 +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 4gRzT80T29z3HKt for ; Fri, 29 May 2026 23:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095884; 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=a20pYYjpPwGosGgdP2lSnldxwXnls2kIbRkOYXf3cuo=; b=Cb/vqbUOsGM3mzNQ1sFjXkFgMwBi4Mv2JAmMPit3qh9Zo2cNOpwM0xXqFh9qgF4dey52YO a4a/TBpUp6bIXUIO7MuwY1zhwEMrG2B/raB54dhX3EkA3V4KtYGwVTrWTdhhHsCpa11uZi rF1b8lODc1Utfmb49AiKBb1EsZ/mDr7WexKqjcNV7C8nCH92e3BwL7aW5cv39aAUlUzk2l CCOWg7A59gfQqNCk5V9I4SpPogK8m+X6eZ94tDMArMkGceQt6UIOVoKyBVxvl63l0oMm2g Bfw97riS6cAx5Ani2m8RlRb6kuwRZgs3T6ZD4HowShGnn25+VGXcH6biWakAcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095884; a=rsa-sha256; cv=none; b=CJBwfZ7T3bvR07NiMHNNjwwdC5nQ6FvkF9VVShV5EfaETqRR9IXqL5ARPqgg+c1DmpVyda 6eYM6oQwQUAxeAD7XM0L6rTHo6BBJuZilfGrCdcgSTsMwhv585zDlR0qOrc8jJ9Z27Nxi2 xIvv5Glx02GigI8aP4byPkRe2pBWM/sjnm1d99Q/NaugY7FR32FQH5UYKQonxWZCrUeMpL d9OcJhVh2bM8bWJDGAnFTvZ34EJe3drr+s73BSzEnK+myQFCL56tbhnSkXFZarZPAHn7sA AfXypfWo3tWijfdLhh/UeofahueKgvPcgt1my611jF61c1Bwyvgx2OdKlN3Jzw== 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=1780095884; 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=a20pYYjpPwGosGgdP2lSnldxwXnls2kIbRkOYXf3cuo=; b=Xr+86P2sn7DOR67Wi2bzxZpE+veTo9HCRHclkuTvkYlOo1s7xHX4pmwjnNgC4wVM1zWuEE ASkJjeWdktmOMVEBqtd/KjoOcWkKEDLdaT/W8+NkyyFdKTSBayF0KSiYmmKHSvzBBPc8XX D6UQaLAKF186fHO/i2K1n2e3DZQimuZpZSzBrCrLMIMFRqJp+n/9Au6n3DqGZXokzjSWZJ cMBR5H7MQlLdJG92obbA+ONN4vhsIh3M/6SwEf5srWJNbl/6F9ft3c9ctnB1Ppsi3tsEwG 5W+uv2lJZTX1H/8TMOjWH3+VwMJyJJ3Y462gwH3fHr/8Hkf9rEUT2ZLYvhPRHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzT77340zv2h for ; Fri, 29 May 2026 23:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 431f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:04:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2e6734ed1959 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2e6734ed19598028da58b2f47fbb2dd5eaf7f485 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:04:43 +0000 Message-Id: <6a1a1b8b.431f9.790a68fc@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6734ed19598028da58b2f47fbb2dd5eaf7f485 commit 2e6734ed19598028da58b2f47fbb2dd5eaf7f485 Author: Dimitry Andric AuthorDate: 2026-02-25 18:06:51 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:37 +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