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

1 files changed, 8 insertions, 17 deletions

diff --git a/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp b/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp
index c731b68625c..d723282eb71 100644
--- a/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp
+++ b/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp
@@ -46,15 +46,12 @@ DebugStringTableSubsection::DebugStringTableSubsection()
     : DebugSubsection(DebugSubsectionKind::StringTable) {}
 
 uint32_t DebugStringTableSubsection::insert(StringRef S) {
-  auto P = StringToId.insert({S, StringSize});
+  auto P = Strings.insert({S, StringSize});
 
   // If a given string didn't exist in the string table, we want to increment
-  // the string table size and insert it into the reverse lookup.
-  if (P.second) {
-    IdToString.insert({P.first->getValue(), P.first->getKey()});
+  // the string table size.
+  if (P.second)
     StringSize += S.size() + 1; // +1 for '\0'
-  }
-
   return P.first->second;
 }
 
@@ -70,7 +67,7 @@ Error DebugStringTableSubsection::commit(BinaryStreamWriter &Writer) const {
   if (auto EC = Writer.writeCString(StringRef()))
     return EC;
 
-  for (auto &Pair : StringToId) {
+  for (auto &Pair : Strings) {
     StringRef S = Pair.getKey();
     uint32_t Offset = Begin + Pair.getValue();
     Writer.setOffset(Offset);
@@ -84,16 +81,10 @@ Error DebugStringTableSubsection::commit(BinaryStreamWriter &Writer) const {
   return Error::success();
 }
 
-uint32_t DebugStringTableSubsection::size() const { return StringToId.size(); }
-
-uint32_t DebugStringTableSubsection::getIdForString(StringRef S) const {
-  auto Iter = StringToId.find(S);
-  assert(Iter != StringToId.end());
-  return Iter->second;
-}
+uint32_t DebugStringTableSubsection::size() const { return Strings.size(); }
 
-StringRef DebugStringTableSubsection::getStringForId(uint32_t Id) const {
-  auto Iter = IdToString.find(Id);
-  assert(Iter != IdToString.end());
+uint32_t DebugStringTableSubsection::getStringId(StringRef S) const {
+  auto Iter = Strings.find(S);
+  assert(Iter != Strings.end());
   return Iter->second;
 }