Revert "Resubmit "Support embedding natvis files in PDBs.""

This is still failing on a different bot this time due to some
issue related to hashing absolute paths.  Reverting until I can
figure it out.

llvm-svn: 328014

4 files changed, 0 insertions, 35 deletions

diff --git a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
index d070e5b4aea..365386f0a27 100644
--- a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
@@ -90,12 +90,6 @@ Error DumpOutputStyle::dump() {
     P.NewLine();
   }
 
-  if (opts::dump::DumpNamedStreams) {
-    if (auto EC = dumpNamedStreams())
-      return EC;
-    P.NewLine();
-  }
-
   if (opts::dump::DumpStringTable) {
     if (auto EC = dumpStringTable())
       return EC;
@@ -915,29 +909,6 @@ Error DumpOutputStyle::dumpStringTableFromObj() {
   return Error::success();
 }
 
-Error DumpOutputStyle::dumpNamedStreams() {
-  printHeader(P, "Named Streams");
-  AutoIndent Indent(P, 2);
-
-  if (File.isObj()) {
-    P.formatLine("Dumping Named Streams is only supported for PDB files.");
-    return Error::success();
-  }
-  ExitOnError Err("Invalid PDB File: ");
-
-  auto &IS = Err(File.pdb().getPDBInfoStream());
-  const NamedStreamMap &NS = IS.getNamedStreams();
-  for (const auto &Entry : NS.entries()) {
-    P.printLine(Entry.getKey());
-    AutoIndent Indent2(P, 2);
-    P.formatLine("Index: {0}", Entry.getValue());
-    P.formatLine("Size in bytes: {0}",
-                 File.pdb().getStreamByteSize(Entry.getValue()));
-  }
-
-  return Error::success();
-}
-
 Error DumpOutputStyle::dumpStringTable() {
   printHeader(P, "String Table");
 
diff --git a/llvm/tools/llvm-pdbutil/DumpOutputStyle.h b/llvm/tools/llvm-pdbutil/DumpOutputStyle.h
index 36d8b13bde0..fad304c470c 100644
--- a/llvm/tools/llvm-pdbutil/DumpOutputStyle.h
+++ b/llvm/tools/llvm-pdbutil/DumpOutputStyle.h
@@ -74,7 +74,6 @@ private:
   Error dumpStreamSummary();
   Error dumpSymbolStats();
   Error dumpUdtStats();
-  Error dumpNamedStreams();
   Error dumpStringTable();
   Error dumpStringTableFromPdb();
   Error dumpStringTableFromObj();
diff --git a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
index b1749d9ded6..25e0ddf5baa 100644
--- a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
+++ b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
@@ -534,10 +534,6 @@ cl::opt<bool> JustMyCode("jmc", cl::Optional,
                          cl::cat(FileOptions), cl::sub(DumpSubcommand));
 
 // MISCELLANEOUS OPTIONS
-cl::opt<bool> DumpNamedStreams("named-streams",
-                               cl::desc("dump PDB named stream table"),
-                               cl::cat(MiscOptions), cl::sub(DumpSubcommand));
-
 cl::opt<bool> DumpStringTable("string-table", cl::desc("dump PDB String Table"),
                               cl::cat(MiscOptions), cl::sub(DumpSubcommand));
 
diff --git a/llvm/tools/llvm-pdbutil/llvm-pdbutil.h b/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
index 1c9f299ab1a..3ce03d5880a 100644
--- a/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
+++ b/llvm/tools/llvm-pdbutil/llvm-pdbutil.h
@@ -142,7 +142,6 @@ extern llvm::cl::opt<bool> DumpLines;
 extern llvm::cl::opt<bool> DumpInlineeLines;
 extern llvm::cl::opt<bool> DumpXmi;
 extern llvm::cl::opt<bool> DumpXme;
-extern llvm::cl::opt<bool> DumpNamedStreams;
 extern llvm::cl::opt<bool> DumpStringTable;
 extern llvm::cl::opt<bool> DumpTypes;
 extern llvm::cl::opt<bool> DumpTypeData;