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

Fixes for 0.7 #69

Merged
merged 4 commits into from
Jun 10, 2017
Merged

Fixes for 0.7 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2028060
Include __module__ when calling Base.gen_call_with_extracted_types.
maleadt Jun 7, 2017
8dda265
Include found functions in error message.
maleadt Jun 7, 2017
dc157f5
Fix macrocall decoding for 0.7.
maleadt Jun 7, 2017
e2278a3
Fix wrong version check.
maleadt Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jit.jl
View file
Open in desktop
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
View file
Open in desktop
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