Merge pull request #38287 from JuliaLang/vc/compiler++

Split and parameterize Core.Compiler.optimize
JuliaLang · Nov 21, 2020 · f805448 · f805448
2 parents 0affcb5 + 14beadd
commit f805448
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/base/compiler/optimize.jl b/base/compiler/optimize.jl
@@ -179,11 +179,11 @@ function stmt_affects_purity(@nospecialize(stmt), ir)
     return true
 end
 
-# run the optimization work
-function optimize(opt::OptimizationState, params::OptimizationParams, @nospecialize(result))
+# Convert IRCode back to CodeInfo and compute inlining cost and sideeffects
+function finish(opt::OptimizationState, params::OptimizationParams, ir, @nospecialize(result))
     def = opt.linfo.def
     nargs = Int(opt.nargs) - 1
-    @timeit "optimizer" ir = run_passes(opt.src, nargs, opt)
+
     force_noinline = _any(@nospecialize(x) -> isexpr(x, :meta) && x.args[1] === :noinline, ir.meta)
 
     # compute inlining and other related optimizations
@@ -271,6 +271,13 @@ function optimize(opt::OptimizationState, params::OptimizationParams, @nospecial
     nothing
 end
 
+# run the optimization work
+function optimize(interp::AbstractInterpreter, opt::OptimizationState, params::OptimizationParams, @nospecialize(result))
+    nargs = Int(opt.nargs) - 1
+    @timeit "optimizer" ir = run_passes(opt.src, nargs, opt)
+    finish(opt, params, ir, result)
+end
+
 
 # whether `f` is pure for inference
 function is_pure_intrinsic_infer(f::IntrinsicFunction)

diff --git a/base/compiler/typeinfer.jl b/base/compiler/typeinfer.jl
@@ -236,7 +236,7 @@ function _typeinf(interp::AbstractInterpreter, frame::InferenceState)
             if opt isa OptimizationState
                 run_optimizer = doopt && may_optimize(interp)
                 if run_optimizer
-                    optimize(opt, OptimizationParams(interp), caller.result)
+                    optimize(interp, opt, OptimizationParams(interp), caller.result)
                     finish(opt.src, interp)
                     # finish updating the result struct
                     validate_code_in_debug_mode(opt.linfo, opt.src, "optimized")
@@ -772,7 +772,7 @@ function typeinf_code(interp::AbstractInterpreter, method::Method, @nospecialize
     if typeinf(interp, frame) && run_optimizer
         opt_params = OptimizationParams(interp)
         opt = OptimizationState(frame, opt_params, interp)
-        optimize(opt, opt_params, result.result)
+        optimize(interp, opt, opt_params, result.result)
         opt.src.inferred = true
     end
     ccall(:jl_typeinf_end, Cvoid, ())