maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Buildfix for r341825 

llvm-svn: 341827
This commit is contained in:
Alexandre Ganea 2018-09-10 14:07:11 +00:00
parent 07d106db18
commit 472e9b0ab2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/COFF/PDB.cpp
View File

@ -340,8 +340,8 @@ Expected<const CVIndexMap&> PDBLinker::maybeMergeTypeServerPDB(ObjFile *File,
auto PrevErr = MissingTypeServerPDBs.find(TSId);
if (PrevErr != MissingTypeServerPDBs.end())
return createFileError(
TSPath, std::move(make_error<StringError>(PrevErr->second,
inconvertibleErrorCode())));
TSPath,
make_error<StringError>(PrevErr->second, inconvertibleErrorCode()));
// Second, check if we already loaded a PDB with this GUID. Return the type
// index mapping if we have it.
@ -384,7 +384,7 @@ Expected<const CVIndexMap&> PDBLinker::maybeMergeTypeServerPDB(ObjFile *File,
std::string ErrMsg;
raw_string_ostream S(ErrMsg);
S << E;
auto It = MissingTypeServerPDBs.emplace(TSId, S.str());
MissingTypeServerPDBs.emplace(TSId, S.str());
return createFileError(TSPath, std::move(E));
}