Pass correct Module object to GeneratedFunctionStub

Currently it looks like we are wrongly passing unintentional
`mod::typeof(Base.mod)` object. Adds few type annotations to avoid
similar regressions in the future.

Author: aviatesk

JuliaLowering/src/eval.jl

@@ -120,8 +120,7 @@ end
 
 # Convert SyntaxTree to the CodeInfo+Expr data stuctures understood by the
 # Julia runtime
-function to_code_info(ex, mod, funcname, slots)
-    input_code = children(ex)
+function to_code_info(ex::SyntaxTree, mod::Module, slots::Vector{Slot})
     stmts = Any[]
 
     current_codelocs_stack = ir_debug_info_state(ex)
@@ -223,11 +222,11 @@ function to_code_info(ex, mod, funcname, slots)
     )
 end
 
-@fzone "JL: to_lowered_expr" function to_lowered_expr(mod, ex)
+@fzone "JL: to_lowered_expr" function to_lowered_expr(mod::Module, ex::SyntaxTree)
     _to_lowered_expr(mod, ex, 0)
 end
 
-function _to_lowered_expr(mod, ex, stmt_offset)
+function _to_lowered_expr(mod::Module, ex::SyntaxTree, stmt_offset::Int)
     k = kind(ex)
     if is_literal(k)
         ex.value
@@ -268,10 +267,7 @@ function _to_lowered_expr(mod, ex, stmt_offset)
         e1 = ex[1]
         getmeta(ex, :as_Expr, false) ? QuoteNode(Expr(e1)) : e1
     elseif k == K"code_info"
-        funcname = ex.is_toplevel_thunk ?
-            "top-level scope" :
-            "none"              # FIXME
-        ir = to_code_info(ex[1], mod, funcname, ex.slots)
+        ir = to_code_info(ex[1], mod, ex.slots)
         if ex.is_toplevel_thunk
             Expr(:thunk, ir)
         else
@@ -400,4 +396,3 @@ function include_string(mod::Module, code::AbstractString, filename::AbstractStr
                         expr_compat_mode=false)
     eval(mod, parseall(SyntaxTree, code; filename=filename); expr_compat_mode)
 end
-

JuliaLowering/src/runtime.jl

@@ -352,11 +352,13 @@ function (g::GeneratedFunctionStub)(world::UInt, source::Method, @nospecialize a
                               is_toplevel_thunk=Bool
                               )
 
+    __module__ = source.module
+
     # Macro expansion. Looking at Core.GeneratedFunctionStub, it seems that
     # macros emitted by the generator are currently expanded in the latest
     # world, so do that for compatibility.
     macro_world = typemax(UInt)
-    ctx1 = MacroExpansionContext(graph, source.module, false, macro_world)
+    ctx1 = MacroExpansionContext(graph, __module__, false, macro_world)
 
     # Run code generator - this acts like a macro expander and like a macro
     # expander it gets a MacroContext.
@@ -397,7 +399,7 @@ function (g::GeneratedFunctionStub)(world::UInt, source::Method, @nospecialize a
     # Rest of lowering
     ctx4, ex4 = convert_closures(ctx3, ex3)
     ctx5, ex5 = linearize_ir(ctx4, ex4)
-    ci = to_lowered_expr(mod, ex5)
+    ci = to_lowered_expr(__module__, ex5)
     @assert ci isa Core.CodeInfo
 
     # See GeneratedFunctionStub code in base/expr.jl

JuliaLowering/test/demo.jl

@@ -32,7 +32,7 @@ function formatsrc(ex; kws...)
     Text(JuliaSyntaxFormatter.formatsrc(ex; kws...))
 end
 
-function debug_lower(mod, ex; expr_compat_mode=false, verbose=false, do_eval=false)
+function debug_lower(mod::Module, ex::SyntaxTree; expr_compat_mode::Bool=false, verbose::Bool=false, do_eval::Bool=false)
     ctx1, ex_macroexpand = JuliaLowering.expand_forms_1(mod, ex, expr_compat_mode, Base.get_world_counter())
 
     verbose && @info "Macro expanded" formatsrc(ex_macroexpand, color_by=:scope_layer)
@@ -502,7 +502,7 @@ end
 
 src = """
 function f(y)
-    x = 
+    x =
     try
         try
             error("hi")
@@ -908,4 +908,3 @@ ex = parsestmt(SyntaxTree, src, filename="foo.jl")
 # for e in Meta.parseall(text).args
 #     Meta.lower(JuliaLowering, e)
 # end
-

JuliaLowering/test/repl_mode.jl

@@ -19,7 +19,7 @@ function is_incomplete(prompt_state)
     end
 end
 
-function eval_ish(mod, ex, do_eval, do_print_ir)
+function eval_ish(mod::Module, ex::SyntaxTree, do_eval::Bool, do_print_ir::Bool)
     k = kind(ex)
     if k == K"toplevel"
         x = nothing
@@ -79,4 +79,3 @@ function __init__()
 end
 
 end
-

JuliaLowering/test/utils.jl

@@ -262,7 +262,7 @@ function watch_ir_tests(dir, delay=0.5)
     end
 end
 
-function lower_str(mod, s)
+function lower_str(mod::Module, s::AbstractString)
     ex = parsestmt(JuliaLowering.SyntaxTree, s)
     return JuliaLowering.to_lowered_expr(mod, JuliaLowering.lower(mod, ex))
 end
@@ -356,7 +356,7 @@ end
 # Parse a file and lower the top level expression one child at a time, finding
 # any top level statement that fails lowering and producing a partially reduced
 # test case.
-function reduce_any_failing_toplevel(mod, filename; do_eval=false)
+function reduce_any_failing_toplevel(mod::Module, filename::AbstractString; do_eval::Bool=false)
     text = read(filename, String)
     ex0 = parseall(SyntaxTree, text; filename)
     for ex in children(ex0)
@@ -373,7 +373,7 @@ function reduce_any_failing_toplevel(mod, filename; do_eval=false)
             end
             (reduced,was_reduced) = block_reduction(e->throws_lowering_exc(mod,e), ex)
             if !was_reduced
-                @info "No reduction possible" 
+                @info "No reduction possible"
                 return ex
             else
                 @info "Reduced code" reduced
@@ -383,4 +383,3 @@ function reduce_any_failing_toplevel(mod, filename; do_eval=false)
     end
     nothing
 end
-