Skip to content

Adjust to finishinfer! signature change #641

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
serenity4 merged 3 commits into from
May 9, 2025
Merged

Adjust to finishinfer! signature change #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f815d9e
Adjust to JuliaLang/julia#58343
serenity4 May 9, 2025
9e72d63
Make branch static
serenity4 May 9, 2025
deab546
Bump version
serenity4 May 9, 2025
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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
authors = ["Valentin Churavy <v.churavy@gmail.com> and contributors"]
name = "Cthulhu"
uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f"
version = "2.17.2"
version = "2.17.3"

[compat]
CodeTracking = "0.5, 1"
Expand Down
30 changes: 21 additions & 9 deletions src/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@ function InferredSource(state::InferenceState)
exct)
end

function cthulhu_finish(@specialize(finishfunc), state::InferenceState, interp::CthulhuInterpreter, cycleid::Int)
res = @invoke finishfunc(state::InferenceState, interp::AbstractInterpreter, cycleid::Int)
key = get_inference_key(state)
if key !== nothing
interp.unopt[key] = InferredSource(state)
end
return res
end

function create_cthulhu_source(result::InferenceResult, effects::Effects)
isa(result.src, OptimizationState) || return result.src
opt = result.src
Expand All @@ -135,7 +126,28 @@ function set_cthulhu_source!(result::InferenceResult)
result.src = create_cthulhu_source(result, result.ipo_effects)
end

@static if VERSION ≥ v"1.13-"
CC.finishinfer!(state::InferenceState, interp::CthulhuInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance}) = cthulhu_finish(CC.finishinfer!, state, interp, cycleid, opt_cache)
function cthulhu_finish(@specialize(finishfunc), state::InferenceState, interp::CthulhuInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance})
res = @invoke finishfunc(state::InferenceState, interp::AbstractInterpreter, cycleid::Int, opt_cache::IdDict{MethodInstance, CodeInstance})
key = get_inference_key(state)
if key !== nothing
interp.unopt[key] = InferredSource(state)
end
return res
end
else
function cthulhu_finish(@specialize(finishfunc), state::InferenceState, interp::CthulhuInterpreter, cycleid::Int)
res = @invoke finishfunc(state::InferenceState, interp::AbstractInterpreter, cycleid::Int)
key = get_inference_key(state)
if key !== nothing
interp.unopt[key] = InferredSource(state)
end
return res
end
CC.finishinfer!(state::InferenceState, interp::CthulhuInterpreter, cycleid::Int) = cthulhu_finish(CC.finishinfer!, state, interp, cycleid)
end

function CC.finish!(interp::CthulhuInterpreter, caller::InferenceState, validation_world::UInt, time_before::UInt64)
set_cthulhu_source!(caller.result)
return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState, validation_world::UInt, time_before::UInt64)
Expand Down