Author: Haojian Wu Date: 2020-08-10T09:11:55+02:00 New Revision: 626d0f5818b223f04904c510eaa682db7a41c2dd
URL: https://github.com/llvm/llvm-project/commit/626d0f5818b223f04904c510eaa682db7a41c2dd DIFF: https://github.com/llvm/llvm-project/commit/626d0f5818b223f04904c510eaa682db7a41c2dd.diff LOG: [Concepts] Dump template arguments for immediately declared constraint. The template arguments were dumped as part of the TemplateTypeParmDecl, which was incorrect. Differential Revision: https://reviews.llvm.org/D85282 Added: Modified: clang/include/clang/AST/ASTNodeTraverser.h clang/lib/AST/TextNodeDumper.cpp clang/test/AST/ast-dump-concepts.cpp Removed: ################################################################################ diff --git a/clang/include/clang/AST/ASTNodeTraverser.h b/clang/include/clang/AST/ASTNodeTraverser.h index 26656b7162b6..b0b1c152db05 100644 --- a/clang/include/clang/AST/ASTNodeTraverser.h +++ b/clang/include/clang/AST/ASTNodeTraverser.h @@ -543,9 +543,7 @@ class ASTNodeTraverser void VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D) { if (const auto *TC = D->getTypeConstraint()) - if (TC->hasExplicitTemplateArgs()) - for (const auto &ArgLoc : TC->getTemplateArgsAsWritten()->arguments()) - dumpTemplateArgumentLoc(ArgLoc); + Visit(TC->getImmediatelyDeclaredConstraint()); if (D->hasDefaultArgument()) Visit(D->getDefaultArgument(), SourceRange(), D->getDefaultArgStorage().getInheritedFrom(), @@ -574,6 +572,12 @@ class ASTNodeTraverser Visit(D->getConstraintExpr()); } + void VisitConceptSpecializationExpr(const ConceptSpecializationExpr *CSE) { + if (CSE->hasExplicitTemplateArgs()) + for (const auto &ArgLoc : CSE->getTemplateArgsAsWritten()->arguments()) + dumpTemplateArgumentLoc(ArgLoc); + } + void VisitUsingShadowDecl(const UsingShadowDecl *D) { if (auto *TD = dyn_cast<TypeDecl>(D->getUnderlyingDecl())) Visit(TD->getTypeForDecl()); diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp index 4aae63982542..47a7e431faf8 100644 --- a/clang/lib/AST/TextNodeDumper.cpp +++ b/clang/lib/AST/TextNodeDumper.cpp @@ -1999,7 +1999,6 @@ void TextNodeDumper::VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D) { dumpBareDeclRef(TC->getFoundDecl()); OS << ")"; } - AddChild([=] { Visit(TC->getImmediatelyDeclaredConstraint()); }); } else if (D->wasDeclaredWithTypename()) OS << " typename"; else diff --git a/clang/test/AST/ast-dump-concepts.cpp b/clang/test/AST/ast-dump-concepts.cpp index 630a953976fc..524ac0f65a06 100644 --- a/clang/test/AST/ast-dump-concepts.cpp +++ b/clang/test/AST/ast-dump-concepts.cpp @@ -15,8 +15,12 @@ concept binary_concept = true; template <typename T> struct Foo { // CHECK: TemplateTypeParmDecl {{.*}} referenced Concept {{.*}} 'binary_concept' - // CHECK-NEXT: |-ConceptSpecializationExpr {{.*}} <col:13, col:31> 'bool' Concept {{.*}} 'binary_concept' - // CHECK-NEXT: `-TemplateArgument {{.*}} type 'int' + // CHECK-NEXT: `-ConceptSpecializationExpr {{.*}} <col:13, col:31> 'bool' Concept {{.*}} 'binary_concept' + // CHECK-NEXT: |-TemplateArgument {{.*}} type 'R' + // CHECK-NEXT: | `-TemplateTypeParmType {{.*}} 'R' + // CHECK-NEXT: | `-TemplateTypeParm {{.*}} 'R' + // CHECK-NEXT: `-TemplateArgument {{.*}} type 'int' + // CHECK-NEXT: `-BuiltinType {{.*}} 'int' template <binary_concept<int> R> Foo(R); @@ -25,11 +29,11 @@ struct Foo { template <unary_concept R> Foo(R); - // CHECK: FunctionTemplateDecl {{.*}} <line:29:3, line:30:39> {{.*}} Foo<T> + // CHECK: FunctionTemplateDecl {{.*}} <line:[[@LINE+1]]:3, line:[[@LINE+2]]:39> {{.*}} Foo<T> template <typename R> Foo(R, int) requires unary_concept<R>; - // CHECK: FunctionTemplateDecl {{.*}} <line:33:3, line:35:3> {{.*}} Foo<T> + // CHECK: FunctionTemplateDecl {{.*}} <line:[[@LINE+1]]:3, line:[[@LINE+3]]:3> {{.*}} Foo<T> template <typename R> Foo(R, char) requires unary_concept<R> { } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
