commit 0085dce221b820f4287b6a2bbf428500501ece39
author Zachary Turner <zturner@google.com> Wed Jun 14 06:24:24 2017 +0000
committer Zachary Turner <zturner@google.com> Wed Jun 14 06:24:24 2017 +0000
tree 9db447d1534241dbb854f7fe446b332392405a0a
parent 9cac9ad9d4b835f7f1da76dde865e358363e1e75

Revert "[codeview] Make obj2yaml/yaml2obj support .debug$S..."

This is causing failures on linux bots with an invalid stream
read.  It doesn't repro in any configuration on Windows, so
reverting until I have a chance to investigate on Linux.

llvm-svn: 305371

llvm/tools/llvm-pdbutil/YAMLOutputStyle.cpp

diff --git a/llvm/tools/llvm-pdbutil/YAMLOutputStyle.cpp b/llvm/tools/llvm-pdbutil/YAMLOutputStyle.cpp
index 8f7aba6..4ab7cd3 100644
--- a/llvm/tools/llvm-pdbutil/YAMLOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbutil/YAMLOutputStyle.cpp
@@ -18,7 +18,6 @@
 #include "llvm/DebugInfo/CodeView/DebugSubsection.h"
 #include "llvm/DebugInfo/CodeView/DebugUnknownSubsection.h"
 #include "llvm/DebugInfo/CodeView/Line.h"
-#include "llvm/DebugInfo/CodeView/StringsAndChecksums.h"
 #include "llvm/DebugInfo/MSF/MappedBlockStream.h"
 #include "llvm/DebugInfo/PDB/Native/DbiStream.h"
 #include "llvm/DebugInfo/PDB/Native/InfoStream.h"
@@ -237,16 +236,14 @@
         if (!ExpectedChecksums)
           return ExpectedChecksums.takeError();
 
-        StringsAndChecksumsRef SC(ExpectedST->getStringTable(),
-                                  *ExpectedChecksums);
-
         for (const auto &SS : ModS.subsections()) {
           opts::ModuleSubsection OptionKind = convertSubsectionKind(SS.kind());
           if (!opts::checkModuleSubsection(OptionKind))
             continue;
 
           auto Converted =
-              CodeViewYAML::YAMLDebugSubsection::fromCodeViewSubection(SC, SS);
+              CodeViewYAML::YAMLDebugSubsection::fromCodeViewSubection(
+                  ExpectedST->getStringTable(), *ExpectedChecksums, SS);
           if (!Converted)
             return Converted.takeError();
           DMI.Subsections.push_back(*Converted);