add expand_early field to GeneratedFunctionStub [ci skip]

Author: jrevels

base/boot.jl

@@ -454,6 +454,7 @@ struct GeneratedFunctionStub
     spnames::Union{Void, Array{Any,1}}
     line::Int
     file::Symbol
+    expand_early::Bool
 end
 
 # invoke and wrap the results of @generated

base/inference.jl

@@ -1911,7 +1911,20 @@ end
 
 function method_for_inference_heuristics(infstate::InferenceState)
     m = infstate.src.method_for_inference_heuristics
-    return m === nothing ? infstate.linfo.def : m
+    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(f), @nospecialize(sig), sparams::SimpleVector, sv::InferenceState)
@@ -1922,17 +1935,7 @@ function abstract_call_method(method::Method, @nospecialize(f), @nospecialize(si
     # Returns the topmost occurrence of that repeated edge.
     cyclei = 0
     infstate = sv
-    if isdefined(method, :generator) # && method.generator.expand_early
-        method_instance = code_for_method(method, sig, sparams, sv.params.world, false)
-        if isa(method_instance, MethodInstance)
-            cinfo = get_staged(method_instance)
-            if isa(cinfo, CodeInfo) && isa(cinfo.method_for_inference_heuristics, Method)
-                checked_method = cinfo.method_for_inference_heuristics
-            end
-        end
-    else
-        checked_method = method
-    end
+    checked_method = method_for_inference_heuristics(method, sig, sparams, sv.params.world)
     while !(infstate === nothing)
         infstate = infstate::InferenceState
         if method === infstate.linfo.def && infstate.linfo.specTypes == sig

src/julia-syntax.scm

@@ -362,7 +362,8 @@
                                                            'nothing
                                                            (cons 'list (map car sparams)))
                                                       ,(if (null? loc) 0 (cadr loc))
-                                                      (inert ,(if (null? loc) 'none (caddr loc))))))))
+                                                      (inert ,(if (null? loc) 'none (caddr loc)))
+                                                      false)))))
                              (list gf))
                            '()))
             (types (llist-types argl))

src/method.c

@@ -419,8 +419,8 @@ static void jl_method_set_source(jl_method_t *m, jl_code_info_t *src)
             else if (jl_expr_nargs(st) == 2 && jl_exprarg(st, 0) == (jl_value_t*)generated_sym) {
                 m->generator = NULL;
                 jl_value_t *gexpr = jl_exprarg(st, 1);
-                if (jl_expr_nargs(gexpr) == 6) {
-                    // expects (new (core GeneratedFunctionStub) funcname argnames sp line file)
+                if (jl_expr_nargs(gexpr) == 7) {
+                    // expects (new (core GeneratedFunctionStub) funcname argnames sp line file expandearly)
                     jl_value_t *funcname = jl_exprarg(gexpr, 1);
                     assert(jl_is_symbol(funcname));
                     if (jl_get_global(m->module, (jl_sym_t*)funcname) != NULL) {