[PATCH] D128276: clang: perform deduction at the right depth on Sema::AddMethodTemplateCandidate

[Matheus Izvekov via Phabricator via cfe-commits]

mizvekov updated this revision to Diff 439245.
mizvekov added a comment.

rebase


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D128276/new/

https://reviews.llvm.org/D128276

Files:
  clang/lib/Sema/SemaOverload.cpp
  clang/test/CXX/temp/temp.decls/temp.variadic/p5-cxx20.cpp


Index: clang/test/CXX/temp/temp.decls/temp.variadic/p5-cxx20.cpp
===================================================================
--- /dev/null
+++ clang/test/CXX/temp/temp.decls/temp.variadic/p5-cxx20.cpp
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -std=c++20 -fsyntax-only -verify %s
+// expected-no-diagnostics
+
+namespace pr28087 {
+template <typename F> auto apply(F f) { f(); }
+template <class...> struct S {
+  template <int> auto f(decltype(apply([](auto...) {})));
+};
+template struct S<>;
+} // namespace pr28087
Index: clang/lib/Sema/SemaOverload.cpp
===================================================================
--- clang/lib/Sema/SemaOverload.cpp
+++ clang/lib/Sema/SemaOverload.cpp
@@ -7078,7 +7078,8 @@
   //   functions. In such a case, the candidate functions generated from each
   //   function template are combined with the set of non-template candidate
   //   functions.
-  TemplateDeductionInfo Info(CandidateSet.getLocation());
+  TemplateDeductionInfo Info(CandidateSet.getLocation(),
+                             MethodTmpl->getTemplateParameters()->getDepth());
   FunctionDecl *Specialization = nullptr;
   ConversionSequenceList Conversions;
   if (TemplateDeductionResult Result = DeduceTemplateArguments(
@@ -14157,8 +14158,12 @@
       IsError |= InputInit.isInvalid();
       Arg = InputInit.getAs<Expr>();
     } else {
-      ExprResult DefArg =
-          S.BuildCXXDefaultArgExpr(LParenLoc, Method, Method->getParamDecl(i));
+      ParmVarDecl *Param = Method->getParamDecl(i);
+      if (!Param->hasDefaultArg()) {
+        IsError = true;
+        break;
+      }
+      ExprResult DefArg = S.BuildCXXDefaultArgExpr(LParenLoc, Method, Param);
       if (DefArg.isInvalid()) {
         IsError = true;
         break;



Index: clang/test/CXX/temp/temp.decls/temp.variadic/p5-cxx20.cpp
===================================================================
--- /dev/null
+++ clang/test/CXX/temp/temp.decls/temp.variadic/p5-cxx20.cpp
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -std=c++20 -fsyntax-only -verify %s
+// expected-no-diagnostics
+
+namespace pr28087 {
+template <typename F> auto apply(F f) { f(); }
+template <class...> struct S {
+  template <int> auto f(decltype(apply([](auto...) {})));
+};
+template struct S<>;
+} // namespace pr28087
Index: clang/lib/Sema/SemaOverload.cpp
===================================================================
--- clang/lib/Sema/SemaOverload.cpp
+++ clang/lib/Sema/SemaOverload.cpp
@@ -7078,7 +7078,8 @@
   //   functions. In such a case, the candidate functions generated from each
   //   function template are combined with the set of non-template candidate
   //   functions.
-  TemplateDeductionInfo Info(CandidateSet.getLocation());
+  TemplateDeductionInfo Info(CandidateSet.getLocation(),
+                             MethodTmpl->getTemplateParameters()->getDepth());
   FunctionDecl *Specialization = nullptr;
   ConversionSequenceList Conversions;
   if (TemplateDeductionResult Result = DeduceTemplateArguments(
@@ -14157,8 +14158,12 @@
       IsError |= InputInit.isInvalid();
       Arg = InputInit.getAs<Expr>();
     } else {
-      ExprResult DefArg =
-          S.BuildCXXDefaultArgExpr(LParenLoc, Method, Method->getParamDecl(i));
+      ParmVarDecl *Param = Method->getParamDecl(i);
+      if (!Param->hasDefaultArg()) {
+        IsError = true;
+        break;
+      }
+      ExprResult DefArg = S.BuildCXXDefaultArgExpr(LParenLoc, Method, Param);
       if (DefArg.isInvalid()) {
         IsError = true;
         break;

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits