Author: Haojian Wu Date: 2024-06-13T08:29:05+02:00 New Revision: 1dbd7bedc37fca1e7744dca202d0af427f399d68
URL: https://github.com/llvm/llvm-project/commit/1dbd7bedc37fca1e7744dca202d0af427f399d68 DIFF: https://github.com/llvm/llvm-project/commit/1dbd7bedc37fca1e7744dca202d0af427f399d68.diff LOG: [clang] Don't print extra space when dumping template names (#95213) Added: Modified: clang/lib/AST/TextNodeDumper.cpp clang/test/AST/ast-dump-ctad-alias.cpp clang/test/AST/ast-dump-template-decls.cpp clang/test/AST/ast-dump-using-template.cpp clang/test/SemaTemplate/deduction-guide.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp index 1076dcd40a694..bd1e630cd9047 100644 --- a/clang/lib/AST/TextNodeDumper.cpp +++ b/clang/lib/AST/TextNodeDumper.cpp @@ -1140,7 +1140,7 @@ void TextNodeDumper::dumpTemplateName(TemplateName TN, StringRef Label) { llvm::raw_svector_ostream SS(Str); TN.print(SS, PrintPolicy); } - OS << " '" << Str << "'"; + OS << "'" << Str << "'"; if (Context) { if (TemplateName CanonTN = Context->getCanonicalTemplateName(TN); diff --git a/clang/test/AST/ast-dump-ctad-alias.cpp b/clang/test/AST/ast-dump-ctad-alias.cpp index cd3b8c6821344..a4b6f06547443 100644 --- a/clang/test/AST/ast-dump-ctad-alias.cpp +++ b/clang/test/AST/ast-dump-ctad-alias.cpp @@ -36,11 +36,11 @@ Out2<double>::AInner t(1.0); // CHECK-NEXT: | | | `-TemplateTypeParmType {{.*}} 'type-parameter-1-0' dependent depth 1 index 0 // CHECK-NEXT: | | `-TypeTraitExpr {{.*}} 'bool' __is_deducible // CHECK-NEXT: | | |-DeducedTemplateSpecializationType {{.*}} 'Out2<double>::AInner' dependent -// CHECK-NEXT: | | | `-name: 'Out2<double>::AInner' +// CHECK-NEXT: | | | `-name: 'Out2<double>::AInner' // CHECK-NEXT: | | | `-TypeAliasTemplateDecl {{.+}} AInner{{$}} // CHECK-NEXT: | | `-ElaboratedType {{.*}} 'Inner<type-parameter-1-0>' sugar dependent // CHECK-NEXT: | | `-TemplateSpecializationType {{.*}} 'Inner<type-parameter-1-0>' dependent -// CHECK-NEXT: | | |-name: 'Inner':'Out<int>::Inner' qualified +// CHECK-NEXT: | | |-name: 'Inner':'Out<int>::Inner' qualified // CHECK-NEXT: | | | `-ClassTemplateDecl {{.+}} Inner{{$}} // CHECK-NEXT: | | `-TemplateArgument type 'type-parameter-1-0' // CHECK-NEXT: | | `-SubstTemplateTypeParmType {{.*}} 'type-parameter-1-0' diff --git a/clang/test/AST/ast-dump-template-decls.cpp b/clang/test/AST/ast-dump-template-decls.cpp index fea14abb3b2f4..f0a6204ce3cfa 100644 --- a/clang/test/AST/ast-dump-template-decls.cpp +++ b/clang/test/AST/ast-dump-template-decls.cpp @@ -117,7 +117,7 @@ using type2 = typename C<int>::type1<void>; // CHECK: TypeAliasDecl 0x{{[^ ]*}} <line:[[@LINE-1]]:1, col:42> col:7 type2 'typename C<int>::type1<void>':'void (int)' // CHECK-NEXT: ElaboratedType 0x{{[^ ]*}} 'typename C<int>::type1<void>' sugar // CHECK-NEXT: TemplateSpecializationType 0x{{[^ ]*}} 'type1<void>' sugar alias -// CHECK-NEXT: name: 'C<int>::type1':'PR55886::C<int>::type1' qualified +// CHECK-NEXT: name: 'C<int>::type1':'PR55886::C<int>::type1' qualified // CHECK-NEXT: NestedNameSpecifier TypeSpec 'C<int>':'PR55886::C<int>' // CHECK-NEXT: TypeAliasTemplateDecl {{.+}} type1 // CHECK-NEXT: TemplateArgument type 'void' @@ -153,7 +153,7 @@ template <typename... T> struct D { }; using t2 = D<float, char>::B<int, short>; // CHECK: TemplateSpecializationType 0x{{[^ ]*}} 'B<int, short>' sugar alias{{$}} -// CHECK-NEXT: name: 'D<float, char>::B':'PR56099::D<float, char>::B' qualified +// CHECK-NEXT: name: 'D<float, char>::B':'PR56099::D<float, char>::B' qualified // CHECK: FunctionProtoType 0x{{[^ ]*}} 'int (int (*)(float, int), int (*)(char, short))' cdecl // CHECK: FunctionProtoType 0x{{[^ ]*}} 'int (float, int)' cdecl // CHECK: SubstTemplateTypeParmType 0x{{[^ ]*}} 'float' sugar typename depth 0 index 0 ... T pack_index 1 @@ -175,7 +175,7 @@ template<class E1, class E2> class E {}; using test1 = D<E, int>; // CHECK: TypeAliasDecl 0x{{[^ ]*}} <line:{{[1-9]+}}:1, col:23> col:7 test1 'D<E, int>':'subst_default_argument::E<int, subst_default_argument::A<int>>' // CHECK: TemplateSpecializationType 0x{{[^ ]*}} 'A<int>' sugar -// CHECK-NEXT: |-name: 'A':'subst_default_argument::A' qualified +// CHECK-NEXT: |-name: 'A':'subst_default_argument::A' qualified // CHECK-NEXT: | `-ClassTemplateDecl {{.+}} A // CHECK-NEXT: |-TemplateArgument type 'int' // CHECK-NEXT: | `-SubstTemplateTypeParmType 0x{{[^ ]*}} 'int' sugar class depth 0 index 1 D2 diff --git a/clang/test/AST/ast-dump-using-template.cpp b/clang/test/AST/ast-dump-using-template.cpp index 22b9b76612add..75db5eb5a9d1c 100644 --- a/clang/test/AST/ast-dump-using-template.cpp +++ b/clang/test/AST/ast-dump-using-template.cpp @@ -21,7 +21,7 @@ using A = S<T>; // CHECK: TypeAliasDecl // CHECK-NEXT: `-ElaboratedType {{.*}} 'S<T>' sugar dependent // CHECK-NEXT: `-TemplateSpecializationType {{.*}} 'S<T>' dependent -// CHECK-NEXT: |-name: 'S':'ns::S' qualified +// CHECK-NEXT: |-name: 'S':'ns::S' qualified // CHECk-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S' // TemplateName in TemplateArgument. @@ -30,7 +30,7 @@ using B = X<S>; // CHECK: TypeAliasDecl // CHECK-NEXT: `-ElaboratedType {{.*}} 'X<S>' sugar // CHECK-NEXT: `-TemplateSpecializationType {{.*}} 'X<S>' sugar -// CHECK-NEXT: |-name: 'X' qualified +// CHECK-NEXT: |-name: 'X' qualified // CHECK-NEXT: | `-ClassTemplateDecl {{.+}} X // CHECK-NEXT: |-TemplateArgument template 'S':'ns::S' qualified // CHECK-NEXT: | |-UsingShadowDecl {{.*}} implicit ClassTemplate {{.*}} 'S' @@ -45,7 +45,7 @@ using C = decltype(DeducedTemplateSpecializationT); // CHECK-NEXT: |-DeclRefExpr {{.*}} // CHECK-NEXT: `-ElaboratedType {{.*}} 'S<int>' sugar // CHECK-NEXT: `-DeducedTemplateSpecializationType {{.*}} 'ns::S<int>' sugar -// CHECK-NEXT: |-name: 'S':'ns::S' qualified +// CHECK-NEXT: |-name: 'S':'ns::S' qualified // CHECK-NEXT: | |-UsingShadowDecl {{.+}} 'S' S2 DeducedTemplateSpecializationT2(123); @@ -54,5 +54,5 @@ using D = decltype(DeducedTemplateSpecializationT2); // CHECK-NEXT: |-DeclRefExpr {{.*}} // CHECK-NEXT: `-ElaboratedType {{.*}} 'S2<int>' sugar // CHECK-NEXT: `-DeducedTemplateSpecializationType {{.*}} 'S2<int>' sugar -// CHECK-NEXT: |-name: 'S2':'ns::S2' qualified +// CHECK-NEXT: |-name: 'S2':'ns::S2' qualified //CHECk-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S2' diff --git a/clang/test/SemaTemplate/deduction-guide.cpp b/clang/test/SemaTemplate/deduction-guide.cpp index 758ca14e4b1c3..171c5413feaa7 100644 --- a/clang/test/SemaTemplate/deduction-guide.cpp +++ b/clang/test/SemaTemplate/deduction-guide.cpp @@ -290,7 +290,7 @@ using AFoo = Foo<G<U>>; // CHECK-NEXT: | | `-IntegerLiteral {{.*}} // CHECK-NEXT: | `-TypeTraitExpr {{.*}} 'bool' __is_deducible // CHECK-NEXT: | |-DeducedTemplateSpecializationType {{.*}} 'AFoo' dependent -// CHECK-NEXT: | | `-name: 'AFoo' +// CHECK-NEXT: | | `-name: 'AFoo' // CHECK-NEXT: | | `-TypeAliasTemplateDecl {{.+}} AFoo // CHECK-NEXT: | `-TemplateSpecializationType {{.*}} 'Foo<G<type-parameter-0-0>>' dependent // CHECK: |-CXXDeductionGuideDecl {{.*}} implicit <deduction guide for AFoo> 'auto (G<type-parameter-0-0>) -> Foo<G<type-parameter-0-0>>' @@ -330,7 +330,7 @@ namespace TTP { // CHECK-NEXT: | `-CXXRecord {{.+}} 'B'{{$}} // CHECK-NEXT: `-ElaboratedType {{.+}} 'template-parameter-0-1<T>' sugar dependent{{$}} // CHECK-NEXT: `-TemplateSpecializationType {{.+}} 'template-parameter-0-1<T>' dependent{{$}} -// CHECK-NEXT: |-name: 'template-parameter-0-1' qualified +// CHECK-NEXT: |-name: 'template-parameter-0-1' qualified // CHECK-NEXT: | `-TemplateTemplateParmDecl {{.+}} depth 0 index 1 // CHECK-NEXT: `-TemplateArgument type 'T':'type-parameter-0-0'{{$}} // CHECK-NEXT: `-TemplateTypeParmType {{.+}} 'T' dependent depth 0 index 0{{$}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
