From bdabc2f19ffb9e20600dad6e8a300842a7bda50e Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Fri, 6 Apr 2018 14:26:03 +0000
Subject: Import LLVM 6.0.1 release including clang, lld and lldb.

"where is the kaboom?" deraadt@
---
 gnu/llvm/lib/Object/SymbolicFile.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/llvm/lib/Object/SymbolicFile.cpp')

diff --git a/gnu/llvm/lib/Object/SymbolicFile.cpp b/gnu/llvm/lib/Object/SymbolicFile.cpp
index 1042d29d235..2e7f2cc0d1d 100644
--- a/gnu/llvm/lib/Object/SymbolicFile.cpp
+++ b/gnu/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()),
-- 
cgit v1.2.3-59-g8ed1b