Adjust to .result -> .optresult change for OptimizationState (#634)

* 2.17: Fix `.result` -> `.optresult` change for nightly

* Bump version

* Adjust to more changes from JuliaLang/julia/pull/57979

* Retrieve `interp` from `OptimizationState`

---------

Co-authored-by: Cédric Belmant <[email protected]>

Author: serenity4

Project.toml

@@ -1,7 +1,7 @@
 authors = ["Valentin Churavy <[email protected]> and contributors"]
 name = "Cthulhu"
 uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f"
-version = "2.17.1"
+version = "2.17.2"
 
 [compat]
 CodeTracking = "0.5, 1"

src/interpreter.jl

@@ -116,12 +116,14 @@ function cthulhu_finish(@specialize(finishfunc), state::InferenceState, interp::
     return res
 end
 
-function create_cthulhu_source(@nospecialize(opt), effects::Effects)
-    isa(opt, OptimizationState) || return opt
+function create_cthulhu_source(result::InferenceResult, effects::Effects)
+    isa(result.src, OptimizationState) || return result.src
+    opt = result.src
     @static if VERSION ≥ v"1.13-"
-        result = opt.result::CC.OptimizationResult
-        result.simplified || CC.simplify_ir!(result)
-        ir = CC.compact!(copy(result.ir))
+        optresult = opt.optresult::CC.OptimizationResult
+        optresult.simplified || CC.simplify_ir!(optresult)
+        opt.src.inlining_cost = CC.compute_inlining_cost(opt.inlining.interp, result, optresult)
+        ir = CC.compact!(copy(optresult.ir))
     else
         # get the (theoretically) same effect as the jl_compress_ir -> jl_uncompress_ir -> inflate_ir round-trip
         ir = CC.compact!(CC.cfg_simplify!(CC.copy(opt.ir::IRCode)))
@@ -130,7 +132,7 @@ function create_cthulhu_source(@nospecialize(opt), effects::Effects)
 end
 
 function set_cthulhu_source!(result::InferenceResult)
-    result.src = create_cthulhu_source(result.src, result.ipo_effects)
+    result.src = create_cthulhu_source(result, result.ipo_effects)
 end
 
 CC.finishinfer!(state::InferenceState, interp::CthulhuInterpreter, cycleid::Int) = cthulhu_finish(CC.finishinfer!, state, interp, cycleid)
@@ -148,7 +150,7 @@ function CC.src_inlining_policy(interp::CthulhuInterpreter,
         return false
     else
         @assert src isa CC.IRCode || src === nothing "invalid Cthulhu code cache"
-        # the default inlining policy may try additional effor to find the source in a local cache
+        # the default inlining policy may try additional effort to find the source in a local cache
         return @invoke CC.src_inlining_policy(interp::AbstractInterpreter,
             src::Any, info::CCCallInfo, stmt_flag::UInt32)
     end