Skip to content

don't renumber effects/remarks after inference #355

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
aviatesk merged 1 commit into from
Mar 2, 2023
Merged

don't renumber effects/remarks after inference #355

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
don't renumber effects/remarks after inference 
After JuliaLang/julia#48022 the renumbering of `interp.remarks` and
`interp.effects` are unnecessary. This may lead to printing them on
wrong statements.
  • Loading branch information
@aviatesk
aviatesk committed Mar 2, 2023
commit 52244a24d0d6fa9b73e10f8e0b005211a0cb639c
2 changes: 2 additions & 0 deletions src/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ function CC.merge_effects!(interp::CthulhuInterpreter, sv::InferenceState, effec
end
end

@static if VERSION ≤ v"1.10.0-DEV.221"
function CC.type_annotate!(interp::CthulhuInterpreter, sv::InferenceState, run_optimizer::Bool)
changemap = @invoke CC.type_annotate!(interp::AbstractInterpreter, sv::InferenceState, run_optimizer::Bool)
changemap === nothing && return nothing
Expand Down Expand Up @@ -132,6 +133,7 @@ function CC.type_annotate!(interp::CthulhuInterpreter, sv::InferenceState, run_o
end
return changemap
end
end

function CC.finish(state::InferenceState, interp::CthulhuInterpreter)
res = @invoke CC.finish(state::InferenceState, interp::AbstractInterpreter)
Expand Down