Skip to content

adjust Cthulhu to JuliaLang/julia#56248 #621

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
Feb 19, 2025
Merged

adjust Cthulhu to JuliaLang/julia#56248 #621

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
19 changes: 14 additions & 5 deletions src/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,29 @@ function create_cthulhu_source(@nospecialize(opt), effects::Effects)
return OptimizedSource(ir, opt.src, opt.src.inlineable, effects)
end

function set_cthulhu_source!(result::InferenceResult)
result.src = create_cthulhu_source(result.src, result.ipo_effects)
end

@static if VERSION ≥ v"1.12.0-DEV.1823"
CC.finishinfer!(state::InferenceState, interp::CthulhuInterpreter) = cthulhu_finish(CC.finishinfer!, state, interp)
@static if VERSION ≥ v"1.12.0-DEV.1988"
function CC.finish!(interp::CthulhuInterpreter, caller::InferenceState, validation_world::UInt)
set_cthulhu_source!(caller.result)
return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState, validation_world::UInt)
end
else
function CC.finish!(interp::CthulhuInterpreter, caller::InferenceState)
result = caller.result
result.src = create_cthulhu_source(result.src, result.ipo_effects)
set_cthulhu_source!(caller.result)
return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState)
end
end

elseif VERSION ≥ v"1.12.0-DEV.734"
CC.finishinfer!(state::InferenceState, interp::CthulhuInterpreter) = cthulhu_finish(CC.finishinfer!, state, interp)
function CC.finish!(interp::CthulhuInterpreter, caller::InferenceState;
can_discard_trees::Bool=false)
result = caller.result
result.src = create_cthulhu_source(result.src, result.ipo_effects)
set_cthulhu_source!(caller.result)
return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState;
can_discard_trees)
end
Expand All @@ -147,7 +156,7 @@ CC.finish(state::InferenceState, interp::CthulhuInterpreter) = cthulhu_finish(CC
function CC.finish!(interp::CthulhuInterpreter, caller::InferenceState)
result = caller.result
opt = result.src
result.src = create_cthulhu_source(opt, result.ipo_effects)
set_cthulhu_source!(result)
if opt isa CC.OptimizationState
CC.ir_to_codeinf!(opt)
end
Expand Down
Loading