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
|
|
|
|
|
|
|
|
union U0 {
|
|
|
|
|
int i = 42;
|
|
|
|
|
float f;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
union U1 {
|
|
|
|
|
union Uinner {
|
|
|
|
|
int i;
|
|
|
|
|
float f = 3.1415f;
|
|
|
|
|
} uinner;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
union U2 {
|
|
|
|
|
union Uinner {
|
|
|
|
|
double d;
|
|
|
|
|
int arr[2] = {1, 2};
|
|
|
|
|
} uinner;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
union U3 {
|
|
|
|
|
union Uinner {
|
|
|
|
|
double d = 3.1415;
|
|
|
|
|
int arr[2];
|
|
|
|
|
} uinner;
|
|
|
|
|
float f;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void Test() {
|
|
|
|
|
constexpr U0 u0{};
|
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u0 'const U0' constexpr listinit
|
|
|
|
|
// CHECK-NEXT: | |-value: Union .i Int 42
|
|
|
|
|
|
|
|
|
|
constexpr U1 u1{};
|
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u1 'const U1' constexpr listinit
|
|
|
|
|
// CHECK-NEXT: | |-value: Union .uinner Union .f Float 3.141500e+00
|
|
|
|
|
|
|
|
|
|
constexpr U2 u2{};
|
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u2 'const U2' constexpr listinit
|
|
|
|
|
// CHECK-NEXT: | |-value: Union .uinner
|
|
|
|
|
// CHECK-NEXT: | | `-Union .arr
|
|
|
|
|
// CHECK-NEXT: | | `-Array size=2
|
|
|
|
|
// CHECK-NEXT: | | `-elements: Int 1, Int 2
|
|
|
|
|
|
|
|
|
|
constexpr U3 u3a = {.f = 3.1415};
|
|
|
|
|
// CHECK: | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u3a 'const U3' constexpr cinit
|
|
|
|
|
// CHECK-NEXT: | |-value: Union .f Float 3.141500e+00
|
|
|
|
|
|
|
|
|
|
constexpr U3 u3b = {.uinner = {}};
|
|
|
|
|
// CHECK: `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u3b 'const U3' constexpr cinit
|
|
|
|
|
// CHECK-NEXT: |-value: Union .uinner Union .d Float 3.141500e+00
|
|
|
|
|
}
|