Skip to content

Adjust to finishinfer! signature change #303

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

Merged
merged 1 commit into from
May 9, 2025
Merged

Adjust to finishinfer! signature change #303

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
13 changes: 11 additions & 2 deletions src/stage2/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,14 @@ end
# TODO: `get_remarks` should get a cursor?
#Cthulhu.get_remarks(interp::ADInterpreter, key::Union{MethodInstance,InferenceResult}) = get(interp.remarks[interp.current_level], key, nothing)

@static if VERSION ≥ v"1.13.0-DEV.126"
@static if VERSION ≥ v"1.13-"
function diffractor_finish(@specialize(finishfunc), state::InferenceState, interp::ADInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance})
res = @invoke finishfunc(state::InferenceState, interp::AbstractInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance})
key = CC.is_constproped(state) ? state.result : state.linfo
interp.unopt[interp.current_level][key] = Cthulhu.InferredSource(state)
return res
end
elseif VERSION ≥ v"1.12-"
function diffractor_finish(@specialize(finishfunc), state::InferenceState, interp::ADInterpreter, cycleid::Int)
res = @invoke finishfunc(state::InferenceState, interp::AbstractInterpreter, cycleid::Int)
key = CC.is_constproped(state) ? state.result : state.linfo
Expand All @@ -292,7 +299,9 @@ function diffractor_finish(@specialize(finishfunc), state::InferenceState, inter
end
end

@static if VERSION ≥ v"1.12-"
@static if VERSION ≥ v"1.13-"
CC.finishinfer!(state::InferenceState, interp::ADInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance}) = diffractor_finish(CC.finishinfer!, state, interp, cycleid, opt_cache)
elseif VERSION ≥ v"1.12-"
CC.finishinfer!(state::InferenceState, interp::ADInterpreter, cycleid::Int) = diffractor_finish(CC.finishinfer!, state, interp, cycleid)
function CC.finish!(interp::ADInterpreter, caller::InferenceState, validation_world::UInt, time_before::UInt64)
Cthulhu.set_cthulhu_source!(caller.result)
Expand Down
Loading