Revert "[pdb] Actually write a PDB to disk from YAML."

This reverts commit 879139e1c6577b09df52de56a6bab856a19ed185.

This was committed accidentally when I blindly typed git svn
dcommit instead of the command to generate a patch.

llvm-svn: 272693

1 files changed, 26 insertions, 18 deletions

diff --git a/llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp b/llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp
index a0cabb7a366..d60ccd7ebbd 100644
--- a/llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp
@@ -24,18 +24,19 @@ Error YAMLOutputStyle::dumpFileHeaders() {
     return Error::success();
 
   yaml::MsfHeaders Headers;
-  Obj.Headers.SuperBlock.NumBlocks = File.getBlockCount();
-  Obj.Headers.SuperBlock.BlockMapAddr = File.getBlockMapIndex();
-  Obj.Headers.BlockMapOffset = File.getBlockMapOffset();
-  Obj.Headers.SuperBlock.BlockSize = File.getBlockSize();
+  Headers.BlockCount = File.getBlockCount();
+  Headers.BlockMapIndex = File.getBlockMapIndex();
+  Headers.BlockMapOffset = File.getBlockMapOffset();
+  Headers.BlockSize = File.getBlockSize();
   auto Blocks = File.getDirectoryBlockArray();
-  Obj.Headers.DirectoryBlocks.assign(Blocks.begin(), Blocks.end());
-  Obj.Headers.NumDirectoryBlocks = File.getNumDirectoryBlocks();
-  Obj.Headers.SuperBlock.NumDirectoryBytes = File.getNumDirectoryBytes();
-  Obj.Headers.NumStreams = File.getNumStreams();
-  Obj.Headers.SuperBlock.Unknown0 = File.getUnknown0();
-  Obj.Headers.SuperBlock.Unknown1 = File.getUnknown1();
-  Obj.Headers.FileSize = File.getFileSize();
+  Headers.DirectoryBlocks.assign(Blocks.begin(), Blocks.end());
+  Headers.NumDirectoryBlocks = File.getNumDirectoryBlocks();
+  Headers.NumDirectoryBytes = File.getNumDirectoryBytes();
+  Headers.NumStreams = File.getNumStreams();
+  Headers.Unknown0 = File.getUnknown0();
+  Headers.Unknown1 = File.getUnknown1();
+
+  Obj.Headers.emplace(Headers);
 
   return Error::success();
 }
@@ -44,7 +45,13 @@ Error YAMLOutputStyle::dumpStreamSummary() {
   if (!opts::DumpStreamSummary)
     return Error::success();
 
-  Obj.StreamSizes = File.getStreamSizes();
+  std::vector<yaml::StreamSizeEntry> Sizes;
+  for (uint32_t I = 0; I < File.getNumStreams(); ++I) {
+    yaml::StreamSizeEntry Entry;
+    Entry.Size = File.getStreamByteSize(I);
+    Sizes.push_back(Entry);
+  }
+  Obj.StreamSizes.emplace(Sizes);
   return Error::success();
 }
 
@@ -52,13 +59,14 @@ Error YAMLOutputStyle::dumpStreamBlocks() {
   if (!opts::DumpStreamBlocks)
     return Error::success();
 
-  auto StreamMap = File.getStreamMap();
-  Obj.StreamMap.emplace();
-  for (auto &Stream : StreamMap) {
-    pdb::yaml::StreamBlockList BlockList;
-    BlockList.Blocks = Stream;
-    Obj.StreamMap->push_back(BlockList);
+  std::vector<yaml::StreamMapEntry> Blocks;
+  for (uint32_t I = 0; I < File.getNumStreams(); ++I) {
+    yaml::StreamMapEntry Entry;
+    auto BlockList = File.getStreamBlockList(I);
+    Entry.Blocks.assign(BlockList.begin(), BlockList.end());
+    Blocks.push_back(Entry);
   }
+  Obj.StreamMap.emplace(Blocks);
 
   return Error::success();
 }