From 825fc31bd3a6e7604c4b69f28f32e90b5a882289 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 22 Jan 2014 00:14:49 +0000
Subject: Change createObjectFile to return an ErrorOr.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199776 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-ar/llvm-ar.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools/llvm-ar')

diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 18f8776020..d4fe7d789c 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -670,7 +670,11 @@ static void writeSymbolTable(
     object::ObjectFile *Obj;
     if (I->isNewMember()) {
       const char *Filename = I->getNew();
-      Obj = object::ObjectFile::createObjectFile(Filename);
+      if (ErrorOr<object::ObjectFile *> ObjOrErr =
+              object::ObjectFile::createObjectFile(Filename))
+        Obj = ObjOrErr.get();
+      else
+        Obj = NULL;
     } else {
       object::Archive::child_iterator OldMember = I->getOld();
       OwningPtr<object::Binary> Binary;
-- 
cgit v1.2.3