Try to port tests to AST dump changes

llvm-svn: 351703

5 files changed, 10 insertions, 13 deletions

diff --git a/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp b/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp
index 05c80c7298f..1cfd01f13c1 100644
--- a/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp
@@ -23,7 +23,6 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: | |-ParmVarDecl {{.*}} argc 'int'
 // CHECK-NEXT: | `-ParmVarDecl {{.*}} argv 'char **'
 // CHECK-NEXT: |-FunctionDecl {{.*}} static_fn 'int ()' static
-// CHECK-NEXT: |-FunctionDecl {{.*}} varargs_fn 'int (int, int, ...)'
-// CHECK-NEXT: | |-ParmVarDecl {{.*}} x 'int'
-// CHECK-NEXT: | `-ParmVarDecl {{.*}} y 'int'
-// CHECK-NEXT: `-<undeserialized declarations>
+// CHECK-NEXT: `-FunctionDecl {{.*}} varargs_fn 'int (int, int, ...)'
+// CHECK-NEXT:   |-ParmVarDecl {{.*}} x 'int'
+// CHECK-NEXT:   `-ParmVarDecl {{.*}} y 'int'
diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp b/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp
index 5670f9bd1e1..fa2dd7b5419 100644
--- a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp
@@ -117,8 +117,8 @@ auto incomplete = &three<Incomplete*, Incomplete**, const Incomplete*>;
 // CHECK: |-VarDecl {{.*}} c 'U (*)(volatile E *, volatile S &, volatile C &&)'

 // CHECK: |-VarDecl {{.*}} d 'C (*)(const volatile U *, const volatile E &, const volatile S &&)'
 // CHECK: |-CXXRecordDecl {{.*}} struct B
-// CHECK: | |-CXXRecordDecl {{.*}} struct A
-// CHECK: | | |-CXXRecordDecl {{.*}} struct S
+// CHECK: | `-CXXRecordDecl {{.*}} struct A
+// CHECK: |   |-CXXRecordDecl {{.*}} struct S
 // CHECK: |-NamespaceDecl {{.*}} A
 // CHECK: | |-CXXRecordDecl {{.*}} struct C
 // CHECK: | | |-CXXRecordDecl {{.*}} struct S
diff --git a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
index ea7cc745d74..79cc212ca4a 100644
--- a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
@@ -362,8 +362,7 @@ constexpr References ReferencesInstance;
 // CHECK: | |-FieldDecl {{.*}} k 'double &'
 // CHECK: | |-FieldDecl {{.*}} l 'unsigned long long &'
 // CHECK: | `-FieldDecl {{.*}} m 'long long &'
-// CHECK: |-VarDecl {{.*}} ReferencesInstance 'const References'
-// CHECK: `-<undeserialized declarations>
+// CHECK: `-VarDecl {{.*}} ReferencesInstance 'const References'
 
 int main(int argc, char **argv) {
   return 0;
diff --git a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp b/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp
index 8891eddf668..48dea6d51e4 100644
--- a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp
@@ -870,8 +870,7 @@ const wchar_t &CRWCP = WCP;
 // CHECK-NEXT: |-VarDecl {{.*}} CRC16_24 'const char16_t &'
 // CHECK-NEXT: |-VarDecl {{.*}} CRC32_42 'const char32_t &'
 // CHECK-NEXT: |-VarDecl {{.*}} CRWC1 'const wchar_t &'
-// CHECK-NEXT: |-VarDecl {{.*}} CRWCP 'const wchar_t &'
-// CHECK-NEXT: `-<undeserialized declarations>
+// CHECK-NEXT: `-VarDecl {{.*}} CRWCP 'const wchar_t &'
 
 // CHECK: (lldb) quit
 
diff --git a/lldb/lit/SymbolFile/NativePDB/local-variables.cpp b/lldb/lit/SymbolFile/NativePDB/local-variables.cpp
index 5886153a27d..a7e786dc4e5 100644
--- a/lldb/lit/SymbolFile/NativePDB/local-variables.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/local-variables.cpp
@@ -156,6 +156,6 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: |-FunctionDecl {{.*}} main 'int (int, char **)'
 // CHECK-NEXT: | |-ParmVarDecl {{.*}} argc 'int'
 // CHECK-NEXT: | `-ParmVarDecl {{.*}} argv 'char **'
-// CHECK-NEXT: |-FunctionDecl {{.*}} Function 'int (int, char)'
-// CHECK-NEXT: | |-ParmVarDecl {{.*}} Param1 'int'
-// CHECK-NEXT: | `-ParmVarDecl {{.*}} Param2 'char'
+// CHECK-NEXT: `-FunctionDecl {{.*}} Function 'int (int, char)'
+// CHECK-NEXT:   |-ParmVarDecl {{.*}} Param1 'int'
+// CHECK-NEXT:   `-ParmVarDecl {{.*}} Param2 'char'