NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clover: adapt to new error API since LLVM r286752

Browse source 
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Vedran Miletić 2016-11-14 12:17:42 +01:00 • committed by Tom Stellard
parent c8a51fa75d
commit 8e430ff8b0
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
View file

@ -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));
}