2 files changed, 24 insertions, 8 deletions

diff --git a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
index 79cc212ca4a..e45fbfa4eef 100644
--- a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
@@ -309,25 +309,41 @@ constexpr References ReferencesInstance;
 // CHECK: | `-EnumConstantDecl {{.*}} B 'EnumType'
 // CHECK: |-CXXRecordDecl {{.*}} struct DerivedClass definition
 // CHECK: | |-public 'BaseClass<int>'
-// CHECK: | `-FieldDecl {{.*}} DerivedMember 'int'
+// CHECK: | |-FieldDecl {{.*}} DerivedMember 'int'
+// CHECK: | `-CXXConstructorDecl {{.*}} DerivedClass 'void (int, int)'
+// CHECK: |   |-ParmVarDecl {{.*}} 'int'
+// CHECK: |   `-ParmVarDecl {{.*}} 'int'
 // CHECK: |-VarDecl {{.*}} DC 'const DerivedClass'
 // CHECK: |-CXXRecordDecl {{.*}} struct BaseClass<int> definition
-// CHECK: | `-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | |-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | `-CXXMethodDecl {{.*}} BaseClass 'void (int)'
+// CHECK: |   `-ParmVarDecl {{.*}} 'int'
 // CHECK: |-CXXRecordDecl {{.*}} struct EBO definition
 // CHECK: | |-public 'EmptyBase'
-// CHECK: | `-FieldDecl {{.*}} Member 'int'
+// CHECK: | |-FieldDecl {{.*}} Member 'int'
+// CHECK: | `-CXXConstructorDecl {{.*}} EBO 'void (int)'
+// CHECK: |   `-ParmVarDecl {{.*}} 'int'
 // CHECK: |-VarDecl {{.*}} EBOC 'const EBO'
 // CHECK: |-CXXRecordDecl {{.*}} struct EmptyBase definition
 // CHECK: |-CXXRecordDecl {{.*}} struct PaddedBases definition
 // CHECK: | |-public 'BaseClass<char>'
 // CHECK: | |-public 'BaseClass<short>'
 // CHECK: | |-public 'BaseClass<int>'
-// CHECK: | `-FieldDecl {{.*}} DerivedMember 'long long'
+// CHECK: | |-FieldDecl {{.*}} DerivedMember 'long long'
+// CHECK: | `-CXXConstructorDecl {{.*}} PaddedBases 'void (char, short, int, long long)'
+// CHECK: |   |-ParmVarDecl {{.*}} 'char'
+// CHECK: |   |-ParmVarDecl {{.*}} 'short'
+// CHECK: |   |-ParmVarDecl {{.*}} 'int'
+// CHECK: |   `-ParmVarDecl {{.*}} 'long long'
 // CHECK: |-VarDecl {{.*}} PBC 'const PaddedBases'
 // CHECK: |-CXXRecordDecl {{.*}} struct BaseClass<char> definition
-// CHECK: | `-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | |-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | `-CXXMethodDecl {{.*}} BaseClass 'void (int)'
+// CHECK: |   `-ParmVarDecl {{.*}} 'int'
 // CHECK: |-CXXRecordDecl {{.*}} struct BaseClass<short> definition
-// CHECK: | `-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | |-FieldDecl {{.*}} BaseMember 'int'
+// CHECK: | `-CXXMethodDecl {{.*}} BaseClass 'void (int)'
+// CHECK: |   `-ParmVarDecl {{.*}} 'int'
 // CHECK: |-CXXRecordDecl {{.*}} struct <unnamed-type-UnnamedClassInstance> definition
 // CHECK: | |-FieldDecl {{.*}} x 'int'
 // CHECK: | `-FieldDecl {{.*}} EBOC 'EBO'
diff --git a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp b/lldb/lit/SymbolFile/NativePDB/tag-types.cpp
index 947fe20d17d..127ad598092 100644
--- a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp
+++ b/lldb/lit/SymbolFile/NativePDB/tag-types.cpp
@@ -208,7 +208,7 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: }
 // CHECK-NEXT: (lldb) type lookup -- Derived
 // CHECK-NEXT: class Derived : public Class {
-// CHECK-NEXT:     Derived &Reference;
+// CHECK:          Derived &Reference;
 // CHECK-NEXT:     OneMember Member;
 // CHECK-NEXT:     const OneMember ConstMember;
 // CHECK-NEXT:     volatile OneMember VolatileMember;
@@ -216,7 +216,7 @@ int main(int argc, char **argv) {
 // CHECK-NEXT:     OneMember *PtrMember;
 // CHECK-NEXT:     OneMember &RefMember;
 // CHECK-NEXT:     OneMember &&RValueRefMember;
-// CHECK-NEXT: }
+// CHECK:      }
 // CHECK-NEXT: (lldb) type lookup -- Derived2
 // CHECK-NEXT: class Derived2 : protected Class, private Struct {
 // CHECK-NEXT:     static unsigned int StaticDataMember;