[llvm] r214535 - Use object::Archive::create instead of new object::Archive.

Rafael Espindola rafael.espindola at gmail.com
Fri Aug 1 11:31:18 PDT 2014


Author: rafael
Date: Fri Aug  1 13:31:17 2014
New Revision: 214535

URL: http://llvm.org/viewvc/llvm-project?rev=214535&view=rev
Log:
Use object::Archive::create instead of new object::Archive.

Also fix the error handling. No testcaes, issue found by inspection.

Thanks to David Blaikie for the suggestion.

Modified:
    llvm/trunk/tools/lli/lli.cpp

Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=214535&r1=214534&r2=214535&view=diff
==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Fri Aug  1 13:31:17 2014
@@ -544,15 +544,14 @@ int main(int argc, char **argv, char * c
       Err.print(argv[0], errs());
       return 1;
     }
-    std::error_code EC;
-    std::unique_ptr<object::Archive> Ar =
-        llvm::make_unique<object::Archive>(std::move(ArBuf.get()), EC);
-    assert(Ar);
-    if (EC) {
-      Err.print(argv[0], errs());
+
+    ErrorOr<std::unique_ptr<object::Archive>> ArOrErr =
+        object::Archive::create(std::move(ArBuf.get()));
+    if (std::error_code EC = ArOrErr.getError()) {
+      errs() << EC.message();
       return 1;
     }
-    EE->addArchive(std::move(Ar));
+    EE->addArchive(std::move(ArOrErr.get()));
   }
 
   // If the target is Cygwin/MingW and we are generating remote code, we





More information about the llvm-commits mailing list