update to JuliaLang/julia#42082

Author: aviatesk

src/Cthulhu.jl

@@ -430,7 +430,10 @@ function do_typeinf!(interp::CthulhuInterpreter, mi::MethodInstance)
     # we may want to handle the case when `InferenceState(...)` returns `nothing`,
     # which indicates code generation of a `@generated` has been failed,
     # and show it in the UI in some way ?
-    frame = InferenceState(result, true, interp)::InferenceState
+    # branch on https://github.com/JuliaLang/julia/pull/42082
+    frame = @static hasmethod(InferenceState, (InferenceResult,Symbol,AbstractInterpreter)) ?
+            InferenceState(result, #=cache=# :global, interp)::InferenceState :
+            InferenceState(result, #=cached=# true, interp)::InferenceState
     Core.Compiler.typeinf(interp, frame)
     return nothing
 end

src/interpreter.jl

@@ -84,12 +84,19 @@ end
 
 # branch on https://github.com/JuliaLang/julia/pull/41328
 @static if isdefined(Compiler, :is_stmt_inline)
-function Compiler.inlining_policy(interp::CthulhuInterpreter, @nospecialize(src), stmt_flag::UInt8)
+function Compiler.inlining_policy(
+    interp::CthulhuInterpreter, @nospecialize(src), stmt_flag::UInt8,
+    mi::MethodInstance, argtypes::Vector{Any})
     @assert isa(src, OptimizedSource) || isnothing(src)
     if isa(src, OptimizedSource)
         if Compiler.is_stmt_inline(stmt_flag) || src.isinlineable
             return src.ir
         end
+    else
+        # the default inlining policy may try additional effor to find the source in a local cache
+        return Base.@invoke Compiler.inlining_policy(
+            interp::AbstractInterpreter, nothing, stmt_flag::UInt8,
+            mi::MethodInstance, argtypes::Vector{Any})
     end
     return nothing
 end