From: Vedran Miletić <vedran@miletic.net>
Date: Mon, 14 Nov 2016 11:17:42 +0000 (+0100)
Subject: clover: adapt to new error API since LLVM r286752
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e430ff8b060b4e8e922bae24b3c57837da6ea77;p=mesa.git

clover: adapt to new error API since LLVM r286752

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
index 8e89a49a9c0..5dcc4f8a48c 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
@@ -98,8 +98,14 @@ clover::llvm::parse_module_library(const module &m, ::llvm::LLVMContext &ctx,
                                    std::string &r_log) {
    auto mod = ::llvm::parseBitcodeFile(::llvm::MemoryBufferRef(
                                         as_string(m.secs[0].data), " "), ctx);
-   if (!mod)
-      fail(r_log, error(CL_INVALID_PROGRAM), mod.getError().message());
+
+   if (::llvm::Error err = mod.takeError()) {
+      std::string msg;
+      ::llvm::handleAllErrors(std::move(err), [&](::llvm::ErrorInfoBase &EIB) {
+         msg = EIB.message();
+         fail(r_log, error(CL_INVALID_PROGRAM), msg.c_str());
+      });
+   }
 
    return std::unique_ptr<::llvm::Module>(std::move(*mod));
 }