[llvm-branch-commits] [clang] [Clang] Don't skip lambda constraints when substituting type constraints (#236425) (PR #236766)

Mishmish Dev via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Oct 29 06:21:07 PDT 2026


https://github.com/mishmish-dev created https://github.com/llvm/llvm-project/pull/236766

Backport of 93c463319ebcb57e82f0c87c813a9ead536fb952 (PR #236425)

>From 6042975b8f4558c41d254e537e3a64e6293b6f8f Mon Sep 17 00:00:00 2001
From: Mishmish Dev <mishmish at mishmish.dev>
Date: Thu, 29 Oct 2026 12:04:29 +0000
Subject: [PATCH] [Clang] Don't skip lambda constraints when substituting type
 constraints (#236425)

This follows up to https://github.com/llvm/llvm-project/pull/207966 in order to transforms type
constraints with a ForConstraintSubstitution flag.

Assisted-by: Codex

(cherry-picked from 93c463319ebcb57e82f0c87c813a9ead536fb952)
---
 clang/lib/Sema/SemaTemplateInstantiate.cpp  |  9 +++++++--
 clang/test/SemaTemplate/concepts-lambda.cpp | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index bad0cdd1b7067d..51a169192af62e 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -3150,8 +3150,13 @@ bool Sema::SubstTypeConstraint(
   if (TemplArgInfo) {
     InstArgs.setLAngleLoc(TemplArgInfo->LAngleLoc);
     InstArgs.setRAngleLoc(TemplArgInfo->RAngleLoc);
-    if (SubstTemplateArguments(TemplArgInfo->arguments(), TemplateArgs,
-                               InstArgs))
+    // Constraints on lambda arguments can depend on the substituted parameters.
+    TemplateInstantiator Instantiator(
+        TemplateInstantiator::ForConstraintSubstitution, *this, TemplateArgs,
+        TC->getConceptNameLoc(), DeclarationName());
+    if (Instantiator.TransformTemplateArguments(
+            TemplArgInfo->arguments().begin(), TemplArgInfo->arguments().end(),
+            InstArgs))
       return true;
   }
   return AttachTypeConstraint(
diff --git a/clang/test/SemaTemplate/concepts-lambda.cpp b/clang/test/SemaTemplate/concepts-lambda.cpp
index 039586cb8042ea..d631f7675efdb0 100644
--- a/clang/test/SemaTemplate/concepts-lambda.cpp
+++ b/clang/test/SemaTemplate/concepts-lambda.cpp
@@ -221,6 +221,22 @@ static_assert(!requires(int i) {
 });
 } // namespace GH236286
 
+namespace LambdaTypeConstraintSubstitution {
+template <class T, class U>
+concept DecaysTo = __is_same(__decay(T), U);
+
+template <class T, auto Constraint>
+concept Satisfies = requires { Constraint.template operator()<T>(); };
+
+template <class T, class Expected>
+concept Matches = requires(T t) {
+  { t } -> Satisfies<[]<class U> requires DecaysTo<Expected, int> {}>;
+};
+
+static_assert(Matches<int, int>);
+static_assert(!Matches<int, double>);
+} // namespace LambdaTypeConstraintSubstitution
+
 namespace GH73418 {
 void foo() {
   int x;



More information about the llvm-branch-commits mailing list