Merge pull request #15749 from JuliaLang/yyc/llvm39

Fix LLVM 3.9 build
JuliaLang · Apr 2, 2016 · 1eb8455 · 1eb8455
2 parents 8c17d60 + f7780c9
commit 1eb8455
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
@@ -397,9 +397,12 @@ class JuliaOJIT {
                         );
         SmallVector<std::unique_ptr<Module>,1> Ms;
         Ms.push_back(std::move(M));
-        return CompileLayer.addModuleSet(std::move(Ms),
-                                          MemMgr,
-                                          std::move(Resolver));
+        auto modset = CompileLayer.addModuleSet(std::move(Ms), MemMgr,
+                                                std::move(Resolver));
+        // Force LLVM to emit the module so that we can register the symbols
+        // in our lookup table.
+        CompileLayer.emitAndFinalize(modset);
+        return modset;
     }
 
     void removeModule(ModuleHandleT H)