Fix broken build.

llvm-svn: 303711

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

@@ -858,12 +858,12 @@ static void mergePdbs() {
     if (File.hasPDBTpiStream()) {
       auto &Tpi = ExitOnErr(File.getPDBTpiStream());
       ExitOnErr(codeview::mergeTypeRecords(MergedTpi, TypeMap, nullptr,
-                                           Tpi.typeCollection()));
+                                           Tpi.typeArray()));
     }
     if (File.hasPDBIpiStream()) {
       auto &Ipi = ExitOnErr(File.getPDBIpiStream());
       ExitOnErr(codeview::mergeIdRecords(MergedIpi, TypeMap, IdMap,
-                                         Ipi.typeCollection()));
+                                         Ipi.typeArray()));
     }
   }
 

llvm/tools/llvm-readobj/COFFDumper.cpp

@@ -1072,10 +1072,9 @@ void COFFDumper::mergeCodeViewTypes(TypeTableBuilder &CVIDs,
         W.flush();
         error(object_error::parse_failed);
       }
-      LazyRandomTypeCollection TypesAndIds(Types, 100);
       SmallVector<TypeIndex, 128> SourceToDest;
       if (auto EC = mergeTypeAndIdRecords(CVIDs, CVTypes, SourceToDest, nullptr,
-                                          TypesAndIds))
+                                          Types))
         return error(std::move(EC));
     }
   }