Re-land "[PDB] Avoid calling discoverTypeIndices for a known record k…

…ind" Fixed bad usage of slice API causing assertion failures. Reverts 810c8e9 Reinstates bd7ea86
llvm · May 3, 2020 · 1e57933 · 1e57933
1 parent 5070cec
commit 1e57933
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp
@@ -726,10 +726,9 @@ static void translateIdSymbols(MutableArrayRef<uint8_t> &recordData,
     // in both cases we just need the second type index.
     if (!ti->isSimple() && !ti->isNoneType()) {
       CVType funcIdData = iDTable.getType(*ti);
-      SmallVector<TypeIndex, 2> indices;
-      discoverTypeIndices(funcIdData, indices);
-      assert(indices.size() == 2);
-      *ti = indices[1];
+      ArrayRef<uint8_t> tiBuf = funcIdData.data().slice(8, 4);
+      assert(tiBuf.size() == 4 && "corruct LF_[MEM]FUNC_ID record");
+      *ti = *reinterpret_cast<const TypeIndex *>(tiBuf.data());
     }
 
     kind = (kind == SymbolKind::S_GPROC32_ID) ? SymbolKind::S_GPROC32