Merge pull request #20026 from JuliaLang/yyc/tests/llvm

Fix compilation on LLVM svn

Author: yuyichao

src/codegen.cpp

@@ -4420,14 +4420,17 @@ static std::unique_ptr<Module> emit_function(
 
     if (ctx.debug_enabled) {
         // TODO: Fix when moving to new LLVM version
-        #if JL_LLVM_VERSION < 30400
+#if JL_LLVM_VERSION < 30400
         dbuilder.createCompileUnit(0x01, filename, ".", "julia", true, "", 0);
-        #elif JL_LLVM_VERSION >= 30700
+#elif JL_LLVM_VERSION >= 40000
+        DIFile *difile = dbuilder.createFile(filename, ".");
+        DICompileUnit *CU = dbuilder.createCompileUnit(0x01, difile, "julia", true, "", 0);
+#elif JL_LLVM_VERSION >= 30700
         DICompileUnit *CU = dbuilder.createCompileUnit(0x01, filename, ".", "julia", true, "", 0);
-        #else
+#else
         DICompileUnit CU = dbuilder.createCompileUnit(0x01, filename, ".", "julia", true, "", 0);
         assert(CU.Verify());
-        #endif
+#endif
 
 #if JL_LLVM_VERSION >= 30700
         DISubroutineType *subrty;

src/intrinsics.cpp

@@ -154,7 +154,11 @@ static Value *uint_cnvt(Type *to, Value *x)
     return builder.CreateZExt(x, to);
 }
 
+#if JL_LLVM_VERSION >= 40000
+#define LLVM_FP(a,b) APFloat(a(),b)
+#else
 #define LLVM_FP(a,b) APFloat(a,b)
+#endif
 static Constant *julia_const_to_llvm(void *ptr, jl_value_t *bt)
 {
     // assume `jl_isbits(bt)`.