From 3ca7bb6b88282b59f50a146cf9f6068abd591432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Belmant?= Date: Tue, 18 Mar 2025 10:26:28 -0400 Subject: [PATCH] Adjust to https://github.com/JuliaLang/julia/pull/57074 --- src/stage2/interpreter.jl | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/src/stage2/interpreter.jl b/src/stage2/interpreter.jl index 2d11bbc..8dc5198 100644 --- a/src/stage2/interpreter.jl +++ b/src/stage2/interpreter.jl @@ -289,34 +289,13 @@ function diffractor_finish(@specialize(finishfunc), state::InferenceState, inter end end -@static if VERSION ≥ v"1.12.0-DEV.1823" -@static if VERSION ≥ v"1.13.0-DEV.126" || VERSION ≥ v"1.12.0-alpha1" +@static if VERSION ≥ v"1.12-" CC.finishinfer!(state::InferenceState, interp::ADInterpreter, cycleid::Int) = diffractor_finish(CC.finishinfer!, state, interp, cycleid) -else -CC.finishinfer!(state::InferenceState, interp::ADInterpreter) = diffractor_finish(CC.finishinfer!, state, interp) -end -@static if VERSION ≥ v"1.12.0-DEV.1988" -function CC.finish!(interp::ADInterpreter, caller::InferenceState, validation_world::UInt) - Cthulhu.set_cthulhu_source!(caller.result) - return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState, validation_world::UInt) -end -else -function CC.finish!(interp::ADInterpreter, caller::InferenceState) +function CC.finish!(interp::ADInterpreter, caller::InferenceState, validation_world::UInt, time_before::UInt64) Cthulhu.set_cthulhu_source!(caller.result) - return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState) + return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState, validation_world::UInt, time_before::UInt64) end -end - -elseif VERSION ≥ v"1.12.0-DEV.734" -CC.finishinfer!(state::InferenceState, interp::ADInterpreter) = diffractor_finish(CC.finishinfer!, state, interp) -function CC.finish!(interp::ADInterpreter, caller::InferenceState; - can_discard_trees::Bool=false) - Cthulhu.set_cthulhu_source!(caller.result) - return @invoke CC.finish!(interp::AbstractInterpreter, caller::InferenceState; - can_discard_trees) -end - -elseif VERSION ≥ v"1.11.0-DEV.737" +elseif VERSION ≥ v"1.11-" CC.finish(state::InferenceState, interp::ADInterpreter) = diffractor_finish(CC.finish, state, interp) function CC.finish!(interp::ADInterpreter, caller::InferenceState) result = caller.result @@ -332,7 +311,7 @@ function CC.transform_result_for_cache(::ADInterpreter, ::MethodInstance, ::Worl return result.src end -else # VERSION < v"1.11.0-DEV.737" +else # VERSION < v"1.11-" CC.finish(state::InferenceState, interp::ADInterpreter) = diffractor_finish(CC.finish, state, interp) function CC.transform_result_for_cache(::ADInterpreter, ::MethodInstance, ::WorldRange, result::InferenceResult)