change cycle-limit heuristic in inference to use method_for_inference_heuristics mechanism [ci skip]

Author: jrevels

base/inference.jl

@@ -361,10 +361,14 @@ function InferenceState(result::InferenceResult,
 end
 
 function get_staged(li::MethodInstance)
-    return ccall(:jl_code_for_staged, Any, (Any,), li)::CodeInfo
+    try
+        # user code might throw errors – ignore them
+        return ccall(:jl_code_for_staged, Any, (Any,), li)::CodeInfo
+    catch
+        return nothing
+    end
 end
 
-
 mutable struct OptimizationState
     linfo::MethodInstance
     vararg_type_container #::Type
@@ -462,12 +466,7 @@ end
 function retrieve_code_info(linfo::MethodInstance)
     m = linfo.def::Method
     if isdefined(m, :generator)
-        try
-            # user code might throw errors – ignore them
-            c = get_staged(linfo)
-        catch
-            return nothing
-        end
+        return get_staged(linfo)
     else
         # TODO: post-inference see if we can swap back to the original arrays?
         if isa(m.source, Array{UInt8,1})
@@ -2073,6 +2072,24 @@ function abstract_call_method_with_const_args(argtypes::Vector{Any}, match::Simp
     return result
 end
 
+function method_for_inference_heuristics(infstate::InferenceState)
+    m = infstate.src.method_for_inference_heuristics
+    return isa(m, Method) ? m : infstate.linfo.def
+end
+
+function method_for_inference_heuristics(method::Method, @nospecialize(sig), sparams, world)
+    if isdefined(method, :generator) && method.generator.expand_early
+        method_instance = code_for_method(method, sig, sparams, world, false)
+        if isa(method_instance, MethodInstance)
+            cinfo = get_staged(method_instance)
+            if isa(cinfo, CodeInfo) && isa(cinfo.method_for_inference_heuristics, Method)
+                return cinfo.method_for_inference_heuristics
+            end
+        end
+    end
+    return method
+ end
+
 function abstract_call_method(method::Method, @nospecialize(sig), sparams::SimpleVector, sv::InferenceState)
     topmost = nothing
     # Limit argument type tuple growth of functions:
@@ -2082,16 +2099,18 @@ function abstract_call_method(method::Method, @nospecialize(sig), sparams::Simpl
     cyclei = 0
     infstate = sv
     edgecycle = false
+    checked_method = method_for_inference_heuristics(method, sig, sparams, sv.params.world)
     while !(infstate === nothing)
         infstate = infstate::InferenceState
-        if method === infstate.linfo.def
-            if infstate.linfo.specTypes == sig
-                # avoid widening when detecting self-recursion
-                # TODO: merge call cycle and return right away
-                topmost = nothing
-                edgecycle = true
-                break
-            end
+        if infstate.linfo.specTypes == sig
+            # avoid widening when detecting self-recursion
+            # TODO: merge call cycle and return right away
+            topmost = nothing
+            edgecycle = true
+            break
+        end
+        working_method = method_for_inference_heuristics(infstate)
+        if checked_method === working_method
             if topmost === nothing
                 # inspect the parent of this edge,
                 # to see if they are the same Method as sv
@@ -2110,7 +2129,8 @@ function abstract_call_method(method::Method, @nospecialize(sig), sparams::Simpl
                     # then check the parent link
                     if topmost === nothing && parent !== nothing
                         parent = parent::InferenceState
-                        if parent.cached && parent.linfo.def === sv.linfo.def
+                        parent_method = method_for_inference_heuristics(parent)
+                        if parent.cached && parent_method === working_method
                             topmost = infstate
                             edgecycle = true
                         end