Merge pull request #1138 from ncos/trunk-fixing

Fix ISPC after LLVM r255842. Fix for build problem, though there's runtime problem still.
2015-12-21 15:06:12 +03:00
parent ac8fef0f22 a6f0aade5c
commit 10143eb716
1 changed files with 2 additions and 1 deletions
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -901,7 +901,8 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
        llvm::Linker::LinkModules(module, bcModule);
 #else // LLVM 3.8+
        // TODO: Pass diagnostic function for proper error reporting.
-        llvm::Linker::linkModules(*module, *bcModule, nullptr);
+        std::unique_ptr<llvm::Module> M(bcModule);
+        llvm::Linker::linkModules(*module, std::move(M));
 #endif

        lSetInternalFunctions(module);