Skip to content
This repository has been archived by the owner on May 27, 2021. It is now read-only.

Commit

Permalink
Merge pull request #69 from JuliaGPU/tb/fix_07
Browse files Browse the repository at this point in the history
Fixes for 0.7
  • Loading branch information
maleadt authored Jun 10, 2017
2 parents 624febd + e2278a3 commit d2d7e28
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/jit.jl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function irgen(func::ANY, tt::ANY)
end
end

isnull(entry_fn) && error("could not find entry-point function")
isnull(entry_fn) && error("could not find entry-point function (got ", join(LLVM.name.(collect(functions(entry_mod))), ", ", " and "), ")")
end

# link all the modules
Expand Down
13 changes: 11 additions & 2 deletions src/reflection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,18 @@ for fname in [:code_lowered, :code_typed, :code_warntype, :code_llvm, :code_ptx,
""" macro $(fname)(ex0)
if ex0.head == :macrocall
# @cuda (...) f()
ex0 = ex0.args[3]
if Base.VERSION >= v"0.7.0-DEV.357"
ex0 = ex0.args[4]
else
ex0 = ex0.args[3]
end
end

if Base.VERSION >= v"0.7.0-DEV.481"
Base.gen_call_with_extracted_types(__module__, $(Expr(:quote,fname_wrapper)), ex0)
else
Base.gen_call_with_extracted_types($(Expr(:quote,fname_wrapper)), ex0)
end
Base.gen_call_with_extracted_types($(Expr(:quote,fname_wrapper)), ex0)
end
end
end

0 comments on commit d2d7e28

Please sign in to comment.