Author: Nathan Ridge Date: 2022-03-25T02:46:22-04:00 New Revision: 56a54910c5978947adfcf230f360a15b34c0e32e
URL: https://github.com/llvm/llvm-project/commit/56a54910c5978947adfcf230f360a15b34c0e32e DIFF: https://github.com/llvm/llvm-project/commit/56a54910c5978947adfcf230f360a15b34c0e32e.diff LOG: [clang] Propagate requires-clause from constructor template to implicit deduction guide Fixes https://github.com/clangd/clangd/issues/890 Differential Revision: https://reviews.llvm.org/D113874 Added: Modified: clang/lib/Sema/SemaTemplate.cpp clang/test/SemaTemplate/deduction-guide.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index ab365d34f8757..b34df75985dc3 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -2184,10 +2184,24 @@ struct ConvertConstructorToDeductionGuideTransform { SubstArgs.push_back(SemaRef.Context.getCanonicalTemplateArgument( SemaRef.Context.getInjectedTemplateArg(NewParam))); } + + // Substitute new template parameters into requires-clause if present. + Expr *RequiresClause = nullptr; + if (Expr *InnerRC = InnerParams->getRequiresClause()) { + MultiLevelTemplateArgumentList Args; + Args.setKind(TemplateSubstitutionKind::Rewrite); + Args.addOuterTemplateArguments(SubstArgs); + Args.addOuterRetainedLevel(); + ExprResult E = SemaRef.SubstExpr(InnerRC, Args); + if (E.isInvalid()) + return nullptr; + RequiresClause = E.getAs<Expr>(); + } + TemplateParams = TemplateParameterList::Create( SemaRef.Context, InnerParams->getTemplateLoc(), InnerParams->getLAngleLoc(), AllParams, InnerParams->getRAngleLoc(), - /*FIXME: RequiresClause*/ nullptr); + RequiresClause); } // If we built a new template-parameter-list, track that we need to diff --git a/clang/test/SemaTemplate/deduction-guide.cpp b/clang/test/SemaTemplate/deduction-guide.cpp index 3ec7e19220684..3ff2106aca45b 100644 --- a/clang/test/SemaTemplate/deduction-guide.cpp +++ b/clang/test/SemaTemplate/deduction-guide.cpp @@ -206,3 +206,37 @@ using ET = E<1, 3>; // CHECK: `-TemplateArgument expr // CHECK-NOT: Subst // CHECK: `-DeclRefExpr {{.*}} 'int' NonTypeTemplateParm [[M2]] 'M2' 'int' + +template <char = 'x'> struct F; + +template <char> struct F { + template <typename U> + requires(false) F(U); + template <typename U> + requires(true) F(U); +}; + +F s(0); + +// CHECK-LABEL: Dumping <deduction guide for F>: +// CHECK: FunctionTemplateDecl +// CHECK: |-NonTypeTemplateParmDecl {{.*}} 'char' depth 0 index 0 +// CHECK: `-TemplateArgument expr +// CHECK: | |-inherited from NonTypeTemplateParm {{.*}} '' 'char' +// CHECK: | `-ConstantExpr {{.*}} 'char' +// CHECK: | |-value: Int 120 +// CHECK: | `-CharacterLiteral {{.*}} 'char' 120 +// CHECK: |-TemplateTypeParmDecl {{.*}} typename depth 0 index 1 U +// CHECK: |-ParenExpr {{.*}} 'bool' +// CHECK: | `-CXXBoolLiteralExpr {{.*}} 'bool' false +// CHECK: |-CXXDeductionGuideDecl {{.*}} implicit <deduction guide for F> 'auto (type-parameter-0-1) -> F<>' +// CHECK: | `-ParmVarDecl {{.*}} 'type-parameter-0-1' +// CHECK: `-CXXDeductionGuideDecl {{.*}} implicit <deduction guide for F> 'auto (int) -> F<'x'>' +// CHECK: |-TemplateArgument integral 120 +// CHECK: |-TemplateArgument type 'int' +// CHECK: | `-BuiltinType {{.*}} 'int' +// CHECK: `-ParmVarDecl {{.*}} 'int':'int' +// CHECK: FunctionProtoType {{.*}} 'auto (type-parameter-0-1) -> F<>' dependent trailing_return cdecl +// CHECK: |-InjectedClassNameType {{.*}} 'F<>' dependent +// CHECK: | `-CXXRecord {{.*}} 'F' +// CHECK: `-TemplateTypeParmType {{.*}} 'type-parameter-0-1' dependent depth 0 index 1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
