fixup! fixup! fixup! fixup! optimizer: Add early finalize calls

Author: jpsamaroo

base/compiler/optimize.jl

@@ -120,12 +120,20 @@ Analyzes `ir` for heap allocations which escape only via `FinalizerEscape`
 `finalize(obj)` just before any return where the allocation doesn't escape.
 """
 function early_finalize!(ir::IRCode, estate::EscapeState, domtree::DomTree)
+    EARLY_FINALIZE_VERBOSE[] && ccall(:jl_safe_printf, Cvoid, (Ptr{UInt8}, Int), "early_finalize!: Analyzing with nargs %d\n", estate.nargs)
     # Find all allocations that escape only through a finalizer
     isalloc(ir::IRCode, pc::Int) = isexpr(ir.stmts[pc][:inst], :new)
     to_finalize = Pair{Int,EscapeInfo}[]
+    if length(estate.escapes) != estate.nargs+length(ir.stmts)
+        #=EARLY_FINALIZE_VERBOSE[] &&=# ccall(:jl_safe_printf, Cvoid, (Ptr{UInt8}, Int, Int), "early_finalize!: Mismatched stmts (%d) with escape infos (%d)\n", length(ir.stmts), length(estate.escapes))
+    end
     for idx in (estate.nargs+1):length(estate.escapes)
         info = estate.escapes[idx]
         pc = idx - estate.nargs
+        if pc > length(ir.stmts)
+            # FIXME
+            continue
+        end
         if has_finalizer_escape(info) && isalloc(ir, pc)
             EARLY_FINALIZE_VERBOSE[] && ccall(:jl_safe_printf, Cvoid, (Ptr{UInt8}, Int), "early_finalize!: Found finalizing alloc at %d\n", pc)
             push!(to_finalize, pc => info)
@@ -649,6 +657,7 @@ function run_passes(ci::CodeInfo, sv::OptimizationState, caller::InferenceResult
     # @timeit "verify 2" verify_ir(ir)
     @timeit "compact 2" ir = compact!(ir)
     @timeit "SROA" ir, memory_opt = linear_pass!(ir)
+    @timeit "pre-EA compact" ir = compact!(ir)
     @timeit "Local EA" estate = analyze_escapes(ir, nargs, #=call_resolved=#true, null_escape_cache)
     if false #memory_opt
         @timeit "memory_opt_pass!" ir = memory_opt_pass!(ir, estate)