This fixes a crash when a second pass is required for the Codeview Type merging *and* the index points outside of the table (which should lead to an error being printed).

This occurs currently until MS precompiled headers .obj is added (see D45213)

Differential Revision: https://reviews.llvm.org/D50006

llvm-svn: 338308
This commit is contained in:
Alexandre Ganea 2018-07-30 21:14:25 +00:00
parent f07c5a0e9c
commit 0bb8e89187
1 changed files with 4 additions and 1 deletions

View File

@ -226,7 +226,10 @@ bool TypeStreamMerger::remapIndexFallback(TypeIndex &Idx,
if (IsSecondPass && MapPos >= Map.size()) {
// FIXME: Print a more useful error. We can give the current record and the
// index that we think its pointing to.
LastError = joinErrors(std::move(*LastError), errorCorruptRecord());
if (LastError)
LastError = joinErrors(std::move(*LastError), errorCorruptRecord());
else
LastError = errorCorruptRecord();
}
++NumBadIndices;