diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-15 19:37:43 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-15 19:37:43 +0000 |
| commit | 63da2950451f3cd9d6f2bc1183395dddea16d369 (patch) | |
| tree | 594aa5dc2d0a4bc10d54f7325c582cad7a3e97fe /llvm/tools/macho-dump/macho-dump.cpp | |
| parent | 7206eaefefa1a4214b0f695feea1f419a53373a5 (diff) | |
| download | bcm5719-llvm-63da2950451f3cd9d6f2bc1183395dddea16d369.tar.gz bcm5719-llvm-63da2950451f3cd9d6f2bc1183395dddea16d369.zip | |
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.
llvm-svn: 199326
Diffstat (limited to 'llvm/tools/macho-dump/macho-dump.cpp')
| -rw-r--r-- | llvm/tools/macho-dump/macho-dump.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/macho-dump/macho-dump.cpp b/llvm/tools/macho-dump/macho-dump.cpp index 0dfbd5fa09a..4e7a0b875f1 100644 --- a/llvm/tools/macho-dump/macho-dump.cpp +++ b/llvm/tools/macho-dump/macho-dump.cpp @@ -379,9 +379,10 @@ int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, "llvm Mach-O dumping tool\n"); - OwningPtr<Binary> Binary; - if (error_code EC = createBinary(InputFile, Binary)) + ErrorOr<Binary *> BinaryOrErr = createBinary(InputFile); + if (error_code EC = BinaryOrErr.getError()) return Error("unable to read input: '" + EC.message() + "'"); + OwningPtr<Binary> Binary(BinaryOrErr.get()); const MachOObjectFile *InputObject = dyn_cast<MachOObjectFile>(Binary.get()); if (!InputObject) |
