fixup impl for 1.10

EnzymeAD · Dec 6, 2024 · 1144108 · 1144108
1 parent 49c9e56
commit 1144108
Showing 1 changed file with 10 additions and 30 deletions.
diff --git a/src/compiler/interpreter.jl b/src/compiler/interpreter.jl
@@ -204,25 +204,26 @@ else # v1.10
 # 1.10 doesn't have stack_analysis_result or ipo_dataflow_analysis
 function Core.Compiler.finish(interp::EnzymeInterpreter, opt::Core.Compiler.OptimizationState, ir::Core.Compiler.IRCode,
                    caller::Core.Compiler.InferenceResult)
-    mi = caller.linfo
-    specTypes = simplify_kw(mi.specTypes)
+    (; src, linfo) = opt
+    specTypes = simplify_kw(linfo.specTypes)
     inactive = false
     has_rule = false
-    if is_inactive_from_sig(interp, specTypes, mi)
+    if is_inactive_from_sig(interp, specTypes, linfo)
         inactive = true
     else
         # 2. Check if rule is defined
-        if interp.forward_rules && has_frule_from_sig(interp, specTypes, mi)
+        if interp.forward_rules && has_frule_from_sig(interp, specTypes, linfo)
             has_rule = true
-        elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, mi)
+        elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, linfo)
             has_rule = true
         end
     end
-    # HACK: we store the deferred edges in the argescapes field, which is invalid,
-    #       but nobody should be running EA on our results.
-    caller.argescapes = EnzymeCache(inactive, has_rule)
-    @invoke CC.finish(interp::Core.Compiler.AbstractInterpreter, opt::Core.Compiler.OptimizationState,
+    @invoke Core.Compiler.finish(interp::Core.Compiler.AbstractInterpreter, opt::Core.Compiler.OptimizationState,
                       ir::Core.Compiler.IRCode, caller::Core.Compiler.InferenceResult)
+    # Must happen afterwards
+    if inactive || has_rule
+        Core.Compiler.set_inlineable!(src, false)
+    end
 end
 end 
 
@@ -272,33 +273,12 @@ function Core.Compiler.abstract_call_gf_by_type(
     )
     callinfo = ret.info
     specTypes = simplify_kw(atype)
-    @show ret
 
     if is_primitive_func(specTypes)
         callinfo = NoInlineCallInfo(callinfo, atype, :primitive)
     elseif is_alwaysinline_func(specTypes)
         callinfo = AlwaysInlineCallInfo(callinfo, atype)
     end
-    # else
-    #     # 1. Check if function is inactive
-    #     if is_inactive_from_sig(interp, specTypes, sv)
-    #         callinfo = NoInlineCallInfo(callinfo, atype, :inactive)
-    #     else
-    #         # 2. Check if rule is defined
-    #         has_rule = get!(interp.rules_cache, specTypes) do
-    #             if interp.forward_rules && has_frule_from_sig(interp, specTypes, sv)
-    #                 return true
-    #             elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, sv)
-    #                 return true
-    #             else
-    #                 return false
-    #             end
-    #         end
-    #         if has_rule
-    #             callinfo = NoInlineCallInfo(callinfo, atype, interp.forward_rules ? :frule : :rrule)
-    #         end            
-    #     end
-    # end
     @static if VERSION ≥ v"1.11-"
         return Core.Compiler.CallMeta(ret.rt, ret.exct, ret.effects, callinfo)
     else