Revert "Reapply "[PDB][llvm-pdbutil] Add DXContainer support for pdb2yaml and yaml2pdb"" (llvm#200588)

Reverts llvm#200413

Breaks build bots:

https://lab.llvm.org/buildbot/#/builders/169/builds/23142
https://lab.llvm.org/buildbot/#/builders/25/builds/18082

Author: vitalybuka

llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h

@@ -11,7 +11,6 @@
 
 #include "llvm/DebugInfo/MSF/IMSFFile.h"
 #include "llvm/DebugInfo/MSF/MSFCommon.h"
-#include "llvm/Object/DXContainer.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/BinaryStreamRef.h"
 #include "llvm/Support/Compiler.h"
@@ -106,7 +105,6 @@ class LLVM_ABI PDBFile : public msf::IMSFFile {
   Expected<SymbolStream &> getPDBSymbolStream();
   Expected<PDBStringTable &> getStringTable();
   Expected<InjectedSourceStream &> getInjectedSourceStream();
-  Expected<object::DXContainer &> getDXContainerStream();
 
   BumpPtrAllocator &getAllocator() { return Allocator; }
 
@@ -135,7 +133,6 @@ class LLVM_ABI PDBFile : public msf::IMSFFile {
   std::unique_ptr<DbiStream> Dbi;
   std::unique_ptr<TpiStream> Tpi;
   std::unique_ptr<TpiStream> Ipi;
-  std::unique_ptr<object::DXContainer> Dxc;
   std::unique_ptr<PublicsStream> Publics;
   std::unique_ptr<SymbolStream> Symbols;
   std::unique_ptr<msf::MappedBlockStream> DirectoryStream;

llvm/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h

@@ -53,7 +53,6 @@ class PDBFileBuilder {
   LLVM_ABI TpiStreamBuilder &getIpiBuilder();
   LLVM_ABI PDBStringTableBuilder &getStringTableBuilder();
   LLVM_ABI GSIStreamBuilder &getGsiBuilder();
-  LLVM_ABI std::unique_ptr<SmallVector<char>> &getDXContainerData();
 
   // If HashPDBContentsToGUID is true on the InfoStreamBuilder, Guid is filled
   // with the computed PDB GUID on return.
@@ -97,9 +96,8 @@ class PDBFileBuilder {
   std::unique_ptr<GSIStreamBuilder> Gsi;
   std::unique_ptr<TpiStreamBuilder> Tpi;
   std::unique_ptr<TpiStreamBuilder> Ipi;
-  std::unique_ptr<SmallVector<char>> Dxc;
 
-  std::unique_ptr<PDBStringTableBuilder> Strings;
+  PDBStringTableBuilder Strings;
   StringTableHashTraits InjectedSourceHashTraits;
   HashTable<SrcHeaderBlockEntry> InjectedSourceTable;
 

llvm/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h

@@ -35,7 +35,6 @@ class PDBStringTableBuilder;
 struct StringTableHashTraits {
   PDBStringTableBuilder *Table;
 
-  LLVM_ABI StringTableHashTraits() = default;
   LLVM_ABI explicit StringTableHashTraits(PDBStringTableBuilder &Table);
   LLVM_ABI uint32_t hashLookupKey(StringRef S) const;
   LLVM_ABI StringRef storageKeyToLookupKey(uint32_t Offset) const;

llvm/include/llvm/DebugInfo/PDB/Native/RawConstants.h

@@ -80,10 +80,7 @@ enum SpecialStream : uint32_t {
   StreamDBI = 3,
   StreamIPI = 4,
 
-  kSpecialStreamCount = 5,
-  // Fixed index of DXContainer stream, but it's not one of the special
-  // streams and is produced only by DirectX tools.
-  StreamDXContainer = 5
+  kSpecialStreamCount
 };
 
 enum class DbgHeaderType : uint16_t {

llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp

@@ -398,28 +398,6 @@ Expected<InjectedSourceStream &> PDBFile::getInjectedSourceStream() {
   return *InjectedSources;
 }
 
-llvm::Expected<object::DXContainer &> PDBFile::getDXContainerStream() {
-  if (!Dxc) {
-    auto MBS = safelyCreateIndexedStream(StreamDXContainer);
-    if (!MBS)
-      return MBS.takeError();
-    auto StreamSize = getStreamByteSize(StreamDXContainer);
-    ArrayRef<uint8_t> StreamData;
-    auto Error = MBS->get()->readBytes(0, StreamSize, StreamData);
-    if (Error)
-      return Error;
-
-    StringRef Ref(reinterpret_cast<const char *>(StreamData.data()),
-                  StreamSize);
-    MemoryBufferRef MemBuf(Ref, "DXContainerStream");
-    auto DXC = object::DXContainer::create(MemBuf);
-    if (!DXC)
-      return DXC.takeError();
-    Dxc = std::make_unique<object::DXContainer>(std::move(*DXC));
-  }
-  return *Dxc;
-}
-
 uint32_t PDBFile::getPointerSize() {
   auto DbiS = getPDBDbiStream();
   if (!DbiS)
@@ -473,9 +451,7 @@ bool PDBFile::hasPDBSymbolStream() {
   return DbiS->getSymRecordStreamIndex() < getNumStreams();
 }
 
-bool PDBFile::hasPDBTpiStream() const {
-  return StreamTPI < getNumStreams() && getStreamByteSize(StreamTPI) != 0;
-}
+bool PDBFile::hasPDBTpiStream() const { return StreamTPI < getNumStreams(); }
 
 bool PDBFile::hasPDBStringTable() {
   auto IS = getPDBInfoStream();

llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp

@@ -40,7 +40,8 @@ class WritableBinaryStream;
 }
 
 PDBFileBuilder::PDBFileBuilder(BumpPtrAllocator &Allocator)
-    : Allocator(Allocator), InjectedSourceTable(2) {}
+    : Allocator(Allocator), InjectedSourceHashTraits(Strings),
+      InjectedSourceTable(2) {}
 
 PDBFileBuilder::~PDBFileBuilder() = default;
 
@@ -79,11 +80,7 @@ TpiStreamBuilder &PDBFileBuilder::getIpiBuilder() {
 }
 
 PDBStringTableBuilder &PDBFileBuilder::getStringTableBuilder() {
-  if (!Strings) {
-    Strings = std::make_unique<PDBStringTableBuilder>();
-    InjectedSourceHashTraits = StringTableHashTraits(*Strings);
-  }
-  return *Strings;
+  return Strings;
 }
 
 GSIStreamBuilder &PDBFileBuilder::getGsiBuilder() {
@@ -92,12 +89,6 @@ GSIStreamBuilder &PDBFileBuilder::getGsiBuilder() {
   return *Gsi;
 }
 
-std::unique_ptr<SmallVector<char>> &PDBFileBuilder::getDXContainerData() {
-  if (!Dxc)
-    Dxc = std::make_unique<SmallVector<char>>();
-  return Dxc;
-}
-
 Expected<uint32_t> PDBFileBuilder::allocateNamedStream(StringRef Name,
                                                        uint32_t Size) {
   auto ExpectedStream = Msf->addStream(Size);
@@ -149,14 +140,11 @@ Error PDBFileBuilder::finalizeMsfLayout() {
     Info.addFeature(PdbRaw_FeatureSig::VC140);
   }
 
-  if (Dxc) {
-    if (auto EC = Msf->setStreamSize(StreamDXContainer, Dxc->size()))
-      return EC;
-  } else {
-    Expected<uint32_t> SN = allocateNamedStream("/LinkInfo", 0);
-    if (!SN)
-      return SN.takeError();
-  }
+  uint32_t StringsLen = Strings.calculateSerializedSize();
+
+  Expected<uint32_t> SN = allocateNamedStream("/LinkInfo", 0);
+  if (!SN)
+    return SN.takeError();
 
   if (Gsi) {
     if (auto EC = Gsi->finalizeMsfLayout())
@@ -175,12 +163,10 @@ Error PDBFileBuilder::finalizeMsfLayout() {
     if (auto EC = Dbi->finalizeMsfLayout())
       return EC;
   }
-  if (Strings) {
-    uint32_t StringsLen = Strings->calculateSerializedSize();
-    Expected<uint32_t> SN = allocateNamedStream("/names", StringsLen);
-    if (!SN)
-      return SN.takeError();
-  }
+  SN = allocateNamedStream("/names", StringsLen);
+  if (!SN)
+    return SN.takeError();
+
   if (Ipi) {
     if (auto EC = Ipi->finalizeMsfLayout())
       return EC;
@@ -217,8 +203,7 @@ Error PDBFileBuilder::finalizeMsfLayout() {
     uint32_t SrcHeaderBlockSize =
         sizeof(SrcHeaderBlockHeader) +
         InjectedSourceTable.calculateSerializedLength();
-    Expected<uint32_t> SN =
-        allocateNamedStream("/src/headerblock", SrcHeaderBlockSize);
+    SN = allocateNamedStream("/src/headerblock", SrcHeaderBlockSize);
     if (!SN)
       return SN.takeError();
     for (const auto &IS : InjectedSources) {
@@ -297,17 +282,16 @@ Error PDBFileBuilder::commit(StringRef Filename, codeview::GUID *Guid) {
     return ExpectedMsfBuffer.takeError();
   FileBufferByteStream Buffer = std::move(*ExpectedMsfBuffer);
 
-  if (Strings) {
-    auto ExpectedSN = getNamedStreamIndex("/names");
-    if (!ExpectedSN)
-      return ExpectedSN.takeError();
+  auto ExpectedSN = getNamedStreamIndex("/names");
+  if (!ExpectedSN)
+    return ExpectedSN.takeError();
+
+  auto NS = WritableMappedBlockStream::createIndexedStream(
+      Layout, Buffer, *ExpectedSN, Allocator);
+  BinaryStreamWriter NSWriter(*NS);
+  if (auto EC = Strings.commit(NSWriter))
+    return EC;
 
-    auto NS = WritableMappedBlockStream::createIndexedStream(
-        Layout, Buffer, *ExpectedSN, Allocator);
-    BinaryStreamWriter NSWriter(*NS);
-    if (auto EC = Strings->commit(NSWriter))
-      return EC;
-  }
   {
     llvm::TimeTraceScope timeScope("Named stream data");
     for (const auto &NSE : NamedStreamData) {
@@ -347,17 +331,6 @@ Error PDBFileBuilder::commit(StringRef Filename, codeview::GUID *Guid) {
       return EC;
   }
 
-  if (Dxc) {
-    llvm::TimeTraceScope timeScope("DXContainer stream");
-    auto DxcS = WritableMappedBlockStream::createIndexedStream(
-        Layout, Buffer, StreamDXContainer, Allocator);
-    BinaryStreamWriter Writer(*DxcS);
-    llvm::ArrayRef<uint8_t> DataRef(reinterpret_cast<uint8_t *>(Dxc->data()),
-                                    Dxc->size());
-    if (auto EC = Writer.writeBytes(DataRef))
-      return EC;
-  }
-
   auto InfoStreamBlocks = Layout.StreamMap[StreamPDB];
   assert(!InfoStreamBlocks.empty());
   uint64_t InfoStreamFileOffset =

llvm/test/tools/llvm-pdbutil/dxcontainer.test

@@ -112,7 +112,6 @@ void MappingTraits<PdbObject>::mapping(IO &IO, PdbObject &Obj) {
   IO.mapOptional("TpiStream", Obj.TpiStream);
   IO.mapOptional("IpiStream", Obj.IpiStream);
   IO.mapOptional("PublicsStream", Obj.PublicsStream);
-  IO.mapOptional("DXContainerStream", Obj.DXContainerStream);
 }
 
 void MappingTraits<MSFHeaders>::mapping(IO &IO, MSFHeaders &Obj) {
@@ -240,8 +239,3 @@ void MappingTraits<PdbDbiModuleInfo>::mapping(IO &IO, PdbDbiModuleInfo &Obj) {
   IO.mapOptional("Subsections", Obj.Subsections);
   IO.mapOptional("Modi", Obj.Modi);
 }
-
-void MappingTraits<PdbDXContainerStream>::mapping(
-    IO &IO, pdb::yaml::PdbDXContainerStream &Obj) {
-  IO.mapRequired("DXContainer", Obj.DXC);
-}