use opt as a ci -> OptimizedSrc side-dcit

JuliaDebug · Feb 8, 2024 · 718d838 · 718d838
1 parent a9cd574
commit 718d838
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Cthulhu.jl b/src/Cthulhu.jl
@@ -292,7 +292,10 @@ function lookup_optimized(interp::CthulhuInterpreter, mi::MethodInstance, allow_
     codeinst = CC.getindex(CC.code_cache(interp), mi)
     rt = cached_return_type(codeinst)
     exct = cached_exception_type(codeinst)
-    opt = codeinst.inferred
+    opt = get(interp.opt, codeinst, nothing)
+    if opt === nothing
+        opt = codeinst.inferred
+    end
     if opt !== nothing
         opt = opt::OptimizedSource
         src = CC.copy(opt.ir)

diff --git a/src/interpreter.jl b/src/interpreter.jl
@@ -24,7 +24,9 @@ end
 
 const InferenceKey = Union{MethodInstance,InferenceResult}
 const InferenceDict{T} = IdDict{InferenceKey, T}
-const OptimizationDict = IdDict{MethodInstance, CodeInstance}
+
+# const OptimizationDict = IdDict{MethodInstance, CodeInstance}
+const OptimizationDict = IdDict{CodeInstance, OptimizedSource}
 const PC2Remarks = Vector{Pair{Int, String}}
 const PC2Effects = Dict{Int, Effects}
 const PC2Excts = Dict{Int, Any}
@@ -183,6 +185,18 @@ end
 #     return create_cthulhu_source(result.src, result.ipo_effects)
 # end
 
+
+
+function CC.CodeInstance(interp::CthulhuInterpreter, result::InferenceResult,
+                valid_worlds::WorldRange)
+    opt_src = create_cthulhu_source(result.src, result.ipo_effects)
+    ci = @invoke CC.CodeInstance(interp::AbstractInterpreter, result, valid_worlds)
+    if opt_src isa OptimizedSource
+        interp.opt[ci] = opt_src
+    end
+    return ci
+end
+
 @static if VERSION ≥ v"1.11.0-DEV.879"
 function CC.inlining_policy(interp::CthulhuInterpreter,
     @nospecialize(src), @nospecialize(info::CCCallInfo), stmt_flag::UInt32)