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 arr[2];
|
|
|
|
};
|
|
|
|
union U0 {
|
|
|
|
int i;
|
|
|
|
float f;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct S1 {
|
|
|
|
S0 s0 = {1, 2};
|
|
|
|
U0 u0 = {.i = 42};
|
|
|
|
};
|
|
|
|
|
|
|
|
void Test() {
|
|
|
|
constexpr int __attribute__((vector_size(sizeof(int) * 5))) arr_v5i[5] = {
|
|
|
|
{1, 2, 3, 4, 5},
|
|
|
|
{1, 2, 3, 4},
|
|
|
|
};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <line:{{.*}}, line:{{.*}}> line:{{.*}} arr_v5i '__attribute__((__vector_size__(5 * sizeof(int)))) int const[5]' constexpr cinit
|
|
|
|
// CHECK-NEXT: | |-value: Array size=5
|
|
|
|
// CHECK-NEXT: | | |-element: Vector length=5
|
|
|
|
// CHECK-NEXT: | | | |-elements: Int 1, Int 2, Int 3, Int 4
|
|
|
|
// CHECK-NEXT: | | | `-element: Int 5
|
|
|
|
// CHECK-NEXT: | | |-element: Vector length=5
|
|
|
|
// CHECK-NEXT: | | | |-elements: Int 1, Int 2, Int 3, Int 4
|
|
|
|
// CHECK-NEXT: | | | `-element: Int 0
|
|
|
|
// CHECK-NEXT: | | `-filler: 3 x Vector length=5
|
|
|
|
// CHECK-NEXT: | | |-elements: Int 0, Int 0, Int 0, Int 0
|
|
|
|
// CHECK-NEXT: | | `-element: Int 0
|
|
|
|
|
|
|
|
constexpr float arr_f[3][5] = {
|
|
|
|
{1, 2, 3, 4, 5},
|
|
|
|
};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <line:{{.*}}, line:{{.*}}> line:{{.*}} arr_f 'float const[3][5]' constexpr cinit
|
|
|
|
// CHECK-NEXT: | |-value: Array size=3
|
|
|
|
// CHECK-NEXT: | | |-element: Array size=5
|
|
|
|
// CHECK-NEXT: | | | |-elements: Float 1.000000e+00, Float 2.000000e+00, Float 3.000000e+00, Float 4.000000e+00
|
|
|
|
// CHECK-NEXT: | | | `-element: Float 5.000000e+00
|
|
|
|
// CHECK-NEXT: | | `-filler: 2 x Array size=5
|
|
|
|
// CHECK-NEXT: | | `-filler: 5 x Float 0.000000e+00
|
|
|
|
|
|
|
|
constexpr S0 arr_s0[2] = {{1, 2}, {3, 4}};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s0 'S0 const[2]' constexpr cinit
|
|
|
|
// CHECK-NEXT: | |-value: Array size=2
|
|
|
|
// CHECK-NEXT: | | |-element: Struct
|
|
|
|
// CHECK-NEXT: | | | `-field: Array size=2
|
|
|
|
// CHECK-NEXT: | | | `-elements: Int 1, Int 2
|
|
|
|
// CHECK-NEXT: | | `-element: Struct
|
|
|
|
// CHECK-NEXT: | | `-field: Array size=2
|
|
|
|
// CHECK-NEXT: | | `-elements: Int 3, Int 4
|
|
|
|
|
|
|
|
constexpr U0 arr_u0[2] = {{.i = 42}, {.f = 3.1415f}};
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_u0 'U0 const[2]' constexpr cinit
|
|
|
|
// CHECK-NEXT: | |-value: Array size=2
|
|
|
|
// CHECK-NEXT: | | `-elements: Union .i Int 42, Union .f Float 3.141500e+00
|
|
|
|
|
|
|
|
constexpr S1 arr_s1[2] = {};
|
|
|
|
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s1 'S1 const[2]' constexpr cinit
|
|
|
|
// CHECK-NEXT: |-value: Array size=2
|
|
|
|
// CHECK-NEXT: | |-element: Struct
|
|
|
|
// CHECK-NEXT: | | |-field: Struct
|
|
|
|
// CHECK-NEXT: | | | `-field: Array size=2
|
|
|
|
// CHECK-NEXT: | | | `-elements: Int 1, Int 2
|
|
|
|
// CHECK-NEXT: | | `-field: Union .i Int 42
|
|
|
|
// CHECK-NEXT: | `-element: Struct
|
|
|
|
// CHECK-NEXT: | |-field: Struct
|
|
|
|
// CHECK-NEXT: | | `-field: Array size=2
|
|
|
|
// CHECK-NEXT: | | `-elements: Int 1, Int 2
|
|
|
|
// CHECK-NEXT: | `-field: Union .i Int 42
|
|
|
|
}
|