diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2017-10-11 18:07:18 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2017-10-11 18:07:18 +0000 |
commit | 3500f5e3bf1c5818913d5b6a675f3cae3daee808 (patch) | |
tree | cc6d68d3faa110dcac2b952d14da8c5d27902ac7 /llvm/lib/Object/SymbolicFile.cpp | |
parent | f9c7f7fed4c8d1c39984debc754a16037b271781 (diff) | |
download | bcm5719-llvm-3500f5e3bf1c5818913d5b6a675f3cae3daee808.tar.gz bcm5719-llvm-3500f5e3bf1c5818913d5b6a675f3cae3daee808.zip |
Convert the last uses of ErrorOr in include/llvm/Object.
llvm-svn: 315483
Diffstat (limited to 'llvm/lib/Object/SymbolicFile.cpp')
-rw-r--r-- | llvm/lib/Object/SymbolicFile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Object/SymbolicFile.cpp b/llvm/lib/Object/SymbolicFile.cpp index 1042d29d235..2e7f2cc0d1d 100644 --- a/llvm/lib/Object/SymbolicFile.cpp +++ b/llvm/lib/Object/SymbolicFile.cpp @@ -80,10 +80,12 @@ SymbolicFile::createSymbolicFile(MemoryBufferRef Object, file_magic Type, 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()), |