5 files changed, 11 insertions, 4 deletions
diff --git a/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.cpp b/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.cpp
index b52af149533..bb327ec1c41 100644
--- a/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.cpp
+++ b/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.cpp
@@ -114,6 +114,7 @@ struct SimplePadAggregate {
   NonEmptyBase1 X;
   int32_t Y;
   // the presence of X will cause 3 bytes of padding to be injected.
+  SimplePadFields1 Fields;
 } N;
 
 struct SimplePadVtable1 {
diff --git a/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.pdb b/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.pdb
index f0bd496c1c8..f19c00660a7 100644
--- a/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.pdb
+++ b/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.pdb
diff --git a/llvm/test/tools/llvm-pdbdump/class-layout.test b/llvm/test/tools/llvm-pdbdump/class-layout.test
index ef5eb49af90..4a69c17db2b 100644
--- a/llvm/test/tools/llvm-pdbdump/class-layout.test
+++ b/llvm/test/tools/llvm-pdbdump/class-layout.test
@@ -1,4 +1,5 @@
-; RUN: llvm-pdbdump pretty -all %p/Inputs/ClassLayoutTest.pdb > %t
+; RUN: llvm-pdbdump pretty -all -class-recurse-depth=1 \
+; RUN:   %p/Inputs/ClassLayoutTest.pdb > %t
 ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_TEST
 ; RUN: FileCheck -input-file=%t %s -check-prefix=MEMBERS_TEST
 ; RUN: FileCheck -input-file=%t %s -check-prefix=BASE_CLASS_A
diff --git a/llvm/test/tools/llvm-pdbdump/complex-padding-graphical.test b/llvm/test/tools/llvm-pdbdump/complex-padding-graphical.test
index 82881226e66..a23321fe012 100644
--- a/llvm/test/tools/llvm-pdbdump/complex-padding-graphical.test
+++ b/llvm/test/tools/llvm-pdbdump/complex-padding-graphical.test
@@ -1,4 +1,4 @@
-; RUN: llvm-pdbdump pretty -classes -class-definitions=graphical \
+; RUN: llvm-pdbdump pretty -classes -class-definitions=layout \
 ; RUN:     -include-types=Test %p/Inputs/ComplexPaddingTest.pdb > %t
 
 ; RUN: FileCheck -input-file=%t %s -check-prefix=DIRECT_VB_ONLY
diff --git a/llvm/test/tools/llvm-pdbdump/simple-padding-graphical.test b/llvm/test/tools/llvm-pdbdump/simple-padding-graphical.test
index 222349e75b0..0e19f9cc701 100644
--- a/llvm/test/tools/llvm-pdbdump/simple-padding-graphical.test
+++ b/llvm/test/tools/llvm-pdbdump/simple-padding-graphical.test
@@ -1,4 +1,4 @@
-; RUN: llvm-pdbdump pretty -classes -class-definitions=graphical \
+; RUN: llvm-pdbdump pretty -classes -class-definitions=layout \
 ; RUN:     -include-types=SimplePad %p/Inputs/SimplePaddingTest.pdb > %t
 
 ; RUN: FileCheck -input-file=%t %s -check-prefix=NO_PADDING
@@ -112,9 +112,14 @@
 ; DEEP_INHERIT-NEXT: }
 
 
-; AGGREGATE:      struct SimplePadAggregate [sizeof = 8] {
+; AGGREGATE:      struct SimplePadAggregate [sizeof = 12] {
 ; AGGREGATE-NEXT:   data +0x00 [sizeof=1] NonEmptyBase1 X
 ; AGGREGATE-NEXT:     data +0x00 [sizeof=1] bool X
 ; AGGREGATE-NEXT:   <padding> (3 bytes)
 ; AGGREGATE-NEXT:   data +0x04 [sizeof=4] int Y
+; AGGREGATE-NEXT:   data +0x08 [sizeof=4] SimplePadFields1 Fields
+; AGGREGATE-NEXT:     data +0x08 [sizeof=1] char A
+; AGGREGATE-NEXT:     data +0x09 [sizeof=1] char B
+; AGGREGATE-NEXT:     data +0x0a [sizeof=1] char C
+; AGGREGATE-NEXT:     <padding> (1 bytes)
 ; AGGREGATE-NEXT: }