Skip to content

Commit 1dbd7be

Browse files
hokeinhokein
authored
[clang] Don't print extra space when dumping template names (#95213)
1 parent 092dbfa commit 1dbd7be

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎clang/lib/AST/TextNodeDumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ void TextNodeDumper::dumpTemplateName(TemplateName TN, StringRef Label) {
11401140
llvm::raw_svector_ostream SS(Str);
11411141
TN.print(SS, PrintPolicy);
11421142
}
1143-
OS << " '" << Str << "'";
1143+
OS << "'" << Str << "'";
11441144

11451145
if (Context) {
11461146
if (TemplateName CanonTN = Context->getCanonicalTemplateName(TN);

‎clang/test/AST/ast-dump-ctad-alias.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Out2<double>::AInner t(1.0);
3636
// CHECK-NEXT: | | | `-TemplateTypeParmType {{.*}} 'type-parameter-1-0' dependent depth 1 index 0
3737
// CHECK-NEXT: | | `-TypeTraitExpr {{.*}} 'bool' __is_deducible
3838
// CHECK-NEXT: | | |-DeducedTemplateSpecializationType {{.*}} 'Out2<double>::AInner' dependent
39-
// CHECK-NEXT: | | | `-name: 'Out2<double>::AInner'
39+
// CHECK-NEXT: | | | `-name: 'Out2<double>::AInner'
4040
// CHECK-NEXT: | | | `-TypeAliasTemplateDecl {{.+}} AInner{{$}}
4141
// CHECK-NEXT: | | `-ElaboratedType {{.*}} 'Inner<type-parameter-1-0>' sugar dependent
4242
// CHECK-NEXT: | | `-TemplateSpecializationType {{.*}} 'Inner<type-parameter-1-0>' dependent
43-
// CHECK-NEXT: | | |-name: 'Inner':'Out<int>::Inner' qualified
43+
// CHECK-NEXT: | | |-name: 'Inner':'Out<int>::Inner' qualified
4444
// CHECK-NEXT: | | | `-ClassTemplateDecl {{.+}} Inner{{$}}
4545
// CHECK-NEXT: | | `-TemplateArgument type 'type-parameter-1-0'
4646
// CHECK-NEXT: | | `-SubstTemplateTypeParmType {{.*}} 'type-parameter-1-0'

‎clang/test/AST/ast-dump-template-decls.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ using type2 = typename C<int>::type1<void>;
117117
// CHECK: TypeAliasDecl 0x{{[^ ]*}} <line:[[@LINE-1]]:1, col:42> col:7 type2 'typename C<int>::type1<void>':'void (int)'
118118
// CHECK-NEXT: ElaboratedType 0x{{[^ ]*}} 'typename C<int>::type1<void>' sugar
119119
// CHECK-NEXT: TemplateSpecializationType 0x{{[^ ]*}} 'type1<void>' sugar alias
120-
// CHECK-NEXT: name: 'C<int>::type1':'PR55886::C<int>::type1' qualified
120+
// CHECK-NEXT: name: 'C<int>::type1':'PR55886::C<int>::type1' qualified
121121
// CHECK-NEXT: NestedNameSpecifier TypeSpec 'C<int>':'PR55886::C<int>'
122122
// CHECK-NEXT: TypeAliasTemplateDecl {{.+}} type1
123123
// CHECK-NEXT: TemplateArgument type 'void'
@@ -153,7 +153,7 @@ template <typename... T> struct D {
153153
};
154154
using t2 = D<float, char>::B<int, short>;
155155
// CHECK: TemplateSpecializationType 0x{{[^ ]*}} 'B<int, short>' sugar alias{{$}}
156-
// CHECK-NEXT: name: 'D<float, char>::B':'PR56099::D<float, char>::B' qualified
156+
// CHECK-NEXT: name: 'D<float, char>::B':'PR56099::D<float, char>::B' qualified
157157
// CHECK: FunctionProtoType 0x{{[^ ]*}} 'int (int (*)(float, int), int (*)(char, short))' cdecl
158158
// CHECK: FunctionProtoType 0x{{[^ ]*}} 'int (float, int)' cdecl
159159
// 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 {};
175175
using test1 = D<E, int>;
176176
// 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>>'
177177
// CHECK: TemplateSpecializationType 0x{{[^ ]*}} 'A<int>' sugar
178-
// CHECK-NEXT: |-name: 'A':'subst_default_argument::A' qualified
178+
// CHECK-NEXT: |-name: 'A':'subst_default_argument::A' qualified
179179
// CHECK-NEXT: | `-ClassTemplateDecl {{.+}} A
180180
// CHECK-NEXT: |-TemplateArgument type 'int'
181181
// CHECK-NEXT: | `-SubstTemplateTypeParmType 0x{{[^ ]*}} 'int' sugar class depth 0 index 1 D2

‎clang/test/AST/ast-dump-using-template.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using A = S<T>;
2121
// CHECK: TypeAliasDecl
2222
// CHECK-NEXT: `-ElaboratedType {{.*}} 'S<T>' sugar dependent
2323
// CHECK-NEXT: `-TemplateSpecializationType {{.*}} 'S<T>' dependent
24-
// CHECK-NEXT: |-name: 'S':'ns::S' qualified
24+
// CHECK-NEXT: |-name: 'S':'ns::S' qualified
2525
// CHECk-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S'
2626

2727
// TemplateName in TemplateArgument.
@@ -30,7 +30,7 @@ using B = X<S>;
3030
// CHECK: TypeAliasDecl
3131
// CHECK-NEXT: `-ElaboratedType {{.*}} 'X<S>' sugar
3232
// CHECK-NEXT: `-TemplateSpecializationType {{.*}} 'X<S>' sugar
33-
// CHECK-NEXT: |-name: 'X' qualified
33+
// CHECK-NEXT: |-name: 'X' qualified
3434
// CHECK-NEXT: | `-ClassTemplateDecl {{.+}} X
3535
// CHECK-NEXT: |-TemplateArgument template 'S':'ns::S' qualified
3636
// CHECK-NEXT: | |-UsingShadowDecl {{.*}} implicit ClassTemplate {{.*}} 'S'
@@ -45,7 +45,7 @@ using C = decltype(DeducedTemplateSpecializationT);
4545
// CHECK-NEXT: |-DeclRefExpr {{.*}}
4646
// CHECK-NEXT: `-ElaboratedType {{.*}} 'S<int>' sugar
4747
// CHECK-NEXT: `-DeducedTemplateSpecializationType {{.*}} 'ns::S<int>' sugar
48-
// CHECK-NEXT: |-name: 'S':'ns::S' qualified
48+
// CHECK-NEXT: |-name: 'S':'ns::S' qualified
4949
// CHECK-NEXT: | |-UsingShadowDecl {{.+}} 'S'
5050

5151
S2 DeducedTemplateSpecializationT2(123);
@@ -54,5 +54,5 @@ using D = decltype(DeducedTemplateSpecializationT2);
5454
// CHECK-NEXT: |-DeclRefExpr {{.*}}
5555
// CHECK-NEXT: `-ElaboratedType {{.*}} 'S2<int>' sugar
5656
// CHECK-NEXT: `-DeducedTemplateSpecializationType {{.*}} 'S2<int>' sugar
57-
// CHECK-NEXT: |-name: 'S2':'ns::S2' qualified
57+
// CHECK-NEXT: |-name: 'S2':'ns::S2' qualified
5858
//CHECk-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S2'

‎clang/test/SemaTemplate/deduction-guide.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ using AFoo = Foo<G<U>>;
290290
// CHECK-NEXT: | | `-IntegerLiteral {{.*}}
291291
// CHECK-NEXT: | `-TypeTraitExpr {{.*}} 'bool' __is_deducible
292292
// CHECK-NEXT: | |-DeducedTemplateSpecializationType {{.*}} 'AFoo' dependent
293-
// CHECK-NEXT: | | `-name: 'AFoo'
293+
// CHECK-NEXT: | | `-name: 'AFoo'
294294
// CHECK-NEXT: | | `-TypeAliasTemplateDecl {{.+}} AFoo
295295
// CHECK-NEXT: | `-TemplateSpecializationType {{.*}} 'Foo<G<type-parameter-0-0>>' dependent
296296
// 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 {
330330
// CHECK-NEXT: | `-CXXRecord {{.+}} 'B'{{$}}
331331
// CHECK-NEXT: `-ElaboratedType {{.+}} 'template-parameter-0-1<T>' sugar dependent{{$}}
332332
// CHECK-NEXT: `-TemplateSpecializationType {{.+}} 'template-parameter-0-1<T>' dependent{{$}}
333-
// CHECK-NEXT: |-name: 'template-parameter-0-1' qualified
333+
// CHECK-NEXT: |-name: 'template-parameter-0-1' qualified
334334
// CHECK-NEXT: | `-TemplateTemplateParmDecl {{.+}} depth 0 index 1
335335
// CHECK-NEXT: `-TemplateArgument type 'T':'type-parameter-0-0'{{$}}
336336
// CHECK-NEXT: `-TemplateTypeParmType {{.+}} 'T' dependent depth 0 index 0{{$}}

0 commit comments

Comments
 (0)