[PATCH] D31316: [PDB] Split item and type records when merging type streams

[Rui Ueyama via Phabricator via llvm-commits]

ruiu accepted this revision.
ruiu added a comment.
This revision is now accepted and ready to land.

LGTM. Only a minor cosmetic comments.



================
Comment at: lld/COFF/PDB.cpp:97
 
+  BinaryByteStream Stream(Data, llvm::support::little);
+  codeview::CVTypeArray Records;
----------------
Remove `llvm::`.


================
Comment at: lld/COFF/PDB.cpp:216
 
-  // Add an empty TPI stream.
-  auto &TpiBuilder = Builder.getTpiBuilder();
-  TpiBuilder.setVersionHeader(pdb::PdbTpiV80);
-  std::vector<uint8_t> TpiData;
-  if (Config->DebugPdb) {
-    TpiData = mergeDebugT(Symtab);
-    addTypeInfo(TpiBuilder, TpiData);
-  }
-
-  // Add an empty IPI stream.
-  auto &IpiBuilder = Builder.getIpiBuilder();
-  IpiBuilder.setVersionHeader(pdb::PdbTpiV80);
+  std::vector<uint8_t> TpiData, IpiData;
+  mergeDebugT(Symtab, Builder, TpiData, IpiData);
----------------
nit: write it in two lines.


================
Comment at: llvm/tools/llvm-readobj/ObjDumper.h:13
 
+#include "llvm/ADT/StringRef.h"
 #include <memory>
----------------
Do you need this?


https://reviews.llvm.org/D31316