llvmorg-github-actions[bot] wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Mishmish Dev (mishmish-dev)

<details>
<summary>Changes</summary>

Backport of 93c463319ebcb57e82f0c87c813a9ead536fb952 (PR #<!-- -->236425)

---
Full diff: https://github.com/llvm/llvm-project/pull/236766.diff


2 Files Affected:

- (modified) clang/lib/Sema/SemaTemplateInstantiate.cpp (+7-2) 
- (modified) clang/test/SemaTemplate/concepts-lambda.cpp (+16) 


``````````diff
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp 
b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index bad0cdd1b7067..51a169192af62 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 039586cb8042e..d631f7675efdb 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;

``````````

</details>


https://github.com/llvm/llvm-project/pull/236766
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to