Skip to content

Commit f9ad1d1

Browse files
committed
Revert "Compress formatting of array type names (int [4] -> int[4])"
Looks like lldb has some issues with this - somehow it causes lldb to treat a "char[N]" type as an array of chars (prints them out individually) but a "char [N]" is printed as a string. (even though the DWARF doesn't have this string in it - it's something to do with the string lldb generates for itself using clang) This reverts commit 277623f.
1 parent 1062f98 commit f9ad1d1

File tree

164 files changed

+532
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+532
-528
lines changed

clang/lib/AST/TypePrinter.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ void TypePrinter::printMemberPointerAfter(const MemberPointerType *T,
503503
void TypePrinter::printConstantArrayBefore(const ConstantArrayType *T,
504504
raw_ostream &OS) {
505505
IncludeStrongLifetimeRAII Strong(Policy);
506+
SaveAndRestore<bool> NonEmptyPH(HasEmptyPlaceHolder, false);
506507
printBefore(T->getElementType(), OS);
507508
}
508509

@@ -525,6 +526,7 @@ void TypePrinter::printConstantArrayAfter(const ConstantArrayType *T,
525526
void TypePrinter::printIncompleteArrayBefore(const IncompleteArrayType *T,
526527
raw_ostream &OS) {
527528
IncludeStrongLifetimeRAII Strong(Policy);
529+
SaveAndRestore<bool> NonEmptyPH(HasEmptyPlaceHolder, false);
528530
printBefore(T->getElementType(), OS);
529531
}
530532

@@ -537,6 +539,7 @@ void TypePrinter::printIncompleteArrayAfter(const IncompleteArrayType *T,
537539
void TypePrinter::printVariableArrayBefore(const VariableArrayType *T,
538540
raw_ostream &OS) {
539541
IncludeStrongLifetimeRAII Strong(Policy);
542+
SaveAndRestore<bool> NonEmptyPH(HasEmptyPlaceHolder, false);
540543
printBefore(T->getElementType(), OS);
541544
}
542545

@@ -583,6 +586,7 @@ void TypePrinter::printDependentSizedArrayBefore(
583586
const DependentSizedArrayType *T,
584587
raw_ostream &OS) {
585588
IncludeStrongLifetimeRAII Strong(Policy);
589+
SaveAndRestore<bool> NonEmptyPH(HasEmptyPlaceHolder, false);
586590
printBefore(T->getElementType(), OS);
587591
}
588592

clang/test/ARCMT/cxx-checking.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
struct FlexibleArrayMember0 {
8282
int length;
83-
id array[]; // expected-error{{flexible array member 'array' of type '__strong id[]' with non-trivial destruction}}
83+
id array[]; // expected-error{{flexible array member 'array' of type '__strong id []' with non-trivial destruction}}
8484
};
8585

8686
struct FlexibleArrayMember1 {

clang/test/AST/ast-dump-APValue-arithmetic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ void Test() {
3636
// CHECK-NEXT: | |-value: ComplexFloat 3.141500e+00 + 4.200000e+01i
3737

3838
constexpr _Complex int ArrayOfComplexInt[10] = {ComplexInt, ComplexInt, ComplexInt, ComplexInt};
39-
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexInt 'const _Complex int[10]' constexpr cinit
39+
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexInt 'const _Complex int [10]' constexpr cinit
4040
// CHECK-NEXT: | |-value: Array size=10
4141
// CHECK-NEXT: | | |-elements: ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i
4242
// CHECK-NEXT: | | `-filler: 6 x ComplexInt 0 + 0i
4343

4444
constexpr _Complex float ArrayOfComplexFloat[10] = {ComplexFloat, ComplexFloat, ComplexInt, ComplexInt};
45-
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexFloat 'const _Complex float[10]' constexpr cinit
45+
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexFloat 'const _Complex float [10]' constexpr cinit
4646
// CHECK-NEXT: |-value: Array size=10
4747
// CHECK-NEXT: | |-elements: ComplexFloat 3.141500e+00 + 4.200000e+01i, ComplexFloat 3.141500e+00 + 4.200000e+01i, ComplexFloat 4.200000e+01 + 2.400000e+01i, ComplexFloat 4.200000e+01 + 2.400000e+01i
4848
// CHECK-NEXT: | `-filler: 6 x ComplexFloat 0.000000e+00 + 0.000000e+00i

clang/test/AST/ast-dump-APValue-array.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void Test() {
4343
constexpr float arr_f[3][5] = {
4444
{1, 2, 3, 4, 5},
4545
};
46-
// CHECK: | `-VarDecl {{.*}} <line:{{.*}}, line:{{.*}}> line:{{.*}} arr_f 'const float[3][5]' constexpr cinit
46+
// CHECK: | `-VarDecl {{.*}} <line:{{.*}}, line:{{.*}}> line:{{.*}} arr_f 'const float [3][5]' constexpr cinit
4747
// CHECK-NEXT: | |-value: Array size=3
4848
// CHECK-NEXT: | | |-element: Array size=5
4949
// CHECK-NEXT: | | | |-elements: Float 1.000000e+00, Float 2.000000e+00, Float 3.000000e+00, Float 4.000000e+00
@@ -52,7 +52,7 @@ void Test() {
5252
// CHECK-NEXT: | | `-filler: 5 x Float 0.000000e+00
5353

5454
constexpr S0 arr_s0[2] = {{1, 2}, {3, 4}};
55-
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s0 'const S0[2]' constexpr cinit
55+
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s0 'const S0 [2]' constexpr cinit
5656
// CHECK-NEXT: | |-value: Array size=2
5757
// CHECK-NEXT: | | |-element: Struct
5858
// CHECK-NEXT: | | | `-field: Array size=2
@@ -62,12 +62,12 @@ void Test() {
6262
// CHECK-NEXT: | | `-elements: Int 3, Int 4
6363

6464
constexpr U0 arr_u0[2] = {{.i = 42}, {.f = 3.1415f}};
65-
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_u0 'const U0[2]' constexpr cinit
65+
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_u0 'const U0 [2]' constexpr cinit
6666
// CHECK-NEXT: | |-value: Array size=2
6767
// CHECK-NEXT: | | `-elements: Union .i Int 42, Union .f Float 3.141500e+00
6868

6969
constexpr S1 arr_s1[2] = {};
70-
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s1 'const S1[2]' constexpr cinit
70+
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s1 'const S1 [2]' constexpr cinit
7171
// CHECK-NEXT: |-value: Array size=2
7272
// CHECK-NEXT: | |-element: Struct
7373
// CHECK-NEXT: | | |-field: Struct

clang/test/AST/ast-dump-array.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void testArrayInitExpr()
1313
int a[10];
1414
auto l = [a]{
1515
};
16-
// CHECK: |-ArrayInitLoopExpr 0x{{[^ ]*}} <col:15> 'int[10]'
16+
// CHECK: |-ArrayInitLoopExpr 0x{{[^ ]*}} <col:15> 'int [10]'
1717
// CHECK: | `-ArrayInitIndexExpr 0x{{[^ ]*}} <<invalid sloc>> 'unsigned long'
1818
}
1919

@@ -22,7 +22,7 @@ class array {
2222
T data[Size];
2323

2424
using array_T_size = T[Size];
25-
// CHECK: `-DependentSizedArrayType 0x{{[^ ]*}} 'T[Size]' dependent <col:25, col:30>
25+
// CHECK: `-DependentSizedArrayType 0x{{[^ ]*}} 'T [Size]' dependent <col:25, col:30>
2626
using const_array_T_size = const T[Size];
27-
// CHECK: `-DependentSizedArrayType 0x{{[^ ]*}} 'const T[Size]' dependent <col:37, col:42>
27+
// CHECK: `-DependentSizedArrayType 0x{{[^ ]*}} 'const T [Size]' dependent <col:37, col:42>
2828
};

clang/test/AST/ast-dump-color.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct Invalid {
3232
//CHECK: {{^}}[[GREEN:.\[0;1;32m]]TranslationUnitDecl[[RESET:.\[0m]][[Yellow:.\[0;33m]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]<invalid sloc>[[RESET]]> [[Yellow]]<invalid sloc>[[RESET]]{{$}}
3333
//CHECK: {{^}}[[Blue:.\[0;34m]]|-[[RESET]][[GREEN]]TypedefDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]<invalid sloc>[[RESET]]> [[Yellow]]<invalid sloc>[[RESET]] implicit[[CYAN:.\[0;1;36m]] __int128_t[[RESET]] [[Green:.\[0;32m]]'__int128'[[RESET]]{{$}}
3434
//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]TypedefDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]<invalid sloc>[[RESET]]> [[Yellow]]<invalid sloc>[[RESET]] implicit[[CYAN]] __uint128_t[[RESET]] [[Green]]'unsigned __int128'[[RESET]]{{$}}
35-
//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]TypedefDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]<invalid sloc>[[RESET]]> [[Yellow]]<invalid sloc>[[RESET]] implicit[[CYAN]] __builtin_va_list[[RESET]] [[Green]]'__va_list_tag[1]'[[RESET]]{{$}}
35+
//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]TypedefDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]<invalid sloc>[[RESET]]> [[Yellow]]<invalid sloc>[[RESET]] implicit[[CYAN]] __builtin_va_list[[RESET]] [[Green]]'__va_list_tag [1]'[[RESET]]{{$}}
3636
//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]VarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]{{.*}}ast-dump-color.cpp:6:1[[RESET]], [[Yellow]]col:5[[RESET]]> [[Yellow]]col:5[[RESET]][[CYAN]] Test[[RESET]] [[Green]]'int'[[RESET]]
3737
//CHECK: {{^}}[[Blue]]| |-[[RESET]][[BLUE:.\[0;1;34m]]UnusedAttr[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:25[[RESET]]> unused{{$}}
3838
//CHECK: {{^}}[[Blue]]| `-[[RESET]][[Blue]]FullComment[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]line:4:4[[RESET]], [[Yellow]]line:5:8[[RESET]]>{{$}}

clang/test/AST/ast-dump-expr-json.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4689,7 +4689,7 @@ void PrimaryExpressions(int a) {
46894689
// CHECK-NEXT: }
46904690
// CHECK-NEXT: },
46914691
// CHECK-NEXT: "type": {
4692-
// CHECK-NEXT: "qualType": "int[4]"
4692+
// CHECK-NEXT: "qualType": "int [4]"
46934693
// CHECK-NEXT: },
46944694
// CHECK-NEXT: "valueCategory": "lvalue",
46954695
// CHECK-NEXT: "inner": [
@@ -4709,7 +4709,7 @@ void PrimaryExpressions(int a) {
47094709
// CHECK-NEXT: }
47104710
// CHECK-NEXT: },
47114711
// CHECK-NEXT: "type": {
4712-
// CHECK-NEXT: "qualType": "int[4]"
4712+
// CHECK-NEXT: "qualType": "int [4]"
47134713
// CHECK-NEXT: },
47144714
// CHECK-NEXT: "valueCategory": "prvalue",
47154715
// CHECK-NEXT: "inner": [
@@ -5106,7 +5106,7 @@ void PrimaryExpressions(int a) {
51065106
// CHECK-NEXT: }
51075107
// CHECK-NEXT: },
51085108
// CHECK-NEXT: "type": {
5109-
// CHECK-NEXT: "qualType": "char[2]"
5109+
// CHECK-NEXT: "qualType": "char [2]"
51105110
// CHECK-NEXT: },
51115111
// CHECK-NEXT: "valueCategory": "lvalue",
51125112
// CHECK-NEXT: "value": "\"a\""
@@ -5151,7 +5151,7 @@ void PrimaryExpressions(int a) {
51515151
// CHECK-NEXT: }
51525152
// CHECK-NEXT: },
51535153
// CHECK-NEXT: "type": {
5154-
// CHECK-NEXT: "qualType": "int[2]"
5154+
// CHECK-NEXT: "qualType": "int [2]"
51555155
// CHECK-NEXT: },
51565156
// CHECK-NEXT: "valueCategory": "lvalue",
51575157
// CHECK-NEXT: "value": "L\"a\""
@@ -5196,7 +5196,7 @@ void PrimaryExpressions(int a) {
51965196
// CHECK-NEXT: }
51975197
// CHECK-NEXT: },
51985198
// CHECK-NEXT: "type": {
5199-
// CHECK-NEXT: "qualType": "char[2]"
5199+
// CHECK-NEXT: "qualType": "char [2]"
52005200
// CHECK-NEXT: },
52015201
// CHECK-NEXT: "valueCategory": "lvalue",
52025202
// CHECK-NEXT: "value": "u8\"a\""
@@ -5241,7 +5241,7 @@ void PrimaryExpressions(int a) {
52415241
// CHECK-NEXT: }
52425242
// CHECK-NEXT: },
52435243
// CHECK-NEXT: "type": {
5244-
// CHECK-NEXT: "qualType": "unsigned int[2]"
5244+
// CHECK-NEXT: "qualType": "unsigned int [2]"
52455245
// CHECK-NEXT: },
52465246
// CHECK-NEXT: "valueCategory": "lvalue",
52475247
// CHECK-NEXT: "value": "U\"a\""
@@ -5286,7 +5286,7 @@ void PrimaryExpressions(int a) {
52865286
// CHECK-NEXT: }
52875287
// CHECK-NEXT: },
52885288
// CHECK-NEXT: "type": {
5289-
// CHECK-NEXT: "qualType": "unsigned short[2]"
5289+
// CHECK-NEXT: "qualType": "unsigned short [2]"
52905290
// CHECK-NEXT: },
52915291
// CHECK-NEXT: "valueCategory": "lvalue",
52925292
// CHECK-NEXT: "value": "u\"a\""

clang/test/AST/ast-dump-expr-json.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,7 @@ void TestNonADLCall3() {
20032003
// CHECK-NEXT: }
20042004
// CHECK-NEXT: },
20052005
// CHECK-NEXT: "type": {
2006-
// CHECK-NEXT: "qualType": "int[2]"
2006+
// CHECK-NEXT: "qualType": "int [2]"
20072007
// CHECK-NEXT: },
20082008
// CHECK-NEXT: "valueCategory": "prvalue",
20092009
// CHECK-NEXT: "inner": [

clang/test/AST/ast-dump-expr-json.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void TestObjCBoolLiteral() {
181181
// CHECK-NEXT: }
182182
// CHECK-NEXT: },
183183
// CHECK-NEXT: "type": {
184-
// CHECK-NEXT: "qualType": "char[2]"
184+
// CHECK-NEXT: "qualType": "char [2]"
185185
// CHECK-NEXT: },
186186
// CHECK-NEXT: "valueCategory": "lvalue",
187187
// CHECK-NEXT: "encodedType": {
@@ -228,7 +228,7 @@ void TestObjCBoolLiteral() {
228228
// CHECK-NEXT: }
229229
// CHECK-NEXT: },
230230
// CHECK-NEXT: "type": {
231-
// CHECK-NEXT: "qualType": "char[3]"
231+
// CHECK-NEXT: "qualType": "char [3]"
232232
// CHECK-NEXT: },
233233
// CHECK-NEXT: "valueCategory": "lvalue",
234234
// CHECK-NEXT: "encodedType": {
@@ -3490,7 +3490,7 @@ void TestObjCBoolLiteral() {
34903490
// CHECK-NEXT: }
34913491
// CHECK-NEXT: },
34923492
// CHECK-NEXT: "type": {
3493-
// CHECK-NEXT: "qualType": "char[4]"
3493+
// CHECK-NEXT: "qualType": "char [4]"
34943494
// CHECK-NEXT: },
34953495
// CHECK-NEXT: "valueCategory": "lvalue",
34963496
// CHECK-NEXT: "value": "\"key\""
@@ -3698,7 +3698,7 @@ void TestObjCBoolLiteral() {
36983698
// CHECK-NEXT: }
36993699
// CHECK-NEXT: },
37003700
// CHECK-NEXT: "type": {
3701-
// CHECK-NEXT: "qualType": "char[4]"
3701+
// CHECK-NEXT: "qualType": "char [4]"
37023702
// CHECK-NEXT: },
37033703
// CHECK-NEXT: "valueCategory": "lvalue",
37043704
// CHECK-NEXT: "value": "\"key\""
@@ -4177,7 +4177,7 @@ void TestObjCBoolLiteral() {
41774177
// CHECK-NEXT: }
41784178
// CHECK-NEXT: },
41794179
// CHECK-NEXT: "type": {
4180-
// CHECK-NEXT: "qualType": "char[4]"
4180+
// CHECK-NEXT: "qualType": "char [4]"
41814181
// CHECK-NEXT: },
41824182
// CHECK-NEXT: "valueCategory": "lvalue",
41834183
// CHECK-NEXT: "value": "\"key\""
@@ -4420,7 +4420,7 @@ void TestObjCBoolLiteral() {
44204420
// CHECK-NEXT: }
44214421
// CHECK-NEXT: },
44224422
// CHECK-NEXT: "type": {
4423-
// CHECK-NEXT: "qualType": "char[4]"
4423+
// CHECK-NEXT: "qualType": "char [4]"
44244424
// CHECK-NEXT: },
44254425
// CHECK-NEXT: "valueCategory": "lvalue",
44264426
// CHECK-NEXT: "value": "\"key\""
@@ -4560,7 +4560,7 @@ void TestObjCBoolLiteral() {
45604560
// CHECK-NEXT: }
45614561
// CHECK-NEXT: },
45624562
// CHECK-NEXT: "type": {
4563-
// CHECK-NEXT: "qualType": "char[4]"
4563+
// CHECK-NEXT: "qualType": "char [4]"
45644564
// CHECK-NEXT: },
45654565
// CHECK-NEXT: "valueCategory": "lvalue",
45664566
// CHECK-NEXT: "value": "\"key\""
@@ -4745,7 +4745,7 @@ void TestObjCBoolLiteral() {
47454745
// CHECK-NEXT: }
47464746
// CHECK-NEXT: },
47474747
// CHECK-NEXT: "type": {
4748-
// CHECK-NEXT: "qualType": "char[4]"
4748+
// CHECK-NEXT: "qualType": "char [4]"
47494749
// CHECK-NEXT: },
47504750
// CHECK-NEXT: "valueCategory": "lvalue",
47514751
// CHECK-NEXT: "value": "\"key\""

clang/test/AST/ast-dump-expr.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ void PostfixOperators(int *a, struct S b, struct S *c) {
271271

272272
(int [4]){1, 2, 3, 4, };
273273
// CHECK: ImplicitCastExpr
274-
// CHECK-NEXT: CompoundLiteralExpr 0x{{[^ ]*}} <col:3, col:25> 'int[4]' lvalue
275-
// CHECK-NEXT: InitListExpr 0x{{[^ ]*}} <col:12, col:25> 'int[4]'
274+
// CHECK-NEXT: CompoundLiteralExpr 0x{{[^ ]*}} <col:3, col:25> 'int [4]' lvalue
275+
// CHECK-NEXT: InitListExpr 0x{{[^ ]*}} <col:12, col:25> 'int [4]'
276276
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:13> 'int' 1
277277
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:16> 'int' 2
278278
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:19> 'int' 3
@@ -300,23 +300,23 @@ void PrimaryExpressions(int a) {
300300

301301
"a";
302302
// ImplicitCastExpr
303-
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'char[2]' lvalue "a"
303+
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'char [2]' lvalue "a"
304304

305305
L"a";
306306
// ImplicitCastExpr
307-
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'int[2]' lvalue L"a"
307+
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'int [2]' lvalue L"a"
308308

309309
u8"a";
310310
// ImplicitCastExpr
311-
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'char[2]' lvalue u8"a"
311+
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'char [2]' lvalue u8"a"
312312

313313
U"a";
314314
// ImplicitCastExpr
315-
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'unsigned int[2]' lvalue U"a"
315+
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'unsigned int [2]' lvalue U"a"
316316

317317
u"a";
318318
// ImplicitCastExpr
319-
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'unsigned short[2]' lvalue u"a"
319+
// CHECK: StringLiteral 0x{{[^ ]*}} <col:3> 'unsigned short [2]' lvalue u"a"
320320

321321
1;
322322
// CHECK: IntegerLiteral 0x{{[^ ]*}} <line:[[@LINE-1]]:3> 'int' 1

clang/test/AST/ast-dump-expr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void UnaryExpressions(int *p) {
147147
// CHECK: CXXNewExpr 0x{{[^ ]*}} <line:[[@LINE-1]]:3, col:18> 'int *' array Function 0x{{[^ ]*}} 'operator new[]' 'void *(unsigned long)'
148148
// CHECK-NEXT: ImplicitCastExpr
149149
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:11> 'int' 2
150-
// CHECK-NEXT: InitListExpr 0x{{[^ ]*}} <col:13, col:18> 'int[2]'
150+
// CHECK-NEXT: InitListExpr 0x{{[^ ]*}} <col:13, col:18> 'int [2]'
151151
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:14> 'int' 1
152152
// CHECK-NEXT: IntegerLiteral 0x{{[^ ]*}} <col:17> 'int' 2
153153

clang/test/AST/ast-dump-file-line-json.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ int e;
137137
// CHECK-NEXT: "isImplicit": true,
138138
// CHECK-NEXT: "name": "__builtin_va_list",
139139
// CHECK-NEXT: "type": {
140-
// CHECK-NEXT: "qualType": "struct __va_list_tag[1]"
140+
// CHECK-NEXT: "qualType": "struct __va_list_tag [1]"
141141
// CHECK-NEXT: },
142142
// CHECK-NEXT: "inner": [
143143
// CHECK-NEXT: {
144144
// CHECK-NEXT: "id": "0x{{.*}}",
145145
// CHECK-NEXT: "kind": "ConstantArrayType",
146146
// CHECK-NEXT: "type": {
147-
// CHECK-NEXT: "qualType": "struct __va_list_tag[1]"
147+
// CHECK-NEXT: "qualType": "struct __va_list_tag [1]"
148148
// CHECK-NEXT: },
149149
// CHECK-NEXT: "size": 1,
150150
// CHECK-NEXT: "inner": [

0 commit comments

Comments
 (0)