Convert a few methods to use ErrorOr.

[oota-llvm.git] / tools / llvm-size / llvm-size.cpp

diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp
index b71380dcaa4aafef78168192d7e2055350e5620b..48614d8176b6e3c790cbb877cb99090add7ee235 100644 (file)
--- a/tools/llvm-size/llvm-size.cpp
+++ b/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)