[Bug,111523] Clover - radeonsi: Mesa git - broken compilation with current LLVM 10.0.0

Submitted by bugzilla-daemon@freedesktop.org on Aug. 31, 2019, 7:28 p.m.

Details

Message ID bug-111523-598-3KL3GyuQOg@http.bugs.freedesktop.org/
State New
Headers show
Series "Clover - radeonsi: Mesa git - broken compilation with current LLVM 10.0.0" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

bugzilla-daemon@freedesktop.org Aug. 31, 2019, 7:28 p.m.
https://bugs.freedesktop.org/show_bug.cgi?id=111523

--- Comment #1 from Aaron Watry <awatry@gmail.com> ---
In theory, the following should be enough to get things going again, but it'd
need to be wrapped in some logic to do clang version detection to keep the
older versions working:

       diag_buffer->FlushDiagnostics(diag);


Haven't tested it yet though beyond just building and running clinfo.

Patch hide | download patch | download mbox

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 0a677ce2eaa..0ce3e970303 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -200,7 +200,7 @@  namespace {
       const std::string &device_clc_version = dev.device_clc_version();

       if (!clang::CompilerInvocation::CreateFromArgs(
-             c->getInvocation(), copts.data(), copts.data() + copts.size(),
diag))
+             c->getInvocation(), copts, diag))
          throw invalid_build_options_error();