Remove mod::Module parameter from to_lowered_expr

The module parameter was unused in the conversion process, so it has
been removed from `to_lowered_expr`, `to_code_info`, and
`_to_lowered_expr` functions along with all their call sites.

Author: aviatesk

src/eval.jl

@@ -120,7 +120,7 @@ end
 
 # Convert SyntaxTree to the CodeInfo+Expr data stuctures understood by the
 # Julia runtime
-function to_code_info(ex::SyntaxTree, mod::Module, slots::Vector{Slot})
+function to_code_info(ex::SyntaxTree, slots::Vector{Slot})
     stmts = Any[]
 
     current_codelocs_stack = ir_debug_info_state(ex)
@@ -155,7 +155,7 @@ function to_code_info(ex::SyntaxTree, mod::Module, slots::Vector{Slot})
 
     stmt_offset = length(stmts)
     for stmt in children(ex)
-        push!(stmts, _to_lowered_expr(mod, stmt, stmt_offset))
+        push!(stmts, _to_lowered_expr(stmt, stmt_offset))
         add_ir_debug_info!(current_codelocs_stack, stmt)
     end
 
@@ -222,11 +222,11 @@ function to_code_info(ex::SyntaxTree, mod::Module, slots::Vector{Slot})
     )
 end
 
-@fzone "JL: to_lowered_expr" function to_lowered_expr(mod::Module, ex::SyntaxTree)
-    _to_lowered_expr(mod, ex, 0)
+@fzone "JL: to_lowered_expr" function to_lowered_expr(ex::SyntaxTree)
+    _to_lowered_expr(ex, 0)
 end
 
-function _to_lowered_expr(mod::Module, ex::SyntaxTree, stmt_offset::Int)
+function _to_lowered_expr(ex::SyntaxTree, stmt_offset::Int)
     k = kind(ex)
     if is_literal(k)
         ex.value
@@ -262,12 +262,12 @@ function _to_lowered_expr(mod::Module, ex::SyntaxTree, stmt_offset::Int)
     elseif k == K"SSAValue"
         Core.SSAValue(ex.var_id + stmt_offset)
     elseif k == K"return"
-        Core.ReturnNode(_to_lowered_expr(mod, ex[1], stmt_offset))
+        Core.ReturnNode(_to_lowered_expr(ex[1], stmt_offset))
     elseif k == K"inert"
         e1 = ex[1]
         getmeta(ex, :as_Expr, false) ? QuoteNode(Expr(e1)) : e1
     elseif k == K"code_info"
-        ir = to_code_info(ex[1], mod, ex.slots)
+        ir = to_code_info(ex[1], ex.slots)
         if ex.is_toplevel_thunk
             Expr(:thunk, ir)
         else
@@ -278,36 +278,36 @@ function _to_lowered_expr(mod::Module, ex::SyntaxTree, stmt_offset::Int)
     elseif k == K"goto"
         Core.GotoNode(ex[1].id + stmt_offset)
     elseif k == K"gotoifnot"
-        Core.GotoIfNot(_to_lowered_expr(mod, ex[1], stmt_offset), ex[2].id + stmt_offset)
+        Core.GotoIfNot(_to_lowered_expr(ex[1], stmt_offset), ex[2].id + stmt_offset)
     elseif k == K"enter"
         catch_idx = ex[1].id
         numchildren(ex) == 1 ?
             Core.EnterNode(catch_idx) :
-            Core.EnterNode(catch_idx, _to_lowered_expr(mod, ex[2], stmt_offset))
+            Core.EnterNode(catch_idx, _to_lowered_expr(ex[2], stmt_offset))
     elseif k == K"method"
-        cs = map(e->_to_lowered_expr(mod, e, stmt_offset), children(ex))
+        cs = map(e->_to_lowered_expr(e, stmt_offset), children(ex))
         # Ad-hoc unwrapping to satisfy `Expr(:method)` expectations
         c1 = cs[1] isa QuoteNode ? cs[1].value : cs[1]
         Expr(:method, c1, cs[2:end]...)
     elseif k == K"newvar"
-        Core.NewvarNode(_to_lowered_expr(mod, ex[1], stmt_offset))
+        Core.NewvarNode(_to_lowered_expr(ex[1], stmt_offset))
     elseif k == K"opaque_closure_method"
-        args = map(e->_to_lowered_expr(mod, e, stmt_offset), children(ex))
+        args = map(e->_to_lowered_expr(e, stmt_offset), children(ex))
         # opaque_closure_method has special non-evaluated semantics for the
         # `functionloc` line number node so we need to undo a level of quoting
         @assert args[4] isa QuoteNode
         args[4] = args[4].value
         Expr(:opaque_closure_method, args...)
     elseif k == K"meta"
-        args = Any[_to_lowered_expr(mod, e, stmt_offset) for e in children(ex)]
+        args = Any[_to_lowered_expr(e, stmt_offset) for e in children(ex)]
         # Unpack K"Symbol" QuoteNode as `Expr(:meta)` requires an identifier here.
         args[1] = args[1].value
         Expr(:meta, args...)
     elseif k == K"static_eval"
         @assert numchildren(ex) == 1
-        _to_lowered_expr(mod, ex[1], stmt_offset)
+        _to_lowered_expr(ex[1], stmt_offset)
     elseif k == K"cfunction"
-        args = Any[_to_lowered_expr(mod, e, stmt_offset) for e in children(ex)]
+        args = Any[_to_lowered_expr(e, stmt_offset) for e in children(ex)]
         if kind(ex[2]) == K"static_eval"
             args[2] = QuoteNode(args[2])
         end
@@ -339,7 +339,7 @@ function _to_lowered_expr(mod::Module, ex::SyntaxTree, stmt_offset::Int)
         if isnothing(head)
             throw(LoweringError(ex, "Unhandled form for kind $k"))
         end
-        Expr(head, map(e->_to_lowered_expr(mod, e, stmt_offset), children(ex))...)
+        Expr(head, map(e->_to_lowered_expr(e, stmt_offset), children(ex))...)
     end
 end
 
@@ -355,7 +355,7 @@ end
         return x
     end
     linear_ir = lower(mod, ex; expr_compat_mode)
-    thunk = to_lowered_expr(mod, linear_ir)
+    thunk = to_lowered_expr(linear_ir)
     Core.eval(mod, thunk)
 end
 

src/hooks.jl

@@ -22,7 +22,7 @@ function core_lowering_hook(@nospecialize(code), mod::Module,
         ctx3, st3 = resolve_scopes(  ctx2, st2)
         ctx4, st4 = convert_closures(ctx3, st3)
         ctx5, st5 = linearize_ir(    ctx4, st4)
-        ex = to_lowered_expr(mod, st5)
+        ex = to_lowered_expr(st5)
         return Core.svec(ex, st5, ctx5)
     catch exc
         @info("JuliaLowering threw given input:", code=code, st0=st0, file=file, line=line, mod=mod)

src/macro_expansion.jl

@@ -147,7 +147,7 @@ function eval_macro_name(ctx::MacroExpansionContext, mctx::MacroContext, ex::Syn
     ctx4, ex4 = convert_closures(ctx3, ex3)
     ctx5, ex5 = linearize_ir(ctx4, ex4)
     mod = current_layer(ctx).mod
-    expr_form = to_lowered_expr(mod, ex5)
+    expr_form = to_lowered_expr(ex5)
     try
         Core.eval(mod, expr_form)
     catch err

src/precompile.jl

@@ -21,7 +21,7 @@ if Base.get_bool_env("JULIA_LOWERING_PRECOMPILE", true)
         JuliaSyntax.parse!(stream; rule=:all)
         st0 = JuliaSyntax.build_tree(SyntaxTree, stream; filename=@__FILE__)
         lwrst = lower(@__MODULE__, st0[1])
-        lwr = to_lowered_expr(@__MODULE__, lwrst)
+        lwr = to_lowered_expr(lwrst)
         @assert Meta.isexpr(lwr, :thunk) && only(lwr.args) isa Core.CodeInfo
     end
 end

src/runtime.jl

@@ -399,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(__module__, ex5)
+    ci = to_lowered_expr(ex5)
     @assert ci isa Core.CodeInfo
 
     # See GeneratedFunctionStub code in base/expr.jl

test/demo.jl

@@ -49,7 +49,7 @@ function debug_lower(mod::Module, ex::SyntaxTree; expr_compat_mode::Bool=false,
     ctx5, ex_compiled = JuliaLowering.linearize_ir(ctx4, ex_converted)
     verbose && @info "Linear IR" formatsrc(ex_compiled, color_by=:var_id) Text(sprint(JuliaLowering.print_ir, ex_compiled))
 
-    ex_expr = JuliaLowering.to_lowered_expr(mod, ex_compiled)
+    ex_expr = JuliaLowering.to_lowered_expr(ex_compiled)
     verbose && @info "CodeInfo" ex_expr
 
     if do_eval

test/repl_mode.jl

@@ -34,7 +34,7 @@ function eval_ish(mod::Module, ex::SyntaxTree, do_eval::Bool, do_print_ir::Bool)
     end
     if do_eval
         println(stdout, "#----------------------")
-        expr_form = JuliaLowering.to_lowered_expr(mod, linear_ir)
+        expr_form = JuliaLowering.to_lowered_expr(linear_ir)
         Base.eval(mod, expr_form)
     end
 end

test/utils.jl

@@ -264,7 +264,7 @@ end
 
 function lower_str(mod::Module, s::AbstractString)
     ex = parsestmt(JuliaLowering.SyntaxTree, s)
-    return JuliaLowering.to_lowered_expr(mod, JuliaLowering.lower(mod, ex))
+    return JuliaLowering.to_lowered_expr(JuliaLowering.lower(mod, ex))
 end
 
 # See Julia Base tests in "test/docs.jl"
@@ -362,7 +362,7 @@ function reduce_any_failing_toplevel(mod::Module, filename::AbstractString; do_e
     for ex in children(ex0)
         try
             ex_compiled = JuliaLowering.lower(mod, ex)
-            ex_expr = JuliaLowering.to_lowered_expr(mod, ex_compiled)
+            ex_expr = JuliaLowering.to_lowered_expr(ex_compiled)
             if do_eval
                 Base.eval(mod, ex_expr)
             end