Fix broken build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@303711 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner 2017-05-24 00:35:32 +00:00
parent c49b255f5f
commit 819a5c68c5
2 changed files with 3 additions and 4 deletions

View File

@ -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()));
}
}

View File

@ -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));
}
}