summaryrefslogtreecommitdiff
path: root/tools/llvm-readobj
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-01-15 19:37:43 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-01-15 19:37:43 +0000
commit1fca78a9b1d78ac2e05174e8b8b0eda5fe4ab8b3 (patch)
tree442cb69d47dec1c6c5ba601e847365ee625328a7 /tools/llvm-readobj
parent0893113a05af8b67799965685e96c11a59908a95 (diff)
downloadllvm-1fca78a9b1d78ac2e05174e8b8b0eda5fe4ab8b3.tar.gz
llvm-1fca78a9b1d78ac2e05174e8b8b0eda5fe4ab8b3.tar.bz2
llvm-1fca78a9b1d78ac2e05174e8b8b0eda5fe4ab8b3.tar.xz
Return an ErrorOr<Binary *> from createBinary.
I did write a version returning ErrorOr<OwningPtr<Binary> >, but it is too cumbersome to use without std::move. I will keep the patch locally and submit when we switch to c++11. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199326 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-readobj')
-rw-r--r--tools/llvm-readobj/llvm-readobj.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp
index 2d9f3e50ce..916c658ddd 100644
--- a/tools/llvm-readobj/llvm-readobj.cpp
+++ b/tools/llvm-readobj/llvm-readobj.cpp
@@ -260,11 +260,12 @@ static void dumpInput(StringRef File) {
}
// Attempt to open the binary.
- OwningPtr<Binary> Binary;
- if (error_code EC = createBinary(File, Binary)) {
+ ErrorOr<Binary *> BinaryOrErr = createBinary(File);
+ if (error_code EC = BinaryOrErr.getError()) {
reportError(File, EC);
return;
}
+ OwningPtr<Binary> Binary(BinaryOrErr.get());
if (Archive *Arc = dyn_cast<Archive>(Binary.get()))
dumpArchive(Arc);