summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Ganea <alexandre.ganea@ubisoft.com>2018-09-10 14:07:11 +0000
committerAlexandre Ganea <alexandre.ganea@ubisoft.com>2018-09-10 14:07:11 +0000
commit472e9b0ab20abb211b4a04dbacb5c5dfe424fa7f (patch)
tree9262740adb9b38e264cf1bf2b4f9118605f9df42
parent07d106db18ecca848cbcf425a305cf500445025c (diff)
downloadbcm5719-llvm-472e9b0ab20abb211b4a04dbacb5c5dfe424fa7f.tar.gz
bcm5719-llvm-472e9b0ab20abb211b4a04dbacb5c5dfe424fa7f.zip
Buildfix for r341825
llvm-svn: 341827
-rw-r--r--lld/COFF/PDB.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp
index bb6d246fa11..e50a09c34f2 100644
--- a/lld/COFF/PDB.cpp
+++ b/lld/COFF/PDB.cpp
@@ -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));
}
OpenPOWER on IntegriCloud