summaryrefslogtreecommitdiffstats
path: root/llvm/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
commitc60a321c6b26c99aadc27b81c11806fa88f7fcfa (patch)
tree6532c358ea218eb59cb99ff161d5520a132223c0 /llvm/lib/Object/MachOUniversal.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/MachOUniversal.cpp')
-rw-r--r--llvm/lib/Object/MachOUniversal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp
index 8f5d56b90cb..66c9151eb69 100644
--- a/llvm/lib/Object/MachOUniversal.cpp
+++ b/llvm/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() { }
OpenPOWER on IntegriCloud