Remove nonscalar setindex from the new optimizer

Author: mbauman

base/compiler/optimize.jl

@@ -263,7 +263,7 @@ function isinlineable(m::Method, src::CodeInfo, mod::Module, params::Params, bon
     return inlineable
 end
 
-const enable_new_optimizer = RefValue(false)
+const enable_new_optimizer = RefValue(true)
 
 # converge the optimization work
 function optimize(me::InferenceState)

base/compiler/ssair/inlining2.jl

@@ -32,7 +32,9 @@ function batch_inline!(todo, ir, domtree, linetable, sv)
 
         if first_bb != block
             new_range = first_bb+1:block
-            bb_rename[new_range] = (1:length(new_range)) .+ length(new_cfg_blocks)
+            for (offset, idx) in pairs(new_range)
+                bb_rename[idx] = offset + length(new_cfg_blocks)
+            end
             append!(new_cfg_blocks, map(copy, ir.cfg.blocks[new_range]))
             push!(merged_orig_blocks, last(new_range))
         end
@@ -106,7 +108,9 @@ function batch_inline!(todo, ir, domtree, linetable, sv)
         end
     end
     new_range = first_bb+1:length(ir.cfg.blocks)
-    bb_rename[new_range] = (1:length(new_range)) .+ length(new_cfg_blocks)
+    for (offset, idx) in pairs(new_range)
+        bb_rename[idx] = offset + length(new_cfg_blocks)
+    end
     append!(new_cfg_blocks, ir.cfg.blocks[new_range])
 
     # Rename edges original bbs

base/compiler/ssair/ir.jl

@@ -545,7 +545,9 @@ function resize!(compact::IncrementalCompact, nnewnodes)
     resize!(compact.result_types, nnewnodes)
     resize!(compact.result_lines, nnewnodes)
     resize!(compact.used_ssas, nnewnodes)
-    compact.used_ssas[(old_length+1):nnewnodes] = 0
+    for i in (old_length+1):nnewnodes
+        compact.used_ssas[i] = 0
+    end
     nothing
 end
 

base/compiler/ssair/slot2ssa.jl

@@ -375,8 +375,8 @@ function domsort_ssa!(ir, domtree)
         end
         old_inst_range = ir.cfg.blocks[bb].stmts
         inst_range = (1:length(old_inst_range)) .+ bb_start_off
-        inst_rename[old_inst_range] = Any[SSAValue(x) for x in inst_range]
         for (nidx, idx) in zip(inst_range, old_inst_range)
+            inst_rename[idx] = SSAValue(nidx)
             stmt = ir.stmts[idx]
             if isa(stmt, PhiNode)
                 result_stmts[nidx] = rename_phinode_edges(stmt, bb, result_order, bb_rename)