Merge pull request #427 from JuliaGPU/tb/dev

Minor fixes

Author: maleadt

Project.toml

@@ -1,7 +1,7 @@
 name = "GPUCompiler"
 uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
 authors = ["Tim Besard <tim.besard@gmail.com>"]
-version = "0.19.0"
+version = "0.19.1"
 
 [deps]
 ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"

src/irgen.jl

@@ -205,6 +205,7 @@ function safe_name(t::Type{<:Function})
     end
     safe_name(string(fn))
 end
+safe_name(::Type{Union{}}) = "Bottom"
 safe_name(x) = safe_name(repr(x))
 
 

src/jlgen.jl

@@ -224,12 +224,15 @@ function methodinstance(ft::Type, tt::Type, world::Integer=tls_world_age())
     sig = typed_signature(ft, tt)
 
     # look-up the method
-    meth = if VERSION >= v"1.10.0-DEV.65"
-        Base._which(sig; world).method
+    if VERSION >= v"1.10.0-DEV.65"
+        meth = Base._which(sig; world).method
     elseif VERSION >= v"1.7.0-DEV.435"
-        Base._which(sig, world).method
+        meth = Base._which(sig, world).method
     else
-        ccall(:jl_gf_invoke_lookup, Any, (Any, UInt), sig, world)
+        meth = ccall(:jl_gf_invoke_lookup, Any, (Any, UInt), sig, world)
+        if meth == nothing
+            error("no unique matching method found for the specified argument types")
+        end
     end
 
     (ti, env) = ccall(:jl_type_intersection_with_env, Any,

src/reflection.jl

@@ -78,9 +78,14 @@ function code_warntype(io::IO, @nospecialize(job::CompilerJob); interactive::Boo
         # call Cthulhu without introducing a dependency on Cthulhu
         mod = get(Base.loaded_modules, Cthulhu, nothing)
         mod===nothing && error("Interactive code reflection requires Cthulhu; please install and load this package first.")
-        interp = get_interpreter(job)
-        descend_code_warntype = getfield(mod, :descend_code_warntype)
-        descend_code_warntype(sig; interp, kwargs...)
+        if VERSION < v"1.7-"
+            descend_code_typed = getfield(mod, :descend_code_typed)
+            descend_code_typed(job.source; kwargs...)
+        else
+            interp = get_interpreter(job)
+            descend_code_warntype = getfield(mod, :descend_code_warntype)
+            descend_code_warntype(sig; interp, kwargs...)
+        end
     elseif VERSION >= v"1.7-"
         interp = get_interpreter(job)
         code_warntype_by_type(io, sig; interp, kwargs...)

test/definitions/native.jl

@@ -114,12 +114,12 @@ module LazyCodegen
             @assert !cc.compiled
             job = cc.job
 
-            name, jitted_mod = JuliaContext() do ctx
+            entry_name, jitted_mod = JuliaContext() do ctx
                 ir, meta = GPUCompiler.compile(:llvm, job; validate=false, ctx)
                 name(meta.entry), compile!(orc, ir)
             end
 
-            addr = addressin(orc, jitted_mod, name)
+            addr = addressin(orc, jitted_mod, entry_name)
             ptr  = pointer(addr)
 
             cc.compiled = true