Merge pull request #23350 from singam-sanjay/fix_for_LLVM6

Fix for llvm6
JuliaLang · Sep 27, 2017 · 6473693 · 6473693 · nanosoldier · Sep 27, 2017
2 parents eb51ff6 + 2c6e3b6
commit 6473693
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/disasm.cpp b/src/disasm.cpp
@@ -661,8 +661,12 @@ static void jl_dump_asm_internal(
 
     std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
     MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
+#if JL_LLVM_VERSION >= 60000
+    MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx);
+#else
     MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false,
                                CodeModel::Default, Ctx);
+#endif
 
     // Set up Subtarget and Disassembler
     std::unique_ptr<MCSubtargetInfo>

diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
@@ -589,7 +589,13 @@ void JuliaOJIT::addModule(std::unique_ptr<Module> M)
 #endif
     // Force LLVM to emit the module so that we can register the symbols
     // in our lookup table.
+#if JL_LLVM_VERSION >= 50000
+    auto Err = CompileLayer.emitAndFinalize(modset);
+    // Check for errors to prevent LLVM from crashing the program.
+    assert(!Err);
+#else
     CompileLayer.emitAndFinalize(modset);
+#endif
 }
 
 void JuliaOJIT::removeModule(ModuleHandleT H)