summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/Binary.cpp
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2016-06-29 20:35:44 +0000
committerKevin Enderby <enderby@apple.com>2016-06-29 20:35:44 +0000
commitc60a321c6b26c99aadc27b81c11806fa88f7fcfa (patch)
tree6532c358ea218eb59cb99ff161d5520a132223c0 /llvm/lib/Object/Binary.cpp
parentdadf7b293d732ebe984c4a16cdddf4cb31364fff (diff)
downloadbcm5719-llvm-c60a321c6b26c99aadc27b81c11806fa88f7fcfa.tar.gz
bcm5719-llvm-c60a321c6b26c99aadc27b81c11806fa88f7fcfa.zip
Change Archive::create() from ErrorOr<...> to Expected<...> and update
its clients. This commit will break the next lld builds. I’ll be committing the matching change for lld next. llvm-svn: 274160
Diffstat (limited to 'llvm/lib/Object/Binary.cpp')
-rw-r--r--llvm/lib/Object/Binary.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp
index 8d03a2a976b..ec051fec375 100644
--- a/llvm/lib/Object/Binary.cpp
+++ b/llvm/lib/Object/Binary.cpp
@@ -42,7 +42,7 @@ Expected<std::unique_ptr<Binary>> object::createBinary(MemoryBufferRef Buffer,
switch (Type) {
case sys::fs::file_magic::archive:
- return errorOrToExpected(Archive::create(Buffer));
+ return Archive::create(Buffer);
case sys::fs::file_magic::elf:
case sys::fs::file_magic::elf_relocatable:
case sys::fs::file_magic::elf_executable:
OpenPOWER on IntegriCloud