2020-07-08 23:36:48 +08:00
|
|
|
// Test without serialization:
|
[clang] Rework how and when APValues are dumped
Currently APValues are dumped as a single string. This becomes quickly
completely unreadable since APValue is a tree-like structure. Even a simple
example is not pretty:
struct S { int arr[4]; float f; };
constexpr S s = { .arr = {1,2}, .f = 3.1415f };
// Struct fields: Array: Int: 1, Int: 2, 2 x Int: 0, Float: 3.141500e+00
With this patch this becomes:
-Struct
|-field: Array size=4
| |-elements: Int 1, Int 2
| `-filler: 2 x Int 0
`-field: Float 3.141500e+00
Additionally APValues are currently only dumped as part of visiting a
ConstantExpr. This patch also dump the value of the initializer of constexpr
variable declarations:
constexpr int foo(int a, int b) { return a + b - 42; }
constexpr int a = 1, b = 2;
constexpr int c = foo(a, b) > 0 ? foo(a, b) : foo(b, a);
// VarDecl 0x62100008aec8 <col:3, col:57> col:17 c 'const int' constexpr cinit
// |-value: Int -39
// `-ConditionalOperator 0x62100008b4d0 <col:21, col:57> 'int'
// <snip>
Do the above by moving the dump functions to TextNodeDumper which already has
the machinery to display trees. The cases APValue::LValue, APValue::MemberPointer
and APValue::AddrLabelDiff are left as they were before (unimplemented).
We try to display multiple elements on the same line if they are considered to
be "simple". This is to avoid wasting large amounts of vertical space in an
example like:
constexpr int arr[8] = {0,1,2,3,4,5,6,7};
// VarDecl 0x62100008bb78 <col:3, col:42> col:17 arr 'int const[8]' constexpr cinit
// |-value: Array size=8
// | |-elements: Int 0, Int 1, Int 2, Int 3
// | `-elements: Int 4, Int 5, Int 6, Int 7
Differential Revision: https://reviews.llvm.org/D83183
Reviewed By: aaron.ballman
2020-07-07 04:50:23 +08:00
|
|
|
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 \
|
|
|
|
// RUN: -ast-dump %s -ast-dump-filter Test \
|
|
|
|
// RUN: | FileCheck --strict-whitespace --match-full-lines %s
|
2020-07-08 23:36:48 +08:00
|
|
|
//
|
|
|
|
// Test with serialization:
|
|
|
|
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
|
|
|
|
// RUN: %clang_cc1 -x c++ -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 \
|
|
|
|
// RUN: -include-pch %t -ast-dump-all -ast-dump-filter Test /dev/null \
|
|
|
|
// RUN: | sed -e "s/ <undeserialized declarations>//" -e "s/ imported//" \
|
|
|
|
// RUN: | FileCheck --strict-whitespace --match-full-lines %s
|
[clang] Rework how and when APValues are dumped
Currently APValues are dumped as a single string. This becomes quickly
completely unreadable since APValue is a tree-like structure. Even a simple
example is not pretty:
struct S { int arr[4]; float f; };
constexpr S s = { .arr = {1,2}, .f = 3.1415f };
// Struct fields: Array: Int: 1, Int: 2, 2 x Int: 0, Float: 3.141500e+00
With this patch this becomes:
-Struct
|-field: Array size=4
| |-elements: Int 1, Int 2
| `-filler: 2 x Int 0
`-field: Float 3.141500e+00
Additionally APValues are currently only dumped as part of visiting a
ConstantExpr. This patch also dump the value of the initializer of constexpr
variable declarations:
constexpr int foo(int a, int b) { return a + b - 42; }
constexpr int a = 1, b = 2;
constexpr int c = foo(a, b) > 0 ? foo(a, b) : foo(b, a);
// VarDecl 0x62100008aec8 <col:3, col:57> col:17 c 'const int' constexpr cinit
// |-value: Int -39
// `-ConditionalOperator 0x62100008b4d0 <col:21, col:57> 'int'
// <snip>
Do the above by moving the dump functions to TextNodeDumper which already has
the machinery to display trees. The cases APValue::LValue, APValue::MemberPointer
and APValue::AddrLabelDiff are left as they were before (unimplemented).
We try to display multiple elements on the same line if they are considered to
be "simple". This is to avoid wasting large amounts of vertical space in an
example like:
constexpr int arr[8] = {0,1,2,3,4,5,6,7};
// VarDecl 0x62100008bb78 <col:3, col:42> col:17 arr 'int const[8]' constexpr cinit
// |-value: Array size=8
// | |-elements: Int 0, Int 1, Int 2, Int 3
// | `-elements: Int 4, Int 5, Int 6, Int 7
Differential Revision: https://reviews.llvm.org/D83183
Reviewed By: aaron.ballman
2020-07-07 04:50:23 +08:00
|
|
|
|
|
|
|
struct S0 {
|
|
|
|
int i = 0;
|
|
|
|
union {
|
|
|
|
int j = 0;
|
|
|
|
} u0;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S1 {
|
|
|
|
int i = 0;
|
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
int j = 0;
|
|
|
|
} s;
|
|
|
|
} u1;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S2 {
|
|
|
|
int i = 0;
|
|
|
|
union {
|
|
|
|
union {
|
|
|
|
int j = 0;
|
|
|
|
} u;
|
|
|
|
} u2;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S3 {
|
|
|
|
int i = 0;
|
|
|
|
union {
|
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
int j = 0;
|
|
|
|
} j;
|
|
|
|
} u;
|
|
|
|
} u3;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S4 : S0 {
|
|
|
|
int i = 1, j = 2, k = 3;
|
|
|
|
struct {
|
|
|
|
} s;
|
|
|
|
int a = 4, b = 5, c = 6;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S5 : S4 {
|
|
|
|
int arr0[8] = {1, 2, 3, 4};
|
|
|
|
int arr1[8] = {1, 2, 3, 4, 0, 0, 0, 0};
|
|
|
|
};
|
|
|
|
|
|
|
|
void Test() {
|
|
|
|
constexpr S0 s0{};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s0 'const S0' constexpr listinit
|
|
|
|
// CHECK-NEXT: | |-value: Struct
|
|
|
|
// CHECK-NEXT: | | `-fields: Int 0, Union .j Int 0
|
|
|
|
|
|
|
|
constexpr S1 s1{};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s1 'const S1' constexpr listinit
|
|
|
|
// CHECK-NEXT: | |-value: Struct
|
|
|
|
// CHECK-NEXT: | | |-field: Int 0
|
|
|
|
// CHECK-NEXT: | | `-field: Union .s
|
|
|
|
// CHECK-NEXT: | | `-Struct
|
|
|
|
// CHECK-NEXT: | | `-field: Int 0
|
|
|
|
|
|
|
|
constexpr S2 s2{};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s2 'const S2' constexpr listinit
|
|
|
|
// CHECK-NEXT: | |-value: Struct
|
|
|
|
// CHECK-NEXT: | | `-fields: Int 0, Union .u Union .j Int 0
|
|
|
|
|
|
|
|
constexpr S3 s3{};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s3 'const S3' constexpr listinit
|
|
|
|
// CHECK-NEXT: | |-value: Struct
|
|
|
|
// CHECK-NEXT: | | |-field: Int 0
|
|
|
|
// CHECK-NEXT: | | `-field: Union .u
|
|
|
|
// CHECK-NEXT: | | `-Union .j
|
|
|
|
// CHECK-NEXT: | | `-Struct
|
|
|
|
// CHECK-NEXT: | | `-field: Int 0
|
|
|
|
|
|
|
|
constexpr S4 s4{};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s4 'const S4' constexpr listinit
|
|
|
|
// CHECK-NEXT: | |-value: Struct
|
|
|
|
// CHECK-NEXT: | | |-base: Struct
|
|
|
|
// CHECK-NEXT: | | | `-fields: Int 0, Union .j Int 0
|
|
|
|
// CHECK-NEXT: | | |-fields: Int 1, Int 2, Int 3
|
|
|
|
// CHECK-NEXT: | | |-field: Struct
|
|
|
|
// CHECK-NEXT: | | `-fields: Int 4, Int 5, Int 6
|
|
|
|
|
|
|
|
constexpr S5 s5{};
|
|
|
|
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s5 'const S5' constexpr listinit
|
|
|
|
// CHECK-NEXT: |-value: Struct
|
|
|
|
// CHECK-NEXT: | |-base: Struct
|
|
|
|
// CHECK-NEXT: | | |-base: Struct
|
|
|
|
// CHECK-NEXT: | | | `-fields: Int 0, Union .j Int 0
|
|
|
|
// CHECK-NEXT: | | |-fields: Int 1, Int 2, Int 3
|
|
|
|
// CHECK-NEXT: | | |-field: Struct
|
|
|
|
// CHECK-NEXT: | | `-fields: Int 4, Int 5, Int 6
|
|
|
|
// CHECK-NEXT: | |-field: Array size=8
|
|
|
|
// CHECK-NEXT: | | |-elements: Int 1, Int 2, Int 3, Int 4
|
|
|
|
// CHECK-NEXT: | | `-filler: 4 x Int 0
|
|
|
|
// CHECK-NEXT: | `-field: Array size=8
|
|
|
|
// CHECK-NEXT: | |-elements: Int 1, Int 2, Int 3, Int 4
|
|
|
|
// CHECK-NEXT: | `-elements: Int 0, Int 0, Int 0, Int 0
|
|
|
|
}
|