diff options
author | Kevin Enderby <enderby@apple.com> | 2016-10-21 20:03:14 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2016-10-21 20:03:14 +0000 |
commit | 2f9d8d07022fbc9884b4da84a934f06648736503 (patch) | |
tree | 4df1740e80a2954092920891679e486d37ae0e3f /llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp | |
parent | 42909a6f3af5579bfe02828e9ba52ea3b47e609b (diff) | |
download | bcm5719-llvm-2f9d8d07022fbc9884b4da84a934f06648736503.tar.gz bcm5719-llvm-2f9d8d07022fbc9884b4da84a934f06648736503.zip |
Fix a bug in the code of llvm-cxxdump in dumpArchive() when
iterating over an archive with object and non-object members that
would cause an Abort because to was not calling consumeError()
when the code was wanting to ignore a non-object file.
Found by Justin Bogner!
llvm-svn: 284867
Diffstat (limited to 'llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp')
-rw-r--r-- | llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp index c92d20d6ccf..518d414c7b9 100644 --- a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -502,7 +502,7 @@ static void dumpArchive(const Archive *Arc) { OS.flush(); reportError(Arc->getFileName(), Buf); } - ChildOrErr.takeError(); + consumeError(ChildOrErr.takeError()); continue; } |