diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 20:41:02 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 20:41:02 +0000 |
| commit | 4f7932b2fe6d8d867bc000855eff8b74dc4f5a02 (patch) | |
| tree | d136c12e2fcc0ae22ede8147cb679ed8a1771aee /llvm/tools/llvm-size/llvm-size.cpp | |
| parent | aa908fc99199e92b0a538ce4f0dda3eaee576b66 (diff) | |
| download | bcm5719-llvm-4f7932b2fe6d8d867bc000855eff8b74dc4f5a02.tar.gz bcm5719-llvm-4f7932b2fe6d8d867bc000855eff8b74dc4f5a02.zip | |
Convert a few methods to use ErrorOr.
It used to be inconvenient to mix ErrorOr and UniquePtr, but with c++11
they work OK together.
llvm-svn: 211532
Diffstat (limited to 'llvm/tools/llvm-size/llvm-size.cpp')
| -rw-r--r-- | llvm/tools/llvm-size/llvm-size.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp index b71380dcaa4..48614d8176b 100644 --- a/llvm/tools/llvm-size/llvm-size.cpp +++ b/llvm/tools/llvm-size/llvm-size.cpp @@ -466,9 +466,9 @@ static void PrintFileSectionSizes(StringRef file) { for (MachOUniversalBinary::object_iterator I = UB->begin_objects(), E = UB->end_objects(); I != E; ++I) { - std::unique_ptr<ObjectFile> UO; + ErrorOr<std::unique_ptr<ObjectFile>> UO = I->getAsObjectFile(); std::unique_ptr<Archive> UA; - if (!I->getAsObjectFile(UO)) { + if (UO) { if (ObjectFile *o = dyn_cast<ObjectFile>(&*UO.get())) { MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o); if (OutputFormat == sysv) |
