Mesa (master): swr/rast: Fix WriteBitcodeToFile usage with llvm-7.0.

Vinson Lee vlee at kemper.freedesktop.org
Thu May 3 21:40:11 UTC 2018


Module: Mesa
Branch: master
Commit: 589622a2fe1bbfb2564fae497e99a3bcb4a3e069
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=589622a2fe1bbfb2564fae497e99a3bcb4a3e069

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Mon Apr 30 23:57:23 2018 -0700

swr/rast: Fix WriteBitcodeToFile usage with llvm-7.0.

Fix build error after llvm-7.0svn r325155 ("Pass a reference to a module
to the bitcode writer.").

  CXX      rasterizer/jitter/libmesaswr_la-JitManager.lo
rasterizer/jitter/JitManager.cpp:548:30: error: reference to type 'const llvm::Module' could not bind to an lvalue of type 'const llvm::Module *'
    llvm::WriteBitcodeToFile(M, bitcodeStream);
                             ^

Suggested-by: George Kyriazis <george.kyriazis at intel.com>
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-By: George Kyriazis <george.kyriazis at intel.com>

---

 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index aadcca2555..efb747abde 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -545,7 +545,11 @@ static inline uint32_t ComputeModuleCRC(const llvm::Module* M)
     std::string bitcodeBuffer;
     raw_string_ostream bitcodeStream(bitcodeBuffer);
 
+#if LLVM_VERSION_MAJOR >= 7
+    llvm::WriteBitcodeToFile(*M, bitcodeStream);
+#else
     llvm::WriteBitcodeToFile(M, bitcodeStream);
+#endif
     //M->print(bitcodeStream, nullptr, false);
 
     bitcodeStream.flush();




More information about the mesa-commit mailing list