Skip to content

adapt to the upstream changes of AbstractInterpreter interface #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aviatesk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adapt to the upstream changes of AbstractInterpreter interface #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 25 additions & 3 deletions src/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,28 @@ function Compiler.add_remark!(interp::CthulhuInterpreter, sv::InferenceState, ms
end

function Compiler.finish(state::InferenceState, interp::CthulhuInterpreter)
r = @invoke Compiler.finish(state::InferenceState, interp::AbstractInterpreter)
interp.unopt[Core.Compiler.any(state.result.overridden_by_const) ? state.result : state.linfo] = InferredSource(
res = @invoke Compiler.finish(state::InferenceState, interp::AbstractInterpreter)
key = Core.Compiler.any(state.result.overridden_by_const) ? state.result : state.linfo
interp.unopt[key] = InferredSource(
copy(state.src),
copy(state.stmt_info),
isdefined(Core.Compiler, :Effects) ? state.ipo_effects : nothing,
state.result.result)
return r
return res
end

# branch on https://github.com/JuliaLang/julia/pull/43994
const AFTER_43994 = isdefined(Compiler, :transform_optresult_for_cache)

@static if AFTER_43994
function Compiler.transform_result_for_cache(interp::CthulhuInterpreter, linfo::MethodInstance,
valid_worlds::WorldRange, result::InferenceResult)
inferred_result = result.src
return isa(inferred_result, OptimizedSource) ? inferred_result :
isa(inferred_result, Compiler.ConstAPI) ? inferred_result :
nothing
end
else # @static if AFTER_43994
function Compiler.transform_result_for_cache(interp::CthulhuInterpreter, linfo::MethodInstance,
valid_worlds::WorldRange, @nospecialize(inferred_result), ipo_effects::Effects = Effects())
if isa(inferred_result, OptimizationState)
Expand All @@ -96,6 +109,7 @@ function Compiler.transform_result_for_cache(interp::CthulhuInterpreter, linfo::
end
return inferred_result
end
end # @static if AFTER_43994

# branch on https://github.com/JuliaLang/julia/pull/41328
@static if isdefined(Compiler, :is_stmt_inline)
Expand Down Expand Up @@ -124,6 +138,13 @@ function Compiler.inlining_policy(interp::CthulhuInterpreter)
end
end # @static if isdefined(Compiler, :is_stmt_inline)

@static if AFTER_43994
function Compiler.transform_optresult_for_cache(interp::CthulhuInterpreter,
opt::OptimizationState, ir::IRCode, @nospecialize(newresult))
isa(newresult, Compiler.ConstAPI) && return newresult
return OptimizedSource(ir, opt.src, opt.src.inlineable)
end
else # @static if AFTER_43994
function Compiler.finish!(interp::CthulhuInterpreter, caller::InferenceResult)
src = caller.src
if isa(src, OptimizationState)
Expand All @@ -134,3 +155,4 @@ function Compiler.finish!(interp::CthulhuInterpreter, caller::InferenceResult)
end
end
end
end # @static if AFTER_43994
3 changes: 2 additions & 1 deletion test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ function strip_base_linenums(s)
end

function irshow_filename(optimize, debuginfo, iswarn, hide_type_stable, inline_cost, type_annotations)
return "test_output/foo-$(optimize ? :opt : :unopt)-$(debuginfo)-$(iswarn ? :warn : :nowarn)\
p = "test_output/foo-$(optimize ? :opt : :unopt)-$(debuginfo)-$(iswarn ? :warn : :nowarn)\
-$(hide_type_stable ? :hide_type_stable : :show_type_stable)-$(inline_cost ? :inline_cost : :nocost)\
-$(type_annotations ? :types : :notypes)"
return normpath(@__DIR__, p)
end

# to generate test cases for IRShow tests
Expand Down