[clang] [clang][AST] Dump saved APValue of all `VarDecl`s (PR #239672)

Timm Baeder via cfe-commits cfe-commits at lists.llvm.org
Fri Nov 6 21:21:17 PST 2026


https://github.com/tbaederr updated https://github.com/llvm/llvm-project/pull/239672

>From 9642a0811244da45395f1acbb868510bc198a651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder at redhat.com>
Date: Fri, 6 Nov 2026 17:39:42 +0100
Subject: [PATCH] [clang][AST] Dump saved APValue of all `VarDecl`s

---
 clang/lib/AST/TextNodeDumper.cpp               | 12 ++++++------
 clang/test/APINotes/namespaces.cpp             |  4 ++++
 clang/test/AST/ast-dump-decl.cpp               | 18 ++++++++++--------
 clang/test/AST/ast-dump-lookups.cpp            |  3 +++
 clang/test/AST/ast-dump-template-decls.cpp     |  3 +++
 clang/test/AST/float16.cpp                     |  9 ++++++++-
 clang/test/AST/new-unknown-type.cpp            |  1 +
 clang/test/AST/pr47636.cpp                     |  2 ++
 .../ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp |  1 +
 .../dcl.decl/dcl.init/dcl.init.ref/p4-ast.cpp  |  1 +
 clang/test/Interpreter/sanity.c                |  1 +
 clang/test/Misc/pragma-attribute-cxx.cpp       |  2 ++
 .../test/SemaOpenACC/declare-construct-ast.cpp |  4 ++++
 .../test/SemaOpenACC/routine-construct-ast.cpp |  3 ++-
 .../test/SemaOpenACC/update-construct-ast.cpp  |  1 +
 15 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp
index 24af510ece2ad9..a98a2b72634e11 100644
--- a/clang/lib/AST/TextNodeDumper.cpp
+++ b/clang/lib/AST/TextNodeDumper.cpp
@@ -2651,13 +2651,13 @@ void TextNodeDumper::VisitVarDecl(const VarDecl *D) {
 
   if (D->hasInit()) {
     const Expr *E = D->getInit();
-    // Only dump the value of constexpr VarDecls for now.
+    // Only evaluate the value of constexpr VarDecls.
     if (E && !E->isValueDependent() && D->isConstexpr() &&
-        !D->getType()->isDependentType()) {
-      const APValue *Value = D->evaluateValue();
-      if (Value)
-        AddChild("value", [=] { Visit(*Value, E->getType()); });
-    }
+        !D->getType()->isDependentType())
+      D->evaluateValue();
+
+    if (const APValue *V = D->getEvaluatedValue())
+      AddChild("value", [=] { Visit(*V, E->getType()); });
   }
 
   if (!D->getDescribedVarTemplate()) {
diff --git a/clang/test/APINotes/namespaces.cpp b/clang/test/APINotes/namespaces.cpp
index df108b02e63011..c11a954486e1af 100644
--- a/clang/test/APINotes/namespaces.cpp
+++ b/clang/test/APINotes/namespaces.cpp
@@ -27,6 +27,7 @@
 
 // CHECK-GLOBAL-IN-NAMESPACE: Dumping Namespace1::varInNamespace:
 // CHECK-GLOBAL-IN-NAMESPACE-NEXT: VarDecl {{.+}} imported in Namespaces varInNamespace 'int' static cinit
+// CHECK-GLOBAL-IN-NAMESPACE-NEXT: value: Int 1
 // CHECK-GLOBAL-IN-NAMESPACE-NEXT: IntegerLiteral {{.+}} 'int' 1
 // CHECK-GLOBAL-IN-NAMESPACE-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "swiftVarInNamespace"
 
@@ -40,11 +41,13 @@
 
 // CHECK-GLOBAL-IN-NESTED-NAMESPACE: Dumping Namespace1::Nested1::varInNestedNamespace:
 // CHECK-GLOBAL-IN-NESTED-NAMESPACE-NEXT: VarDecl {{.+}} imported in Namespaces varInNestedNamespace 'int' static cinit
+// CHECK-GLOBAL-IN-NESTED-NAMESPACE-NEXT: value: Int 1
 // CHECK-GLOBAL-IN-NESTED-NAMESPACE-NEXT: IntegerLiteral {{.+}} 'int' 1
 // CHECK-GLOBAL-IN-NESTED-NAMESPACE-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "swiftVarInNestedNamespace"
 
 // CHECK-ANOTHER-GLOBAL-IN-NESTED-NAMESPACE: Dumping Namespace1::Nested2::varInNestedNamespace:
 // CHECK-ANOTHER-GLOBAL-IN-NESTED-NAMESPACE-NEXT: VarDecl {{.+}} imported in Namespaces varInNestedNamespace 'int' static cinit
+// CHECK-ANOTHER-GLOBAL-IN-NESTED-NAMESPACE-NEXT: value: Int 2
 // CHECK-ANOTHER-GLOBAL-IN-NESTED-NAMESPACE-NEXT: IntegerLiteral {{.+}} 'int' 2
 // CHECK-ANOTHER-GLOBAL-IN-NESTED-NAMESPACE-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "swiftAnotherVarInNestedNamespace"
 
@@ -71,6 +74,7 @@
 
 // CHECK-GLOBAL-IN-INLINE-NAMESPACE: Dumping varInInlineNamespace:
 // CHECK-GLOBAL-IN-INLINE-NAMESPACE-NEXT: VarDecl {{.+}} imported in Namespaces varInInlineNamespace 'int' static cinit
+// CHECK-GLOBAL-IN-INLINE-NAMESPACE-NEXT: value: Int 3
 // CHECK-GLOBAL-IN-INLINE-NAMESPACE-NEXT: IntegerLiteral {{.+}} 'int' 3
 // CHECK-GLOBAL-IN-INLINE-NAMESPACE-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "swiftVarInInlineNamespace"
 
diff --git a/clang/test/AST/ast-dump-decl.cpp b/clang/test/AST/ast-dump-decl.cpp
index ef5e0a55e431ea..c87fc62f265465 100644
--- a/clang/test/AST/ast-dump-decl.cpp
+++ b/clang/test/AST/ast-dump-decl.cpp
@@ -721,27 +721,29 @@ namespace testCanonicalTemplate {
   // CHECK-NEXT: |-TemplateTypeParmDecl 0x{{.+}} <col:16, col:25> col:25 referenced typename depth 0 index 0 T{{$}}
   // CHECK-NEXT: |-VarDecl 0x{{.+}} <col:28, col:43> col:43 TestVarTemplate 'const T' static{{$}}
   // CHECK-NEXT: |-VarTemplateSpecializationDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <line:[[@LINE-12]]:3, line:[[@LINE-11]]:34> col:14 referenced TestVarTemplate 'const int' implicit_instantiation cinit instantiated_from 0x{{.+}}{{$}}
-  // CHECK-NEXT: | |-NestedNameSpecifier TypeSpec 'S'{{$}}
+  // CHECK-NEXT: | |-NestedNameSpecifier TypeSpec 'S' external-linkage{{$}}
+  // CHECK-NEXT: | |-value: Int 0{{$}}
   // CHECK-NEXT: | |-TemplateArgument type 'int'{{$}}
   // CHECK-NEXT: | | `-BuiltinType 0x{{.+}} 'int'{{$}}
   // CHECK-NEXT: | `-InitListExpr 0x{{.+}} <col:32, col:34> 'int' explicit{{$}}
-  // CHECK-NEXT: `-VarTemplateSpecializationDecl 0x{{.+}} <line:[[@LINE-19]]:7, col:43> col:43 referenced TestVarTemplate 'const int' implicit_instantiation static instantiated_from 0x{{.+}}{{$}}
+  // CHECK-NEXT: `-VarTemplateSpecializationDecl 0x{{.+}} <line:[[@LINE-20]]:7, col:43> col:43 referenced TestVarTemplate 'const int' implicit_instantiation static instantiated_from 0x{{.+}}{{$}}
   // CHECK-NEXT:   `-TemplateArgument type 'int'{{$}}
 
-  // CHECK:     VarTemplateSpecializationDecl 0x{{.+}} <{{.+}}:[[@LINE-22]]:7, col:43> col:43 referenced TestVarTemplate 'const int' implicit_instantiation static instantiated_from 0x{{.+}}{{$}}
+  // CHECK:     VarTemplateSpecializationDecl 0x{{.+}} <{{.+}}:[[@LINE-23]]:7, col:43> col:43 referenced TestVarTemplate 'const int' implicit_instantiation static instantiated_from 0x{{.+}}{{$}}
   // CHECK-NEXT:`-TemplateArgument type 'int'{{$}}
   // CHECK-NEXT:  `-BuiltinType 0x{{.+}} 'int'{{$}}
 
-  // CHECK:      VarTemplateDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <{{.+}}:[[@LINE-24]]:3, line:[[@LINE-23]]:34> col:14 TestVarTemplate external-linkage{{$}}
-  // CHECK-NEXT: |-TemplateTypeParmDecl 0x{{.+}} <line:[[@LINE-25]]:12, col:21> col:21 referenced typename depth 0 index 0 T{{$}}
-  // CHECK-NEXT: |-VarDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <line:[[@LINE-25]]:3, col:34> col:14 TestVarTemplate 'const T' cinit{{$}}
+  // CHECK:      VarTemplateDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <{{.+}}:[[@LINE-25]]:3, line:[[@LINE-24]]:34> col:14 TestVarTemplate external-linkage{{$}}
+  // CHECK-NEXT: |-TemplateTypeParmDecl 0x{{.+}} <line:[[@LINE-26]]:12, col:21> col:21 referenced typename depth 0 index 0 T{{$}}
+  // CHECK-NEXT: |-VarDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <line:[[@LINE-26]]:3, col:34> col:14 TestVarTemplate 'const T' cinit{{$}}
   // CHECK-NEXT: | |-NestedNameSpecifier TypeSpec 'S'{{$}}
   // CHECK-NEXT: | `-InitListExpr 0x{{.+}} <col:32, col:34> 'void' explicit{{$}}
   // CHECK-NEXT: |-VarTemplateSpecialization 0x{{.+}} 'TestVarTemplate' 'const int'{{$}}
   // CHECK-NEXT: `-VarTemplateSpecialization 0x{{.+}} 'TestVarTemplate' 'const int'{{$}}
 
-  // CHECK:      VarTemplateSpecializationDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <{{.+}}:[[@LINE-32]]:3, line:[[@LINE-31]]:34> col:14 referenced TestVarTemplate 'const int' implicit_instantiation cinit instantiated_from 0x{{.+}}{{$}}
-  // CHECK-NEXT: |-NestedNameSpecifier TypeSpec 'S'{{$}}
+  // CHECK:      VarTemplateSpecializationDecl 0x{{.+}} parent 0x{{.+}} prev 0x{{.+}} <{{.+}}:[[@LINE-33]]:3, line:[[@LINE-32]]:34> col:14 referenced TestVarTemplate 'const int' implicit_instantiation cinit instantiated_from 0x{{.+}}{{$}}
+  // CHECK-NEXT: |-NestedNameSpecifier TypeSpec 'S' external-linkage{{$}}
+  // CHECK-NEXT: |-value: Int 0
   // CHECK-NEXT: |-TemplateArgument type 'int'{{$}}
   // CHECK-NEXT: | `-BuiltinType 0x{{.+}} 'int'{{$}}
   // CHECK-NEXT: `-InitListExpr 0x{{.+}} <col:32, col:34> 'int' explicit{{$}}
diff --git a/clang/test/AST/ast-dump-lookups.cpp b/clang/test/AST/ast-dump-lookups.cpp
index 58f31ac4a3a6df..704665751f5b23 100644
--- a/clang/test/AST/ast-dump-lookups.cpp
+++ b/clang/test/AST/ast-dump-lookups.cpp
@@ -17,6 +17,7 @@ namespace Test {
 // PRAGMA-NEXT: | `-BuiltinType {{.*}} 'int'
 // PRAGMA-NEXT: |-VarDecl [[EXTERN_A:0x[^ ]*]] {{.*}} a 'int' extern
 // PRAGMA-NEXT: `-VarDecl {{.*}} prev [[EXTERN_A]] {{.*}} a 'int' cinit
+// PRAGMA-NEXT:   |-value: Int 0
 // PRAGMA-NEXT:   `-IntegerLiteral {{.*}} 'int' 0
 #endif
 
@@ -28,6 +29,7 @@ namespace Test { }
 // DECLS-NEXT: | `-BuiltinType {{.*}} 'int'
 // DECLS-NEXT: |-VarDecl [[EXTERN_A:0x[^ ]*]] {{.*}} a 'int' extern
 // DECLS-NEXT: `-VarDecl {{.*}} prev [[EXTERN_A]] {{.*}} a 'int' cinit
+// DECLS-NEXT:   |-value: Int 0
 // DECLS-NEXT:   `-IntegerLiteral {{.*}} 'int' 0
 //
 // DECLS: Dumping Test:
@@ -47,6 +49,7 @@ namespace Test { }
 // DECLS-LOOKUPS-NEXT:   `-Var [[A:[^ ]*]] 'a' 'int'
 // DECLS-LOOKUPS-NEXT:     |-VarDecl [[EXTERN_A:0x[^ ]*]] {{.*}} a 'int' extern
 // DECLS-LOOKUPS-NEXT:     `-VarDecl [[A]] prev [[EXTERN_A]] {{.*}} a 'int' cinit
+// DECLS-LOOKUPS-NEXT:       |-value: Int 0
 // DECLS-LOOKUPS-NEXT:       `-IntegerLiteral {{.*}} 'int' 0
 //
 // DECLS-LOOKUPS: Dumping Test:
diff --git a/clang/test/AST/ast-dump-template-decls.cpp b/clang/test/AST/ast-dump-template-decls.cpp
index 19e0ae6d29ae75..6e67b9d944e29e 100644
--- a/clang/test/AST/ast-dump-template-decls.cpp
+++ b/clang/test/AST/ast-dump-template-decls.cpp
@@ -188,6 +188,7 @@ int unTempl<int>;
 template<>
 float unTempl<float> = 1;
 // CHECK:      VarTemplateSpecializationDecl 0x{{[^ ]*}} <line:{{[0-9]+}}:1, line:{{[0-9]+}}:24> col:7 unTempl 'float'
+// CHECK-NEXT: |-value: Float 1.000000e+00
 // CHECK-NEXT: |-TemplateArgument type 'float'
 // CHECK-NEXT: | `-BuiltinType 0x{{[^ ]*}} 'float'
 // CHECK-NEXT: `-ImplicitCastExpr 0x{{[^ ]*}} <col:24> 'float' <IntegralToFloating>
@@ -213,6 +214,7 @@ int binTempl<int, U>;
 template<class U>
 float binTempl<float, U> = 1;
 // CHECK:      VarTemplatePartialSpecializationDecl 0x{{[^ ]*}} <line:{{[0-9]+}}:1, line:{{[0-9]+}}:28> col:7 binTempl 'float'
+// CHECK-NEXT: |-value: Float 1.000000e+00
 // CHECK-NEXT: |-TemplateTypeParmDecl 0x{{[^ ]*}} <line:{{[0-9]+}}:10, col:16> col:16 referenced class depth 0 index 0 U
 // CHECK-NEXT: |-TemplateArgument type 'float'
 // CHECK-NEXT: | `-BuiltinType 0x{{[^ ]*}} 'float'
@@ -232,6 +234,7 @@ int binTempl<int, int>;
 template<>
 float binTempl<float, float> = 1;
 // CHECK:      VarTemplateSpecializationDecl 0x{{[^ ]*}} <line:{{[0-9]+}}:1, line:{{[0-9]+}}:32> col:7 binTempl 'float'
+// CHECK-NEXT: |-value: Float 1.000000e+00
 // CHECK-NEXT: |-TemplateArgument type 'float'
 // CHECK-NEXT: | `-BuiltinType 0x{{[^ ]*}} 'float'
 // CHECK-NEXT: |-TemplateArgument type 'float'
diff --git a/clang/test/AST/float16.cpp b/clang/test/AST/float16.cpp
index a9e1144cf0958f..d974c4ae9fe3a9 100644
--- a/clang/test/AST/float16.cpp
+++ b/clang/test/AST/float16.cpp
@@ -1,6 +1,6 @@
 // Tests without serialization:
 // RUN: %clang_cc1 -std=c++11 -ast-dump -triple aarch64-linux-gnu %s \
-// RUN: | FileCheck %s --strict-whitespace
+// RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace
 //
 // RUN: %clang_cc1 -std=c++11 -ast-dump -triple aarch64-linux-gnu -fnative-half-type %s \
 // RUN: | FileCheck %s --check-prefix=CHECK-NATIVE --strict-whitespace
@@ -32,9 +32,12 @@ namespace {
 //CHECK:      |-NamespaceDecl
 //CHECK-NEXT: | |-VarDecl {{.*}} f1n '_Float16'
 //CHECK-NEXT: | |-VarDecl {{.*}} f2n '_Float16' cinit
+//CHECK-NEXT: | | |-value: Float 3.300000e+01
 //CHECK-NEXT: | | `-FloatingLiteral {{.*}} '_Float16' 3.300000e+01
 //CHECK-NEXT: | |-VarDecl {{.*}} arr1n '_Float16[10]'
 //CHECK-NEXT: | |-VarDecl {{.*}} arr2n '_Float16[3]' cinit
+//CHECK-NOPCH-NEXT: | | |-value: Array size=3
+//CHECK-NOPCH-NEXT: | | | `-elements: Float 1.200195e+00, Float 3.000000e+00, Float 3.000000e+04
 //CHECK-NEXT: | | `-InitListExpr {{.*}} '_Float16[3]'
 //CHECK-NEXT: | |   |-ImplicitCastExpr {{.*}} '_Float16' <FloatingCast>
 //CHECK-NEXT: | |   | `-FloatingLiteral {{.*}} 'double' 1.200000e+00
@@ -53,10 +56,13 @@ _Float16 func1f(_Float16 arg);
 
 //CHECK:      |-VarDecl {{.*}} f1f '_Float16'
 //CHECK-NEXT: |-VarDecl {{.*}} f2f '_Float16' cinit
+//CHECK-NEXT: | |-value: Float 3.240625e+01
 //CHECK-NEXT: | `-ImplicitCastExpr {{.*}} '_Float16' <FloatingCast>
 //CHECK-NEXT: |   `-FloatingLiteral {{.*}} 'double' 3.240000e+01
 //CHECK-NEXT: |-VarDecl {{.*}} arr1f '_Float16[10]'
 //CHECK-NEXT: |-VarDecl {{.*}} arr2f '_Float16[3]' cinit
+//CHECK-NOPCH-NEXT: | |-value: Array size=3
+//CHECK-NOPCH-NEXT: | | `-elements: Float -1.200195e+00, Float -3.000000e+00, Float -3.000000e+04
 //CHECK-NEXT: | `-InitListExpr {{.*}} '_Float16[3]'
 //CHECK-NEXT: |   |-ImplicitCastExpr {{.*}} '_Float16' <FloatingCast>
 //CHECK-NEXT: |   | `-UnaryOperator {{.*}} 'double' prefix '-'
@@ -82,6 +88,7 @@ auto C = -1.0f16 + B;
 // float, and consequently also _Float16 promotions to float:
 
 //CHECK:      -VarDecl {{.*}} used B '__fp16' cinit
+//CHECK-NEXT: | |-value: Float -9.997559e-02
 //CHECK-NEXT: | `-ImplicitCastExpr {{.*}} '__fp16' <FloatingCast>
 //CHECK-NEXT: |   `-UnaryOperator {{.*}} 'double' prefix '-'
 //CHECK-NEXT: |     `-FloatingLiteral {{.*}} 'double' 1.000000e-01
diff --git a/clang/test/AST/new-unknown-type.cpp b/clang/test/AST/new-unknown-type.cpp
index 55e15cc80d1e30..d47d83a03406de 100644
--- a/clang/test/AST/new-unknown-type.cpp
+++ b/clang/test/AST/new-unknown-type.cpp
@@ -28,4 +28,5 @@ namespace b {
 
 static b::Bar bar;
 // CHECK:      `-VarDecl 0x{{[^ ]*}} <line:29:1, col:15> col:15 bar 'b::Bar' static callinit
+// CHECK-NEXT:   |-value: Struct
 // CHECK-NEXT:   `-CXXConstructExpr 0x{{[^ ]*}} <col:15> 'b::Bar' 'void () noexcept'
diff --git a/clang/test/AST/pr47636.cpp b/clang/test/AST/pr47636.cpp
index 28c2b7802fe6b0..db481f42dbcd8e 100644
--- a/clang/test/AST/pr47636.cpp
+++ b/clang/test/AST/pr47636.cpp
@@ -2,6 +2,7 @@
 
 int(&&intu_rvref)[] {1,2,3,4};
 // CHECK: VarDecl 0x[[GLOB_ADDR:[0-9a-f]+]] {{.*}} intu_rvref 'int (&&)[4]' listinit
+// CHECK-NEXT: value: LValue Base=MaterializeTemporaryExpr
 // CHECK-NEXT: ExprWithCleanups {{.*}} 'int[4]' xvalue
 // CHECK-NEXT: MaterializeTemporaryExpr {{.*}} 'int[4]' xvalue extended by Var 0x[[GLOB_ADDR]] 'intu_rvref' 'int (&&)[4]'
 // CHECK-NEXT: InitListExpr {{.*}} 'int[4]'
@@ -10,6 +11,7 @@ int(&&intu_rvref)[] {1,2,3,4};
 void static_const() {
   static const int(&&intu_rvref)[] {1,2,3,4};
   // CHECK: VarDecl 0x[[STATIC_ADDR:[0-9a-f]+]] {{.*}} intu_rvref 'const int (&&)[4]' static listinit
+  // CHECK-NEXT: value: LValue Base=MaterializeTemporaryExpr
   // CHECK-NEXT: ExprWithCleanups {{.*}} 'const int[4]' xvalue
   // CHECK-NEXT: MaterializeTemporaryExpr {{.*}} 'const int[4]' xvalue extended by Var 0x[[STATIC_ADDR]] 'intu_rvref' 'const int (&&)[4]'
   // CHECK-NEXT: InitListExpr {{.*}} 'const int[4]'
diff --git a/clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp b/clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp
index fc66b78b85508d..33487c60a036f3 100644
--- a/clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp
+++ b/clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp
@@ -263,6 +263,7 @@ void skep5(int unused1, K<5> k, int unused2, int p, int unused3) {
 // CHECK-NEXT: | |   `-CompoundStmt {{.*}}
 // CHECK-NEXT: | |     |-DeclStmt {{.*}}
 // CHECK-NEXT: | |     | `-VarDecl {{.*}} used slv 'int' static cinit
+// CHECK-NEXT: | |     |   |-value: Int 0
 // CHECK-NEXT: | |     |   `-IntegerLiteral {{.*}} 'int' 0
 // CHECK-NEXT: | |     |-DeclStmt {{.*}}
 // CHECK-NEXT: | |     | `-VarDecl {{.*}} used lv 'int' cinit
diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p4-ast.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p4-ast.cpp
index 32c4ddd921bba1..2c54f0b020a094 100644
--- a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p4-ast.cpp
+++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p4-ast.cpp
@@ -3,6 +3,7 @@
 void f() noexcept;
 
 // CHECK: VarDecl {{.*}} ref 'void (&)()' cinit
+// CHECK-NEXT: value: LValue Base=FunctionDecl
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'void ()' lvalue <NoOp>
 // CHECK-NEXT: DeclRefExpr {{.*}} 'void () noexcept' lvalue Function {{.*}} 'f' 'void () noexcept'
 void (&ref)() = f;
diff --git a/clang/test/Interpreter/sanity.c b/clang/test/Interpreter/sanity.c
index 8893a12f9216a5..f15835d89d5b17 100644
--- a/clang/test/Interpreter/sanity.c
+++ b/clang/test/Interpreter/sanity.c
@@ -6,6 +6,7 @@
 int TestVar = 12;
 // CHECK: Dumping TestVar:
 // CHECK-NEXT: VarDecl [[var_ptr:0x[0-9a-f]+]] <{{.*}} TestVar 'int' cinit
+// CHECK-NEXT:   value: Int 12
 // CHECK-NEXT:   IntegerLiteral {{.*}} 'int' 12
 
 void TestFunc() { ++TestVar; }
diff --git a/clang/test/Misc/pragma-attribute-cxx.cpp b/clang/test/Misc/pragma-attribute-cxx.cpp
index f48c25c824f686..571d69edc56f62 100644
--- a/clang/test/Misc/pragma-attribute-cxx.cpp
+++ b/clang/test/Misc/pragma-attribute-cxx.cpp
@@ -86,6 +86,7 @@ void testLambdaMethod() {
 
 int testCI1 = 1;
 // CHECK-LABEL: VarDecl{{.*}} testCI1
+// CHECK-NEXT: value: Int 1
 // CHECK-NEXT: IntegerLiteral
 // CHECK-NEXT: ConstInitAttr
 
@@ -93,6 +94,7 @@ int testCI1 = 1;
 
 int testNoCI = 0;
 // CHECK-LABEL: VarDecl{{.*}} testNoCI
+// CHECK-NEXT: value: Int 0
 // CHECK-NEXT: IntegerLiteral
 // CHECK-NOT: ConstInitAttr
 
diff --git a/clang/test/SemaOpenACC/declare-construct-ast.cpp b/clang/test/SemaOpenACC/declare-construct-ast.cpp
index e39a436f5624bb..0ebab72b028889 100644
--- a/clang/test/SemaOpenACC/declare-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/declare-construct-ast.cpp
@@ -74,9 +74,11 @@ struct Struct {
   // CHECK: CXXRecordDecl{{.*}} implicit struct Struct
   static const int StaticMem = 5;
   // CHECK-NEXT: VarDecl {{.*}} StaticMem 'const int' static cinit
+  // CHECK-NEXT: value: Int 5
   // CHECK-NEXT: IntegerLiteral{{.*}}'int' 5
   static const int StaticMem2 = 5;
   // CHECK-NEXT: VarDecl {{.*}} StaticMem2 'const int' static cinit
+  // CHECK-NEXT: value: Int 5
   // CHECK-NEXT: IntegerLiteral{{.*}}'int' 5
   static const int StaticMemArray[5];
   // CHECK-NEXT: VarDecl {{.*}} StaticMemArray 'const int[5]' static
@@ -236,9 +238,11 @@ struct DependentStruct {
 // CHECK-NEXT: CXXRecordDecl{{.*}} struct DependentStruct
 
 // CHECK-NEXT: VarDecl{{.*}} StaticMem 'const int' 
+// CHECK-NEXT: value: Int 5
 // CHECK-NEXT: IntegerLiteral{{.*}}'int' 5
 
 // CHECK-NEXT: VarDecl{{.*}} StaticMem2 'const int' 
+// CHECK-NEXT: value: Int 5
 // CHECK-NEXT: IntegerLiteral{{.*}}'int' 5
 //
 // CHECK-NEXT: VarDecl{{.*}} StaticMemArray 'const int[5]'
diff --git a/clang/test/SemaOpenACC/routine-construct-ast.cpp b/clang/test/SemaOpenACC/routine-construct-ast.cpp
index dfdcc321b94ddf..7c23e0ea90b871 100644
--- a/clang/test/SemaOpenACC/routine-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/routine-construct-ast.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -fopenacc -ast-dump | FileCheck %s
+// RUN: %clang_cc1 %s -fopenacc -ast-dump | FileCheck %s --check-prefixes=CHECK,CHECK-NOPCH
 
 // Test this with PCH.
 // RUN: %clang_cc1 %s -fopenacc -emit-pch -o %t %s
@@ -57,6 +57,7 @@ auto Lambda2 = [](){};
 #pragma acc routine worker nohost bind("asdf")
 auto Lambda3 = [](auto a){ return a;};
 // CHECK: VarDecl{{.*}} Lambda3 '(lambda at
+// CHECK-NOPCH-NEXT: value: Struct
 // CHECK-NEXT: LambdaExpr
 // CHECK-NEXT: CXXRecordDecl
 // CHECK: FunctionTemplateDecl{{.*}} operator()
diff --git a/clang/test/SemaOpenACC/update-construct-ast.cpp b/clang/test/SemaOpenACC/update-construct-ast.cpp
index de7f4da589eddf..9945a12a873b4f 100644
--- a/clang/test/SemaOpenACC/update-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/update-construct-ast.cpp
@@ -316,6 +316,7 @@ void TemplFunc(T t) {
 
   // CHECK-NEXT: DeclStmt 
   // CHECK-NEXT: VarDecl
+  // CHECK-NEXT: value: Int 0
   // CHECK-NEXT: ImplicitCastExpr
   // CHECK-NEXT: IntegerLiteral
   // CHECK-NEXT: VarDecl



More information about the cfe-commits mailing list