[PDB] Drop LF_PRECOMP from debugTypes earlier
authorReid Kleckner <rnk@google.com>
Wed, 16 Sep 2020 01:50:34 +0000 (18:50 -0700)
committerReid Kleckner <rnk@google.com>
Wed, 16 Sep 2020 01:50:37 +0000 (18:50 -0700)
This is a minor simplification to avoid firing up a BinaryStreamReader
and CVType parser.

lld/COFF/DebugTypes.cpp
lld/COFF/InputFiles.cpp

index b8c488f..3a9bd83 100644 (file)
@@ -447,16 +447,6 @@ UsePrecompSource::mergeDebugT(TypeMerger *m, CVIndexMap *indexMap) {
   if (!e)
     return e.takeError();
 
-  // Drop LF_PRECOMP record from the input stream, as it has been replaced
-  // with the precompiled headers Type stream in the mergeInPrecompHeaderObj()
-  // call above. Note that we can't just call Types.drop_front(), as we
-  // explicitly want to rebase the stream.
-  CVTypeArray types;
-  BinaryStreamReader reader(file->debugTypes, support::little);
-  cantFail(reader.readArray(types, reader.getLength()));
-  auto firstType = types.begin();
-  file->debugTypes = file->debugTypes.drop_front(firstType->RecordData.size());
-
   return TpiSource::mergeDebugT(m, indexMap);
 }
 
index a692dfe..6522d68 100644 (file)
@@ -821,6 +821,8 @@ void ObjFile::initializeDependencies() {
     PrecompRecord precomp = cantFail(
         TypeDeserializer::deserializeAs<PrecompRecord>(firstType->data()));
     debugTypesObj = makeUsePrecompSource(this, precomp);
+    // Drop the LF_PRECOMP record from the input stream.
+    debugTypes = debugTypes.drop_front(firstType->RecordData.size());
     return;
   }