Merge pull request #568 from JuliaGPU/tb/fixes

Fixes for 1.12

Author: maleadt

src/driver.jl

@@ -275,7 +275,12 @@ const __llvm_initialized = Ref(false)
                 for call in worklist[dyn_job]
                     @dispose builder=IRBuilder() begin
                         position!(builder, call)
-                        fptr = ptrtoint!(builder, dyn_entry, T_ptr)
+                        fptr = if VERSION >= v"1.12.0-DEV.225"
+                            T_ptr = LLVM.PointerType(LLVM.Int8Type())
+                            bitcast!(builder, dyn_entry, T_ptr)
+                        else
+                            ptrtoint!(builder, dyn_entry, T_ptr)
+                        end
                         replace_uses!(call, fptr)
                     end
                     unsafe_delete!(LLVM.parent(call), call)

src/jlgen.jl

@@ -587,6 +587,10 @@ macro in_world(world, ex)
 end
 
 function compile_method_instance(@nospecialize(job::CompilerJob))
+    if job.source.def.primary_world > job.world || job.world > job.source.def.deleted_world
+        error("Cannot compile $(job.source) for world $(job.world); method is only valid in worlds $(job.source.def.primary_world) to $(job.source.def.deleted_world)")
+    end
+
     # populate the cache
     interp = get_interpreter(job)
     cache = CC.code_cache(interp)

src/utils.jl

@@ -72,6 +72,17 @@ for level in [:debug, :info, :warn, :error]
     end
 end
 
+macro safe_show(exs...)
+    blk = Expr(:block)
+    for ex in exs
+        push!(blk.args,
+              :(println(Core.stdout, $(sprint(Base.show_unquoted,ex)*" = "),
+                                     repr(begin local value = $(esc(ex)) end))))
+    end
+    isempty(exs) || push!(blk.args, :value)
+    return blk
+end
+
 
 
 ## codegen locking