fixup! optimizer: Add early finalize calls

Author: jpsamaroo

base/compiler/optimize.jl

@@ -168,7 +168,7 @@ function early_finalize!(ir::IRCode, estate::EscapeState)
         end
     end
 
-    compact!(ir)
+    ir
 end
 
 mutable struct OptimizationState
@@ -598,7 +598,6 @@ function run_passes(ci::CodeInfo, sv::OptimizationState, caller::InferenceResult
             state = analyze_escapes(ir, nargs, false, getter)
             cache_escapes!(caller, state)
         end
-        @timeit "Early Finalize" ir = early_finalize!(ir, state)
     end
     @timeit "Inlining"  ir = ssa_inlining_pass!(ir, ir.linetable, sv.inlining, ci.propagate_inbounds)
     # @timeit "verify 2" verify_ir(ir)

base/compiler/ssair/passes.jl

@@ -590,7 +590,13 @@ function sroa_pass!(ir::IRCode, nargs::Int, getargescapes::T) where T
                 elseif isexpr(def, :new)
                     typ = unwrap_unionall(widenconst(argextype(SSAValue(defidx), compact)))
                     if typ isa DataType
-                        ismutabletype(typ) && continue # mutable SROA is performed later
+                        if ismutabletype(typ)
+                            if stmt.args[1] isa QuoteNode && stmt.args[1].value == :jl_gc_add_finalizer_th
+                                # Track this for `early_finalize!`
+                                anymutability = true
+                            end
+                            continue # mutable SROA is performed later
+                        end
                         record_immutable_preserve!(new_preserves, def, compact)
                         push!(preserved, preserved_arg.id)
                     end
@@ -880,6 +886,8 @@ function sroa_mutables!(ir::IRCode, nargs::Int, getargescapes::T) where T
         end
     end
 
+    @timeit "Early Finalize" ir = early_finalize!(ir, estate)
+
     return ir
 end