vendor/llvm/llvm-trunk-r301441

1 files changed, 14 insertions, 3 deletions

diff --git a/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h b/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h
index 7dfb74c4e14b..f83f1a6c1b34 100644
--- a/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h
+++ b/tools/llvm-pdbdump/PrettyClassLayoutGraphicalDumper.h
@@ -19,25 +19,36 @@ namespace llvm {
 namespace pdb {
 
 class UDTLayoutBase;
-class StorageItemBase;
+class LayoutItemBase;
 class LinePrinter;
 
 class PrettyClassLayoutGraphicalDumper : public PDBSymDumper {
 public:
-  PrettyClassLayoutGraphicalDumper(LinePrinter &P, uint32_t InitialOffset);
+  PrettyClassLayoutGraphicalDumper(LinePrinter &P, uint32_t RecurseLevel,
+                                   uint32_t InitialOffset);
 
   bool start(const UDTLayoutBase &Layout);
 
+  // Layout based symbol types.
   void dump(const PDBSymbolTypeBaseClass &Symbol) override;
   void dump(const PDBSymbolData &Symbol) override;
   void dump(const PDBSymbolTypeVTable &Symbol) override;
 
+  // Non layout-based symbol types.
+  void dump(const PDBSymbolTypeEnum &Symbol) override;
+  void dump(const PDBSymbolFunc &Symbol) override;
+  void dump(const PDBSymbolTypeTypedef &Symbol) override;
+  void dump(const PDBSymbolTypeUDT &Symbol) override;
+  void dump(const PDBSymbolTypeBuiltin &Symbol) override;
+
 private:
+  bool shouldRecurse() const;
   void printPaddingRow(uint32_t Amount);
 
   LinePrinter &Printer;
 
-  StorageItemBase *CurrentItem = nullptr;
+  LayoutItemBase *CurrentItem = nullptr;
+  uint32_t RecursionLevel = 0;
   uint32_t ClassOffsetZero = 0;
   uint32_t CurrentAbsoluteOffset = 0;
   bool DumpedAnything = false;