From eb271e82ff427f0796db172f40535dd9fb01104c Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Fri, 27 Oct 2017 00:45:51 +0000
Subject: [PATCH] [PDB] Handle an empty globals hash table with no buckets

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316722 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/DebugInfo/PDB/Native/GlobalsStream.cpp          |   5 +++--
 test/DebugInfo/PDB/Inputs/pdbdump-globals-empty.pdb | Bin 0 -> 86016 bytes
 test/DebugInfo/PDB/pdbdump-globals-empty.test       |   6 ++++++
 tools/llvm-pdbutil/DumpOutputStyle.cpp              |   6 ++++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 test/DebugInfo/PDB/Inputs/pdbdump-globals-empty.pdb
 create mode 100644 test/DebugInfo/PDB/pdbdump-globals-empty.test

diff --git a/lib/DebugInfo/PDB/Native/GlobalsStream.cpp b/lib/DebugInfo/PDB/Native/GlobalsStream.cpp
index 1fe35a691c3..97bbbebd575 100644
--- a/lib/DebugInfo/PDB/Native/GlobalsStream.cpp
+++ b/lib/DebugInfo/PDB/Native/GlobalsStream.cpp
@@ -117,7 +117,8 @@ Error GSIHashTable::read(BinaryStreamReader &Reader) {
     return EC;
   if (auto EC = readGSIHashRecords(HashRecords, HashHdr, Reader))
     return EC;
-  if (auto EC = readGSIHashBuckets(HashBuckets, HashBitmap, HashHdr, Reader))
-    return EC;
+  if (HashHdr->HrSize > 0)
+    if (auto EC = readGSIHashBuckets(HashBuckets, HashBitmap, HashHdr, Reader))
+      return EC;
   return Error::success();
 }
diff --git a/test/DebugInfo/PDB/Inputs/pdbdump-globals-empty.pdb b/test/DebugInfo/PDB/Inputs/pdbdump-globals-empty.pdb
new file mode 100644
index 0000000000000000000000000000000000000000..a688d399895b6ad333f4e9fcfa0bc7b79cff37ad
GIT binary patch
literal 86016
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

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/PDB/pdbdump-globals-empty.test b/test/DebugInfo/PDB/pdbdump-globals-empty.test
new file mode 100644
index 00000000000..59a06ea5e85
--- /dev/null
+++ b/test/DebugInfo/PDB/pdbdump-globals-empty.test
@@ -0,0 +1,6 @@
+RUN: llvm-pdbutil dump -globals %S/Inputs/pdbdump-globals-empty.pdb | FileCheck %s
+
+CHECK:                        Global Symbols
+CHECK: ============================================================
+CHECK:   Records
+CHECK-NOT: S_
diff --git a/tools/llvm-pdbutil/DumpOutputStyle.cpp b/tools/llvm-pdbutil/DumpOutputStyle.cpp
index 8a4d21b27ba..5b02d68bc7a 100644
--- a/tools/llvm-pdbutil/DumpOutputStyle.cpp
+++ b/tools/llvm-pdbutil/DumpOutputStyle.cpp
@@ -639,9 +639,11 @@ Error DumpOutputStyle::dumpUdtStats() {
     }
 
     auto &SymbolRecords = cantFail(getPdb().getPDBSymbolStream());
-    auto &Globals = cantFail(getPdb().getPDBGlobalsStream());
+    auto ExpGlobals = getPdb().getPDBGlobalsStream();
+    if (!ExpGlobals)
+      return ExpGlobals.takeError();
 
-    for (uint32_t PubSymOff : Globals.getGlobalsTable()) {
+    for (uint32_t PubSymOff : ExpGlobals->getGlobalsTable()) {
       CVSymbol Sym = SymbolRecords.readRecord(PubSymOff);
       HandleOneSymbol(Sym);
     }
-- 
2.11.0