diff options
| author | Frederic Riss <friss@apple.com> | 2015-08-31 05:16:35 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2015-08-31 05:16:35 +0000 |
| commit | afeac301b1acd4acf787b1f613addbb1136c1908 (patch) | |
| tree | e7dd011eb262ccaea91d0c1914404541bdff90d5 /llvm/tools | |
| parent | 4e289f9d1e59d852d35d25120c1fa37bc07ba292 (diff) | |
| download | bcm5719-llvm-afeac301b1acd4acf787b1f613addbb1136c1908.tar.gz bcm5719-llvm-afeac301b1acd4acf787b1f613addbb1136c1908.zip | |
[dsymutil] Do not mistakenly reuse the current object file when the next one isn't found.
llvm-svn: 246412
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/dsymutil/DwarfLinker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp index f3e48f5033e..ed06dba8ab3 100644 --- a/llvm/tools/dsymutil/DwarfLinker.cpp +++ b/llvm/tools/dsymutil/DwarfLinker.cpp @@ -2942,8 +2942,10 @@ DwarfLinker::loadObject(BinaryHolder &BinaryHolder, DebugMapObject &Obj, const DebugMap &Map) { auto ErrOrObjs = BinaryHolder.GetObjectFiles(Obj.getObjectFilename(), Obj.getTimestamp()); - if (std::error_code EC = ErrOrObjs.getError()) + if (std::error_code EC = ErrOrObjs.getError()) { reportWarning(Twine(Obj.getObjectFilename()) + ": " + EC.message()); + return EC; + } auto ErrOrObj = BinaryHolder.Get(Map.getTriple()); if (std::error_code EC = ErrOrObj.getError()) reportWarning(Twine(Obj.getObjectFilename()) + ": " + EC.message()); |
