commit 3500f5e3bf1c5818913d5b6a675f3cae3daee808
author Rafael Espindola <rafael.espindola@gmail.com> Wed Oct 11 18:07:18 2017 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Oct 11 18:07:18 2017 +0000
tree cc6d68d3faa110dcac2b952d14da8c5d27902ac7
parent f9c7f7fed4c8d1c39984debc754a16037b271781

Convert the last uses of ErrorOr in include/llvm/Object.

llvm-svn: 315483

llvm/lib/Object/SymbolicFile.cpp

diff --git a/llvm/lib/Object/SymbolicFile.cpp b/llvm/lib/Object/SymbolicFile.cpp
index 1042d29..2e7f2cc 100644
--- a/llvm/lib/Object/SymbolicFile.cpp
+++ b/llvm/lib/Object/SymbolicFile.cpp
@@ -80,10 +80,12 @@
     if (!Obj || !Context)
       return std::move(Obj);
 
-    ErrorOr<MemoryBufferRef> BCData =
+    Expected<MemoryBufferRef> BCData =
         IRObjectFile::findBitcodeInObject(*Obj->get());
-    if (!BCData)
+    if (!BCData) {
+      consumeError(BCData.takeError());
       return std::move(Obj);
+    }
 
     return IRObjectFile::create(
         MemoryBufferRef(BCData->getBuffer(), Object.getBufferIdentifier()),