summaryrefslogtreecommitdiff
path: root/tools/llvm-ar
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-01-22 00:14:49 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-01-22 00:14:49 +0000
commit825fc31bd3a6e7604c4b69f28f32e90b5a882289 (patch)
tree2026366f101c87f4560963d62ecc0138540f31f9 /tools/llvm-ar
parent6220c8f960fe287efcfc27f46ab6ad48e5b3c5d2 (diff)
downloadllvm-825fc31bd3a6e7604c4b69f28f32e90b5a882289.tar.gz
llvm-825fc31bd3a6e7604c4b69f28f32e90b5a882289.tar.bz2
llvm-825fc31bd3a6e7604c4b69f28f32e90b5a882289.tar.xz
Change createObjectFile to return an ErrorOr.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199776 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar')
-rw-r--r--tools/llvm-ar/llvm-ar.cpp6
1 files changed, 5 insertions, 1 deletions
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;