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

Timm Baeder via cfe-commits cfe-commits at lists.llvm.org
Wed Nov 11 04:01:23 PST 2026


Timm =?utf-8?q?Bäder?= <tbaeder at redhat.com>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/239672 at github.com>


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

>From ad7d5db939de020e9c7aa41f27bbd8f02c34c25d 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 1/2] [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

>From 4500733b5c23e2d45d5670c890d116f0726b24b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder at redhat.com>
Date: Sat, 7 Nov 2026 06:47:18 +0100
Subject: [PATCH 2/2] Does this break anything?

---
 clang/lib/AST/TextNodeDumper.cpp              | 10 +--
 .../AST/HLSL/ast-dump-APValue-matrix.hlsl     | 40 +++++-----
 .../test/AST/ast-dump-APValue-addrlabeldiff.c |  5 +-
 .../test/AST/ast-dump-APValue-anon-union.cpp  | 14 ++--
 .../test/AST/ast-dump-APValue-arithmetic.cpp  | 18 ++---
 clang/test/AST/ast-dump-APValue-array.cpp     | 74 +++++++++----------
 clang/test/AST/ast-dump-APValue-lvalue.cpp    | 22 +++---
 .../test/AST/ast-dump-APValue-reflection.cpp  |  6 +-
 clang/test/AST/ast-dump-APValue-struct.cpp    | 70 +++++++++---------
 clang/test/AST/ast-dump-APValue-union.cpp     | 18 ++---
 clang/test/AST/ast-dump-APValue-vector.cpp    | 30 ++++----
 .../SemaOpenACC/declare-construct-ast.cpp     | 10 +--
 .../SemaOpenACC/routine-construct-ast.cpp     |  6 +-
 13 files changed, 159 insertions(+), 164 deletions(-)

diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp
index a98a2b72634e11..f4d98b8b04d2e1 100644
--- a/clang/lib/AST/TextNodeDumper.cpp
+++ b/clang/lib/AST/TextNodeDumper.cpp
@@ -2649,15 +2649,9 @@ void TextNodeDumper::VisitVarDecl(const VarDecl *D) {
     dumpPointer(Instance);
   }
 
-  if (D->hasInit()) {
-    const Expr *E = D->getInit();
-    // Only evaluate the value of constexpr VarDecls.
-    if (E && !E->isValueDependent() && D->isConstexpr() &&
-        !D->getType()->isDependentType())
-      D->evaluateValue();
-
+  if (const Expr *Init = D->getInit()) {
     if (const APValue *V = D->getEvaluatedValue())
-      AddChild("value", [=] { Visit(*V, E->getType()); });
+      AddChild("value", [=] { Visit(*V, Init->getType()); });
   }
 
   if (!D->getDescribedVarTemplate()) {
diff --git a/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl b/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
index 98428225ebb3de..3b7bacba8bdd42 100644
--- a/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
+++ b/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x \
 // RUN:            -fnative-half-type -fnative-int16-type \
 // RUN:            -ast-dump %s -ast-dump-filter Test \
-// RUN: | FileCheck --strict-whitespace %s
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x \
@@ -16,41 +16,41 @@
 export void Test() {
   constexpr int2x2 mat2x2 = {1, 2, 3, 4};
   // CHECK: VarDecl {{.*}} mat2x2 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 2x2
-  // CHECK-NEXT: | `-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT: |-value: Matrix 2x2
+  // CHECK-NOPCH-NEXT: | `-elements: Int 1, Int 2, Int 3, Int 4
 
   constexpr float3x2 mat3x2 = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f};
   // CHECK: VarDecl {{.*}} mat3x2 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 3x2
-  // CHECK-NEXT: | |-elements: Float 1.000000e+00, Float 2.000000e+00, Float 3.000000e+00, Float 4.000000e+00
-  // CHECK-NEXT: | `-elements: Float 5.000000e+00, Float 6.000000e+00
+  // CHECK-NOPCH-NEXT: |-value: Matrix 3x2
+  // CHECK-NOPCH-NEXT: | |-elements: Float 1.000000e+00, Float 2.000000e+00, Float 3.000000e+00, Float 4.000000e+00
+  // CHECK-NOPCH-NEXT: | `-elements: Float 5.000000e+00, Float 6.000000e+00
 
   constexpr int16_t3x2 i16mat3x2 = {-1, 2, -3, 4, -5, 6};
   // CHECK: VarDecl {{.*}} i16mat3x2 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 3x2
-  // CHECK-NEXT: | |-elements: Int -1, Int 2, Int -3, Int 4
-  // CHECK-NEXT: | `-elements: Int -5, Int 6
+  // CHECK-NOPCH-NEXT: |-value: Matrix 3x2
+  // CHECK-NOPCH-NEXT: | |-elements: Int -1, Int 2, Int -3, Int 4
+  // CHECK-NOPCH-NEXT: | `-elements: Int -5, Int 6
 
   constexpr int64_t4x1 i64mat4x1 = {100, -200, 300, -400};
   // CHECK: VarDecl {{.*}} i64mat4x1 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 4x1
-  // CHECK-NEXT: | `-elements: Int 100, Int -200, Int 300, Int -400
+  // CHECK-NOPCH-NEXT: |-value: Matrix 4x1
+  // CHECK-NOPCH-NEXT: | `-elements: Int 100, Int -200, Int 300, Int -400
 
   constexpr half2x3 hmat2x3 = {1.5h, -2.5h, 3.5h, -4.5h, 5.5h, -6.5h};
   // CHECK: VarDecl {{.*}} hmat2x3 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 2x3
-  // CHECK-NEXT: | |-elements: Float 1.500000e+00, Float -2.500000e+00, Float 3.500000e+00, Float -4.500000e+00
-  // CHECK-NEXT: | `-elements: Float 5.500000e+00, Float -6.500000e+00
+  // CHECK-NOPCH-NEXT: |-value: Matrix 2x3
+  // CHECK-NOPCH-NEXT: | |-elements: Float 1.500000e+00, Float -2.500000e+00, Float 3.500000e+00, Float -4.500000e+00
+  // CHECK-NOPCH-NEXT: | `-elements: Float 5.500000e+00, Float -6.500000e+00
 
   constexpr double1x4 dmat1x4 = {0.5l, -1.25l, 2.75l, -3.125l};
   // CHECK: VarDecl {{.*}} dmat1x4 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 1x4
-  // CHECK-NEXT: | `-elements: Float 5.000000e-01, Float -1.250000e+00, Float 2.750000e+00, Float -3.125000e+00
+  // CHECK-NOPCH-NEXT: |-value: Matrix 1x4
+  // CHECK-NOPCH-NEXT: | `-elements: Float 5.000000e-01, Float -1.250000e+00, Float 2.750000e+00, Float -3.125000e+00
 
   constexpr bool3x3 bmat3x3 = {true, false, true, false, true, false, true, false, true};
   // CHECK: VarDecl {{.*}} bmat3x3 {{.*}} constexpr cinit
-  // CHECK-NEXT: |-value: Matrix 3x3
-  // CHECK-NEXT: | |-elements: Int 1, Int 0, Int 1, Int 0
-  // CHECK-NEXT: | |-elements: Int 1, Int 0, Int 1, Int 0
-  // CHECK-NEXT: | `-element: Int 1
+  // CHECK-NOPCH-NEXT: |-value: Matrix 3x3
+  // CHECK-NOPCH-NEXT: | |-elements: Int 1, Int 0, Int 1, Int 0
+  // CHECK-NOPCH-NEXT: | |-elements: Int 1, Int 0, Int 1, Int 0
+  // CHECK-NOPCH-NEXT: | `-element: Int 1
 }
diff --git a/clang/test/AST/ast-dump-APValue-addrlabeldiff.c b/clang/test/AST/ast-dump-APValue-addrlabeldiff.c
index 612c1832571238..bb44f7b19363b2 100644
--- a/clang/test/AST/ast-dump-APValue-addrlabeldiff.c
+++ b/clang/test/AST/ast-dump-APValue-addrlabeldiff.c
@@ -1,6 +1,6 @@
 // Test without serialization:
 // RUN: %clang_cc1 -std=c23 -ast-dump %s -ast-dump-filter Test -triple=i686 \
-// RUN: | FileCheck --strict-whitespace --match-full-lines %s
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=c23 -emit-pch -o %t %s
@@ -10,7 +10,8 @@
 // RUN: | FileCheck --strict-whitespace --match-full-lines %s
 
 
-// CHECK:  |   |-value: AddrLabelDiff &&l2 - &&l1
+// CHECK:  | `-VarDecl {{.*}} ar {{.*}} constexpr cinit
+// CHECK-NOPCH-NEXT:  |   |-value: AddrLabelDiff &&l2 - &&l1
 int Test(void) {
   constexpr __INTPTR_TYPE__ ar = &&l2 - &&l1;
 l1:
diff --git a/clang/test/AST/ast-dump-APValue-anon-union.cpp b/clang/test/AST/ast-dump-APValue-anon-union.cpp
index ffe14ed7322deb..6aa41dff1405fe 100644
--- a/clang/test/AST/ast-dump-APValue-anon-union.cpp
+++ b/clang/test/AST/ast-dump-APValue-anon-union.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -31,22 +31,22 @@ union U1 {
 void Test() {
   constexpr S0 s0{};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} s0 'const S0' constexpr listinit
-  // CHECK-NEXT:  |   |-value: Struct
-  // CHECK-NEXT:  |   | `-field: Union .i Int 42
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-NEXT:  |   | `-field: Union .i Int 42
 
   constexpr U0 u0a{};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u0a 'const U0' constexpr listinit
-  // CHECK-NEXT:  |   |-value: Union .U0::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
+  // CHECK-NOPCH-NEXT:  |   |-value: Union .U0::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
 
   constexpr U0 u0b{3.1415f};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u0b 'const U0' constexpr listinit
-  // CHECK-NEXT:  |   |-value: Union .U0::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
+  // CHECK-NOPCH-NEXT:  |   |-value: Union .U0::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
 
   constexpr U1 u1a{};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u1a 'const U1' constexpr listinit
-  // CHECK-NEXT:  |   |-value: Union .U1::(anonymous union at {{.*}}) Union .f Float 0.000000e+00
+  // CHECK-NOPCH-NEXT:  |   |-value: Union .U1::(anonymous union at {{.*}}) Union .f Float 0.000000e+00
 
   constexpr U1 u1b{3.1415f};
   // CHECK:    `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u1b 'const U1' constexpr listinit
-  // CHECK-NEXT:      |-value: Union .U1::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
+  // CHECK-NOPCH-NEXT:      |-value: Union .U1::(anonymous union at {{.*}}) Union .f Float 3.141500e+00
 }
diff --git a/clang/test/AST/ast-dump-APValue-arithmetic.cpp b/clang/test/AST/ast-dump-APValue-arithmetic.cpp
index c474e4be0e8c7a..de41057675b165 100644
--- a/clang/test/AST/ast-dump-APValue-arithmetic.cpp
+++ b/clang/test/AST/ast-dump-APValue-arithmetic.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -29,21 +29,21 @@ void Test() {
 
   constexpr _Complex int ComplexInt = 42 + 24i;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} referenced ComplexInt 'const _Complex int' constexpr cinit
-  // CHECK-NEXT:  |   |-value: ComplexInt 42 + 24i
+  // CHECK-NOPCH-NEXT:  |   |-value: ComplexInt 42 + 24i
 
   constexpr _Complex float ComplexFloat = 3.1415f + 42i;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} referenced ComplexFloat 'const _Complex float' constexpr cinit
-  // CHECK-NEXT:  |   |-value: ComplexFloat 3.141500e+00 + 4.200000e+01i
+  // CHECK-NOPCH-NEXT:  |   |-value: ComplexFloat 3.141500e+00 + 4.200000e+01i
 
   constexpr _Complex int ArrayOfComplexInt[10] = {ComplexInt, ComplexInt, ComplexInt, ComplexInt};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexInt 'const _Complex int[10]' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Array size=10
-  // CHECK-NEXT:  |   | |-elements: ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i
-  // CHECK-NEXT:  |   | `-filler: 6 x ComplexInt 0 + 0i
+  // CHECK-NOPCH-NEXT:  |   |-value: Array size=10
+  // CHECK-NOPCH-NEXT:  |   | |-elements: ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i, ComplexInt 42 + 24i
+  // CHECK-NOPCH-NEXT:  |   | `-filler: 6 x ComplexInt 0 + 0i
 
   constexpr _Complex float ArrayOfComplexFloat[10] = {ComplexFloat, ComplexFloat, ComplexInt, ComplexInt};
   // CHECK:    `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} ArrayOfComplexFloat 'const _Complex float[10]' constexpr cinit
-  // CHECK-NEXT:      |-value: Array size=10
-  // 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
-  // CHECK-NEXT:      | `-filler: 6 x ComplexFloat 0.000000e+00 + 0.000000e+00i
+  // CHECK-NOPCH-NEXT:      |-value: Array size=10
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:      | `-filler: 6 x ComplexFloat 0.000000e+00 + 0.000000e+00i
 }
diff --git a/clang/test/AST/ast-dump-APValue-array.cpp b/clang/test/AST/ast-dump-APValue-array.cpp
index d5fc521da448e4..65651352532849 100644
--- a/clang/test/AST/ast-dump-APValue-array.cpp
+++ b/clang/test/AST/ast-dump-APValue-array.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -29,54 +29,54 @@ void Test() {
       {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
+  // CHECK-NOPCH-NEXT:  |   |-value: Array size=5
+  // CHECK-NOPCH-NEXT:  |   | |-element: Vector length=5
+  // CHECK-NOPCH-NEXT:  |   | | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:  |   | | `-element: Int 5
+  // CHECK-NOPCH-NEXT:  |   | |-element: Vector length=5
+  // CHECK-NOPCH-NEXT:  |   | | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:  |   | | `-element: Int 0
+  // CHECK-NOPCH-NEXT:  |   | `-filler: 3 x Vector length=5
+  // CHECK-NOPCH-NEXT:  |   |   |-elements: Int 0, Int 0, Int 0, Int 0
+  // CHECK-NOPCH-NEXT:  |   |   `-element: Int 0
 
   constexpr float arr_f[3][5] = {
       {1, 2, 3, 4, 5},
   };
   // CHECK:  | `-VarDecl {{.*}} <line:{{.*}}, line:{{.*}}> line:{{.*}} arr_f 'const float[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
+  // CHECK-NOPCH-NEXT:  |   |-value: Array size=3
+  // CHECK-NOPCH-NEXT:  |   | |-element: Array size=5
+  // CHECK-NOPCH-NEXT:  |   | | |-elements: Float 1.000000e+00, Float 2.000000e+00, Float 3.000000e+00, Float 4.000000e+00
+  // CHECK-NOPCH-NEXT:  |   | | `-element: Float 5.000000e+00
+  // CHECK-NOPCH-NEXT:  |   | `-filler: 2 x Array size=5
+  // CHECK-NOPCH-NEXT:  |   |   `-filler: 5 x Float 0.000000e+00
 
   constexpr S0 arr_s0[2] = {{1, 2}, {3, 4}};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s0 'const S0[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
+  // CHECK-NOPCH-NEXT:  |   |-value: Array size=2
+  // CHECK-NOPCH-NEXT:  |   | |-element: Struct
+  // CHECK-NOPCH-NEXT:  |   | | `-field: Array size=2
+  // CHECK-NOPCH-NEXT:  |   | |   `-elements: Int 1, Int 2
+  // CHECK-NOPCH-NEXT:  |   | `-element: Struct
+  // CHECK-NOPCH-NEXT:  |   |   `-field: Array size=2
+  // CHECK-NOPCH-NEXT:  |   |     `-elements: Int 3, Int 4
 
   constexpr U0 arr_u0[2] = {{.i = 42}, {.f = 3.1415f}};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_u0 'const U0[2]' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Array size=2
-  // CHECK-NEXT:  |   | `-elements: Union .i Int 42, Union .f Float 3.141500e+00
+  // CHECK-NOPCH-NEXT:  |   |-value: Array size=2
+  // CHECK-NOPCH-NEXT:  |   | `-elements: Union .i Int 42, Union .f Float 3.141500e+00
 
   constexpr S1 arr_s1[2] = {};
   // CHECK:    `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} arr_s1 'const S1[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
+  // CHECK-NOPCH-NEXT:      |-value: Array size=2
+  // CHECK-NOPCH-NEXT:      | |-element: Struct
+  // CHECK-NOPCH-NEXT:      | | |-field: Struct
+  // CHECK-NOPCH-NEXT:      | | | `-field: Array size=2
+  // CHECK-NOPCH-NEXT:      | | |   `-elements: Int 1, Int 2
+  // CHECK-NOPCH-NEXT:      | | `-field: Union .i Int 42
+  // CHECK-NOPCH-NEXT:      | `-element: Struct
+  // CHECK-NOPCH-NEXT:      |   |-field: Struct
+  // CHECK-NOPCH-NEXT:      |   | `-field: Array size=2
+  // CHECK-NOPCH-NEXT:      |   |   `-elements: Int 1, Int 2
+  // CHECK-NOPCH-NEXT:      |   `-field: Union .i Int 42
 }
diff --git a/clang/test/AST/ast-dump-APValue-lvalue.cpp b/clang/test/AST/ast-dump-APValue-lvalue.cpp
index 92e881aca3d80c..b4b11a381c6e9e 100644
--- a/clang/test/AST/ast-dump-APValue-lvalue.cpp
+++ b/clang/test/AST/ast-dump-APValue-lvalue.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -40,41 +40,41 @@ struct MP : P, Q {
 void Test(int (&arr)[10]) {
   constexpr int *pi = &i;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pi 'int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
 
   constexpr int *pi2 = &i + 1;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pi2 'int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=4, OnePastTheEnd=1, HasPath=1, PathLength=0, Path=()
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=4, OnePastTheEnd=1, HasPath=1, PathLength=0, Path=()
 
   constexpr int *psi = &s.i;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} psi 'int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=1, Path=({{.*}})
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=1, Path=({{.*}})
 
   constexpr int *psii = &s.ii;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} psii 'int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=4, OnePastTheEnd=0, HasPath=1, PathLength=1, Path=({{.*}})
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=4, OnePastTheEnd=0, HasPath=1, PathLength=1, Path=({{.*}})
 
   constexpr int *pf = &f.s.ii;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pf 'int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=16, OnePastTheEnd=0, HasPath=1, PathLength=2, Path=({{.*}}, {{.*}})
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=16, OnePastTheEnd=0, HasPath=1, PathLength=2, Path=({{.*}}, {{.*}})
 
   constexpr char *pc = &f.padding[2];
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pc 'char *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=2, OnePastTheEnd=0, HasPath=1, PathLength=2, Path=({{.*}}, 2)
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=VarDecl {{.*}}, Null=0, Offset=2, OnePastTheEnd=0, HasPath=1, PathLength=2, Path=({{.*}}, 2)
 
   constexpr const int *n = nullptr;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} n 'const int *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=null, Null=1, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=null, Null=1, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
 
   constexpr const std::type_info* pti = &typeid(int);
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pti 'const std::type_info *const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: LValue Base=TypeInfoLValue typeid(int), Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
+  // CHECK-NOPCH-NEXT:  |   |-value: LValue Base=TypeInfoLValue typeid(int), Null=0, Offset=0, OnePastTheEnd=0, HasPath=1, PathLength=0, Path=()
 
   constexpr int(MP::*pmi) = (int MP::*)&P::x;
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pmi 'int (MP::*const)' constexpr cinit
-  // CHECK-NEXT:  |   |-value: MemberPointer MP::x
+  // CHECK-NOPCH-NEXT:  |   |-value: MemberPointer MP::x
 
   constexpr int(MP::*pmn) = (int MP::*)nullptr;
   // CHECK:    `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} pmn 'int (MP::*const)' constexpr cinit
-  // CHECK-NEXT:      |-value: MemberPointer null
+  // CHECK-NOPCH-NEXT:      |-value: MemberPointer null
 }
diff --git a/clang/test/AST/ast-dump-APValue-reflection.cpp b/clang/test/AST/ast-dump-APValue-reflection.cpp
index 55fee355ebf1eb..a2b17fbc87a3e6 100644
--- a/clang/test/AST/ast-dump-APValue-reflection.cpp
+++ b/clang/test/AST/ast-dump-APValue-reflection.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -std=c++26 -freflection \
 // RUN:            -ast-dump %s -ast-dump-filter Test \
-// RUN: | FileCheck --strict-whitespace %s
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -std=c++26 -freflection -emit-pch -o %t %s
@@ -13,9 +13,9 @@
 void TestReflection() {
   constexpr auto x = ^^int;
   // CHECK:  | `-VarDecl {{.*}} x 'const std::meta::info' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Reflection ^^int
+  // CHECK-NOPCH-NEXT:  |   |-value: Reflection ^^int
 
   constexpr decltype(^^int) y{};
   // CHECK:    `-VarDecl {{.*}} y {{.*}} constexpr listinit
-  // CHECK-NEXT:        |-value: Reflection std::meta::info{}
+  // CHECK-NOPCH-NEXT:        |-value: Reflection std::meta::info{}
 }
diff --git a/clang/test/AST/ast-dump-APValue-struct.cpp b/clang/test/AST/ast-dump-APValue-struct.cpp
index 4730404abc287c..e7bcd98d3c0df5 100644
--- a/clang/test/AST/ast-dump-APValue-struct.cpp
+++ b/clang/test/AST/ast-dump-APValue-struct.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -61,53 +61,53 @@ struct S5 : S4 {
 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
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-NEXT:  |   | |-field: Int 0
+  // CHECK-NOPCH-NEXT:  |   | `-field: Union .s
+  // CHECK-NOPCH-NEXT:  |   |   `-Struct
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-NEXT:  |   | |-field: Int 0
+  // CHECK-NOPCH-NEXT:  |   | `-field: Union .u
+  // CHECK-NOPCH-NEXT:  |   |   `-Union .j
+  // CHECK-NOPCH-NEXT:  |   |     `-Struct
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:  |   |-value: Struct
+  // CHECK-NOPCH-NEXT:  |   | |-base: Struct
+  // CHECK-NOPCH-NEXT:  |   | | `-fields: Int 0, Union .j Int 0
+  // CHECK-NOPCH-NEXT:  |   | |-fields: Int 1, Int 2, Int 3
+  // CHECK-NOPCH-NEXT:  |   | |-field: Struct
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:      |-value: Struct
+  // CHECK-NOPCH-NEXT:      | |-base: Struct
+  // CHECK-NOPCH-NEXT:      | | |-base: Struct
+  // CHECK-NOPCH-NEXT:      | | | `-fields: Int 0, Union .j Int 0
+  // CHECK-NOPCH-NEXT:      | | |-fields: Int 1, Int 2, Int 3
+  // CHECK-NOPCH-NEXT:      | | |-field: Struct
+  // CHECK-NOPCH-NEXT:      | | `-fields: Int 4, Int 5, Int 6
+  // CHECK-NOPCH-NEXT:      | |-field: Array size=8
+  // CHECK-NOPCH-NEXT:      | | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:      | | `-filler: 4 x Int 0
+  // CHECK-NOPCH-NEXT:      | `-field: Array size=8
+  // CHECK-NOPCH-NEXT:      |   |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:      |   `-elements: Int 0, Int 0, Int 0, Int 0
 }
diff --git a/clang/test/AST/ast-dump-APValue-union.cpp b/clang/test/AST/ast-dump-APValue-union.cpp
index c717b6ece73827..6e745c5f4cc29c 100644
--- a/clang/test/AST/ast-dump-APValue-union.cpp
+++ b/clang/test/AST/ast-dump-APValue-union.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -40,24 +40,24 @@ union U3 {
 void Test() {
   constexpr U0 u0{};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} u0 'const U0' constexpr listinit
-  // CHECK-NEXT:  |   |-value: Union .i Int 42
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:  |   |-value: Union .uinner
+  // CHECK-NOPCH-NEXT:  |   | `-Union .arr
+  // CHECK-NOPCH-NEXT:  |   |   `-Array size=2
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-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
+  // CHECK-NOPCH-NEXT:      |-value: Union .uinner Union .d Float 3.141500e+00
 }
diff --git a/clang/test/AST/ast-dump-APValue-vector.cpp b/clang/test/AST/ast-dump-APValue-vector.cpp
index a9ec1d361c4128..88b5c3bfe98343 100644
--- a/clang/test/AST/ast-dump-APValue-vector.cpp
+++ b/clang/test/AST/ast-dump-APValue-vector.cpp
@@ -1,7 +1,7 @@
 // Test without serialization:
 // 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
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-NOPCH --strict-whitespace --match-full-lines %s
 //
 // Test with serialization:
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -std=gnu++17 -emit-pch -o %t %s
@@ -14,30 +14,30 @@ void Test() {
   constexpr int __attribute__((vector_size(sizeof(int) * 1))) v1i = {1};
   // CHECK:  |-DeclStmt {{.*}} <line:{{.*}}, col:{{.*}}>
   // CHECK-NEXT:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} v1i '__attribute__((__vector_size__(1 * sizeof(int)))) int const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Vector length=1
-  // CHECK-NEXT:  |   | `-element: Int 1
+  // CHECK-NOPCH-NEXT:  |   |-value: Vector length=1
+  // CHECK-NOPCH-NEXT:  |   | `-element: Int 1
 
   constexpr int __attribute__((vector_size(sizeof(int) * 4))) v4i = {1, 2, 3, 4};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} v4i '__attribute__((__vector_size__(4 * sizeof(int)))) int const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Vector length=4
-  // CHECK-NEXT:  |   | `-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:  |   |-value: Vector length=4
+  // CHECK-NOPCH-NEXT:  |   | `-elements: Int 1, Int 2, Int 3, Int 4
 
   constexpr int __attribute__((vector_size(sizeof(int) * 5))) v5i = {1, 2, 3, 4};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} v5i '__attribute__((__vector_size__(5 * sizeof(int)))) int const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Vector length=5
-  // CHECK-NEXT:  |   | |-elements: Int 1, Int 2, Int 3, Int 4
-  // CHECK-NEXT:  |   | `-element: Int 0
+  // CHECK-NOPCH-NEXT:  |   |-value: Vector length=5
+  // CHECK-NOPCH-NEXT:  |   | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:  |   | `-element: Int 0
 
   constexpr int __attribute__((vector_size(sizeof(int) * 8))) v8i = {1, 2, 3, 4};
   // CHECK:  | `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} v8i '__attribute__((__vector_size__(8 * sizeof(int)))) int const' constexpr cinit
-  // CHECK-NEXT:  |   |-value: Vector length=8
-  // CHECK-NEXT:  |   | |-elements: Int 1, Int 2, Int 3, Int 4
-  // CHECK-NEXT:  |   | `-elements: Int 0, Int 0, Int 0, Int 0
+  // CHECK-NOPCH-NEXT:  |   |-value: Vector length=8
+  // CHECK-NOPCH-NEXT:  |   | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:  |   | `-elements: Int 0, Int 0, Int 0, Int 0
 
   constexpr int __attribute__((vector_size(sizeof(int) * 9))) v9i = {1, 2, 3, 4};
   // CHECK:    `-VarDecl {{.*}} <col:{{.*}}, col:{{.*}}> col:{{.*}} v9i '__attribute__((__vector_size__(9 * sizeof(int)))) int const' constexpr cinit
-  // CHECK-NEXT:      |-value: Vector length=9
-  // CHECK-NEXT:      | |-elements: Int 1, Int 2, Int 3, Int 4
-  // CHECK-NEXT:      | |-elements: Int 0, Int 0, Int 0, Int 0
-  // CHECK-NEXT:      | `-element: Int 0
+  // CHECK-NOPCH-NEXT:      |-value: Vector length=9
+  // CHECK-NOPCH-NEXT:      | |-elements: Int 1, Int 2, Int 3, Int 4
+  // CHECK-NOPCH-NEXT:      | |-elements: Int 0, Int 0, Int 0, Int 0
+  // CHECK-NOPCH-NEXT:      | `-element: Int 0
 }
diff --git a/clang/test/SemaOpenACC/declare-construct-ast.cpp b/clang/test/SemaOpenACC/declare-construct-ast.cpp
index 0ebab72b028889..f549b072bd9b7c 100644
--- a/clang/test/SemaOpenACC/declare-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/declare-construct-ast.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -fopenacc -ast-dump | FileCheck %s
+// RUN: %clang_cc1 %s -fopenacc -ast-dump | FileCheck --check-prefixes=CHECK,CHECK-NOPCH %s
 
 // Test this with PCH.
 // RUN: %clang_cc1 %s -fopenacc -emit-pch -o %t %s
@@ -246,14 +246,14 @@ struct DependentStruct {
 // CHECK-NEXT: IntegerLiteral{{.*}}'int' 5
 //
 // CHECK-NEXT: VarDecl{{.*}} StaticMemArray 'const int[5]'
-// CHECK-NEXT: value: Array size=5
-// CHECK-NEXT: filler: 5 x Int 0
+// CHECK-NOPCH-NEXT: value: Array size=5
+// CHECK-NOPCH-NEXT: filler: 5 x Int 0
 // CHECK-NEXT: InitListExpr{{.*}} 'const int[5]'
 // CHECK-NEXT: array_filler
 
 // CHECK-NEXT: VarDecl{{.*}} StaticMemArray2 'const int[5]'
-// CHECK-NEXT: value: Array size=5
-// CHECK-NEXT: filler: 5 x Int 0
+// CHECK-NOPCH-NEXT: value: Array size=5
+// CHECK-NOPCH-NEXT: filler: 5 x Int 0
 // CHECK-NEXT: InitListExpr{{.*}} 'const int[5]'
 // CHECK-NEXT: array_filler
 
diff --git a/clang/test/SemaOpenACC/routine-construct-ast.cpp b/clang/test/SemaOpenACC/routine-construct-ast.cpp
index 7c23e0ea90b871..84669323bf8902 100644
--- a/clang/test/SemaOpenACC/routine-construct-ast.cpp
+++ b/clang/test/SemaOpenACC/routine-construct-ast.cpp
@@ -126,7 +126,7 @@ struct S {
 #pragma acc routine worker
   constexpr static auto Lambda2 = [](){ return 1; };
   // CHECK: VarDecl{{.*}}Lambda2 'const S::(lambda at
-  // CHECK-NEXT: value: Struct
+  // CHECK-NOPCH-NEXT: value: Struct
   // CHECK-NEXT: ImplicitCastExpr
   // CHECK-NEXT: LambdaExpr
   // CHECK-NEXT: CXXRecordDecl
@@ -313,7 +313,7 @@ struct DepS {
 // CHECK-NEXT: value: Int 1
 
 // CHECK: VarDecl{{.*}}Lambda2 'const DepS<int>::(lambda at
-// CHECK-NEXT: value: Struct
+// CHECK-NOPCH-NEXT: value: Struct
 // CHECK-NEXT: ImplicitCastExpr
 // CHECK-NEXT: LambdaExpr
 // CHECK-NEXT: CXXRecordDecl
@@ -327,7 +327,7 @@ struct DepS {
 // CHECK-NEXT: value: Int 1
 
 // CHECK: VarDecl{{.*}}Lambda3 'const DepS<int>::(lambda at
-// CHECK-NEXT: value: Struct
+// CHECK-NOPCH-NEXT: value: Struct
 // CHECK-NEXT: ImplicitCastExpr
 // CHECK-NEXT: LambdaExpr
 // CHECK-NEXT: CXXRecordDecl



More information about the cfe-commits mailing list