From 518cb2d5608b8bedb68c7e626d380a1531d17145 Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Sun, 30 Sep 2018 16:19:18 +0000
Subject: [PATCH] [PDB] Add native support for dumping array types.

llvm-svn: 343412
---
 .../llvm/DebugInfo/PDB/Native/NativeTypeArray.h    |  50 +++++++++++++++
 llvm/lib/DebugInfo/PDB/CMakeLists.txt              |   1 +
 llvm/lib/DebugInfo/PDB/Native/NativeExeSymbol.cpp  |   2 +
 llvm/lib/DebugInfo/PDB/Native/NativeTypeArray.cpp  |  67 +++++++++++++++++++++
 llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp      |   5 ++
 llvm/test/DebugInfo/PDB/Inputs/every-array.cpp     |  37 ++++++++++++
 llvm/test/DebugInfo/PDB/Inputs/every-array.pdb     | Bin 0 -> 73728 bytes
 llvm/tools/llvm-pdbutil/PrettyTypeDumper.cpp       |  13 ++++
 llvm/tools/llvm-pdbutil/PrettyTypeDumper.h         |   1 +
 llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp           |  11 +++-
 llvm/tools/llvm-pdbutil/llvm-pdbutil.h             |   1 +
 11 files changed, 186 insertions(+), 2 deletions(-)
 create mode 100644 llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h
 create mode 100644 llvm/lib/DebugInfo/PDB/Native/NativeTypeArray.cpp
 create mode 100644 llvm/test/DebugInfo/PDB/Inputs/every-array.cpp
 create mode 100644 llvm/test/DebugInfo/PDB/Inputs/every-array.pdb

diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h
new file mode 100644
index 0000000..10e68e6
--- /dev/null
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h
@@ -0,0 +1,50 @@
+//===- NativeTypeArray.h ------------------------------------------ C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEARRAY_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEARRAY_H
+
+#include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
+
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
+#include "llvm/DebugInfo/PDB/PDBTypes.h"
+
+namespace llvm {
+namespace pdb {
+
+class NativeSession;
+
+class NativeTypeArray : public NativeRawSymbol {
+public:
+  NativeTypeArray(NativeSession &Session, SymIndexId Id, codeview::TypeIndex TI,
+                  codeview::ArrayRecord Record);
+  ~NativeTypeArray() override;
+
+  void dump(raw_ostream &OS, int Indent, PdbSymbolIdField ShowIdFields,
+            PdbSymbolIdField RecurseIdFields) const override;
+
+  SymIndexId getArrayIndexTypeId() const override;
+
+  bool isConstType() const override;
+  bool isUnalignedType() const override;
+  bool isVolatileType() const override;
+
+  uint32_t getCount() const override;
+  SymIndexId getTypeId() const override;
+  uint64_t getLength() const override;
+
+protected:
+  codeview::ArrayRecord Record;
+  codeview::TypeIndex Index;
+};
+
+} // namespace pdb
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/DebugInfo/PDB/CMakeLists.txt b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
index 3ec5d05..ae79c9e 100644
--- a/llvm/lib/DebugInfo/PDB/CMakeLists.txt
+++ b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
@@ -52,6 +52,7 @@ add_pdb_impl_folder(Native
   Native/NativeExeSymbol.cpp
   Native/NativeRawSymbol.cpp
   Native/NativeSymbolEnumerator.cpp
+  Native/NativeTypeArray.cpp
   Native/NativeTypeBuiltin.cpp
   Native/NativeTypeEnum.cpp
   Native/NativeTypeFunctionSig.cpp
diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeExeSymbol.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeExeSymbol.cpp
index bcc2198..14a0fb4 100644
--- a/llvm/lib/DebugInfo/PDB/Native/NativeExeSymbol.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeExeSymbol.cpp
@@ -41,6 +41,8 @@ NativeExeSymbol::findChildren(PDB_SymType Type) const {
     return std::unique_ptr<IPDBEnumSymbols>(new NativeEnumModules(Session));
     break;
   }
+  case PDB_SymType::ArrayType:
+    return Session.getSymbolCache().createTypeEnumerator(codeview::LF_ARRAY);
   case PDB_SymType::Enum:
     return Session.getSymbolCache().createTypeEnumerator(codeview::LF_ENUM);
   case PDB_SymType::PointerType:
diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeTypeArray.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeTypeArray.cpp
new file mode 100644
index 0000000..a525617
--- /dev/null
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeTypeArray.cpp
@@ -0,0 +1,67 @@
+//===- NativeTypeArray.cpp - info about arrays ------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/DebugInfo/PDB/Native/NativeTypeArray.h"
+
+#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
+
+using namespace llvm;
+using namespace llvm::codeview;
+using namespace llvm::pdb;
+
+NativeTypeArray::NativeTypeArray(NativeSession &Session, SymIndexId Id,
+                                 codeview::TypeIndex TI,
+                                 codeview::ArrayRecord Record)
+    : NativeRawSymbol(Session, PDB_SymType::ArrayType, Id), Record(Record),
+      Index(TI) {}
+NativeTypeArray::~NativeTypeArray() {}
+
+void NativeTypeArray::dump(raw_ostream &OS, int Indent,
+                           PdbSymbolIdField ShowIdFields,
+                           PdbSymbolIdField RecurseIdFields) const {
+  NativeRawSymbol::dump(OS, Indent, ShowIdFields, RecurseIdFields);
+
+  dumpSymbolField(OS, "arrayIndexTypeId", getArrayIndexTypeId(), Indent);
+  dumpSymbolIdField(OS, "elementTypeId", getTypeId(), Indent, Session,
+                    PdbSymbolIdField::Type, ShowIdFields, RecurseIdFields);
+
+  dumpSymbolIdField(OS, "lexicalParentId", 0, Indent, Session,
+                    PdbSymbolIdField::LexicalParent, ShowIdFields,
+                    RecurseIdFields);
+  dumpSymbolField(OS, "length", getLength(), Indent);
+  dumpSymbolField(OS, "count", getCount(), Indent);
+  dumpSymbolField(OS, "constType", isConstType(), Indent);
+  dumpSymbolField(OS, "unalignedType", isUnalignedType(), Indent);
+  dumpSymbolField(OS, "volatileType", isVolatileType(), Indent);
+}
+
+SymIndexId NativeTypeArray::getArrayIndexTypeId() const {
+  return Session.getSymbolCache().findSymbolByTypeIndex(Record.getIndexType());
+}
+
+bool NativeTypeArray::isConstType() const { return false; }
+
+bool NativeTypeArray::isUnalignedType() const { return false; }
+
+bool NativeTypeArray::isVolatileType() const { return false; }
+
+uint32_t NativeTypeArray::getCount() const {
+  NativeRawSymbol &Element =
+      Session.getSymbolCache().getNativeSymbolById(getTypeId());
+  return getLength() / Element.getLength();
+}
+
+SymIndexId NativeTypeArray::getTypeId() const {
+  return Session.getSymbolCache().findSymbolByTypeIndex(
+      Record.getElementType());
+}
+
+uint64_t NativeTypeArray::getLength() const { return Record.Size; }
\ No newline at end of file
diff --git a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
index d4732fd..40b352a 100644
--- a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
@@ -7,6 +7,7 @@
 #include "llvm/DebugInfo/PDB/Native/NativeEnumTypes.h"
 #include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeSession.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeArray.h"
 #include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
 #include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
 #include "llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h"
@@ -168,6 +169,10 @@ SymIndexId SymbolCache::findSymbolByTypeIndex(codeview::TypeIndex Index) {
   case codeview::LF_ENUM:
     Id = createSymbolForType<NativeTypeEnum, EnumRecord>(Index, std::move(CVT));
     break;
+  case codeview::LF_ARRAY:
+    Id = createSymbolForType<NativeTypeArray, ArrayRecord>(Index,
+                                                           std::move(CVT));
+    break;
   case codeview::LF_CLASS:
   case codeview::LF_STRUCTURE:
   case codeview::LF_INTERFACE:
diff --git a/llvm/test/DebugInfo/PDB/Inputs/every-array.cpp b/llvm/test/DebugInfo/PDB/Inputs/every-array.cpp
new file mode 100644
index 0000000..28e07a0
--- /dev/null
+++ b/llvm/test/DebugInfo/PDB/Inputs/every-array.cpp
@@ -0,0 +1,37 @@
+// Build with "cl.exe /Zi /GR- /GX- every-array.cpp /link /debug /nodefaultlib /entry:main"
+
+// clang-format off
+void *__purecall = 0;
+
+void __cdecl operator delete(void *,unsigned int) {}
+void __cdecl operator delete(void *,unsigned __int64) {}
+
+
+int func1() { return 42; }
+int func2() { return 43; }
+int func3() { return 44; }
+
+template<typename T>
+void Reference(T &t) { }
+
+int IA[3] = {1, 2, 3};
+const int CIA[3] = {1, 2, 3};
+volatile int VIA[3] = {1, 2, 3};
+
+using FuncPtr = decltype(&func1);
+FuncPtr FA[3] = {&func1, &func2, &func3};
+
+struct S {
+  int N;
+  int f() const { return 42; }
+};
+
+using MemDataPtr = decltype(&S::N);
+using MemFunPtr = decltype(&S::f);
+
+MemDataPtr MDA[1] = {&S::N};
+MemFunPtr MFA[1] = {&S::f};
+
+
+int main(int argc, char **argv) {
+}
diff --git a/llvm/test/DebugInfo/PDB/Inputs/every-array.pdb b/llvm/test/DebugInfo/PDB/Inputs/every-array.pdb
new file mode 100644
index 0000000000000000000000000000000000000000..a3a84b1002dd2c3d9aaed0edf717e07f7eafa023
GIT binary patch
literal 73728
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

literal 0
HcmV?d00001

diff --git a/llvm/tools/llvm-pdbutil/PrettyTypeDumper.cpp b/llvm/tools/llvm-pdbutil/PrettyTypeDumper.cpp
index 2de2403..6f92452 100644
--- a/llvm/tools/llvm-pdbutil/PrettyTypeDumper.cpp
+++ b/llvm/tools/llvm-pdbutil/PrettyTypeDumper.cpp
@@ -19,6 +19,7 @@
 
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolTypeArray.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h"
@@ -201,6 +202,9 @@ void TypeDumper::start(const PDBSymbolExe &Exe) {
   if (opts::pretty::Typedefs)
     dumpSymbolCategory<PDBSymbolTypeTypedef>(Printer, Exe, *this, "Typedefs");
 
+  if (opts::pretty::Arrays)
+    dumpSymbolCategory<PDBSymbolTypeArray>(Printer, Exe, *this, "Arrays");
+
   if (opts::pretty::Pointers)
     dumpSymbolCategory<PDBSymbolTypePointer>(Printer, Exe, *this, "Pointers");
 
@@ -284,6 +288,15 @@ void TypeDumper::dump(const PDBSymbolTypeTypedef &Symbol) {
   Dumper.start(Symbol);
 }
 
+void TypeDumper::dump(const PDBSymbolTypeArray &Symbol) {
+  auto ElementType = Symbol.getElementType();
+
+  ElementType->dump(*this);
+  Printer << "[";
+  WithColor(Printer, PDB_ColorItem::LiteralValue).get() << Symbol.getCount();
+  Printer << "]";
+}
+
 void TypeDumper::dump(const PDBSymbolTypeFunctionSig &Symbol) {
   FunctionDumper Dumper(Printer);
   Dumper.start(Symbol, nullptr, FunctionDumper::PointerType::None);
diff --git a/llvm/tools/llvm-pdbutil/PrettyTypeDumper.h b/llvm/tools/llvm-pdbutil/PrettyTypeDumper.h
index cb6fcb1..e63ebe0 100644
--- a/llvm/tools/llvm-pdbutil/PrettyTypeDumper.h
+++ b/llvm/tools/llvm-pdbutil/PrettyTypeDumper.h
@@ -26,6 +26,7 @@ public:
   void dump(const PDBSymbolTypeEnum &Symbol) override;
   void dump(const PDBSymbolTypeTypedef &Symbol) override;
   void dump(const PDBSymbolTypeFunctionSig &Symbol) override;
+  void dump(const PDBSymbolTypeArray &Symbol) override;
   void dump(const PDBSymbolTypeBuiltin &Symbol) override;
   void dump(const PDBSymbolTypePointer &Symbol) override;
 
diff --git a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
index c9162dd..f71ff9f 100644
--- a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
+++ b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
@@ -193,6 +193,8 @@ static cl::opt<bool> Compilands("compilands",
 static cl::opt<bool> Funcsigs("funcsigs",
                               cl::desc("Dump function signature information"),
                               cl::sub(DiaDumpSubcommand));
+static cl::opt<bool> Arrays("arrays", cl::desc("Dump array types"),
+                            cl::sub(DiaDumpSubcommand));
 } // namespace diadump
 
 namespace pretty {
@@ -245,6 +247,8 @@ cl::opt<bool> Funcsigs("funcsigs", cl::desc("Display function signatures"),
                        cl::cat(TypeCategory), cl::sub(PrettySubcommand));
 cl::opt<bool> Pointers("pointers", cl::desc("Display pointer types"),
                        cl::cat(TypeCategory), cl::sub(PrettySubcommand));
+cl::opt<bool> Arrays("arrays", cl::desc("Display arrays"),
+                     cl::cat(TypeCategory), cl::sub(PrettySubcommand));
 
 cl::opt<SymbolSortMode> SymbolOrder(
     "symbol-order", cl::desc("symbol sort order"),
@@ -1015,7 +1019,8 @@ static void dumpDia(StringRef Path) {
     SymTypes.push_back(PDB_SymType::UDT);
   if (opts::diadump::Funcsigs)
     SymTypes.push_back(PDB_SymType::FunctionSig);
-
+  if (opts::diadump::Arrays)
+    SymTypes.push_back(PDB_SymType::ArrayType);
   PdbSymbolIdField Ids = opts::diadump::NoSymIndexIds ? PdbSymbolIdField::None
                                                       : PdbSymbolIdField::All;
   PdbSymbolIdField Recurse = PdbSymbolIdField::None;
@@ -1182,7 +1187,8 @@ static void dumpPretty(StringRef Path) {
   }
 
   if (opts::pretty::Classes || opts::pretty::Enums || opts::pretty::Typedefs ||
-      opts::pretty::Funcsigs || opts::pretty::Pointers) {
+      opts::pretty::Funcsigs || opts::pretty::Pointers ||
+      opts::pretty::Arrays) {
     Printer.NewLine();
     WithColor(Printer, PDB_ColorItem::SectionHeader).get() << "---TYPES---";
     Printer.Indent();
@@ -1275,6 +1281,7 @@ static void dumpPretty(StringRef Path) {
       dumpInjectedSources(Printer, *Session);
   }
 
+  Printer.NewLine();
   outs().flush();
 }
 
diff --git a/llvm/tools/llvm-pdbutil/llvm-pdbutil.h b/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
index eaedb1a..cbccac2 100644
--- a/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
+++ b/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
@@ -83,6 +83,7 @@ extern llvm::cl::opt<bool> Globals;
 extern llvm::cl::opt<bool> Classes;
 extern llvm::cl::opt<bool> Enums;
 extern llvm::cl::opt<bool> Funcsigs;
+extern llvm::cl::opt<bool> Arrays;
 extern llvm::cl::opt<bool> Typedefs;
 extern llvm::cl::opt<bool> Pointers;
 extern llvm::cl::opt<bool> All;
-- 
2.7.4