summaryrefslogtreecommitdiff
path: root/lib/Object/MachOUniversal.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
commit0b21d88fd31b4bfb6fdb7e2f1ed5f93639d5bd1c (patch)
tree08092bf45f2d4c264837718186cc82d766c88959 /lib/Object/MachOUniversal.cpp
parentb76b4707be8f8a807efe8538534eee3ea0ba279c (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274160 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Object/MachOUniversal.cpp')
-rw-r--r--lib/Object/MachOUniversal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp
index 8f5d56b90cb..66c9151eb69 100644
--- a/lib/Object/MachOUniversal.cpp
+++ b/lib/Object/MachOUniversal.cpp
@@ -96,7 +96,7 @@ MachOUniversalBinary::ObjectForArch::getAsArchive() const {
ObjectData = ParentData.substr(Header64.offset, Header64.size);
StringRef ObjectName = Parent->getFileName();
MemoryBufferRef ObjBuffer(ObjectData, ObjectName);
- return errorOrToExpected(Archive::create(ObjBuffer));
+ return Archive::create(ObjBuffer);
}
void MachOUniversalBinary::anchor() { }