small refactor of renumber_stuff! (JuliaLang#27688)

* move changemap preprocessing/check into renumbering method

* give renumber_stuff! a better name

base/compiler/optimize.jl

@@ -491,7 +491,13 @@ function is_known_call_p(e::Expr, @nospecialize(pred), src, spvals)
  return (isa(f, Const) && pred(f.val)) || (isType(f) && pred(f.parameters[1]))
 end
 
-function renumber_stuff!(body::Vector{Any}, changemap::Vector{Int})
+function renumber_ir_elements!(body::Vector{Any}, changemap::Vector{Int}, preprocess::Bool = true)
+ if preprocess
+ for i = 2:length(changemap)
+ changemap[i] += changemap[i - 1]
+ end
+ end
+ changemap[end] != 0 || return
  for i = 1:length(body)
  el = body[i]
  if isa(el, GotoNode)
@@ -510,7 +516,7 @@ function renumber_stuff!(body::Vector{Any}, changemap::Vector{Int})
  tgt = el.args[1]::Int
  el.args[1] = tgt + changemap[tgt]
  elseif !is_meta_expr_head(el.head)
- renumber_stuff!(el.args, changemap)
+ renumber_ir_elements!(el.args, changemap, false)
  end
  end
  end

base/compiler/ssair/driver.jl

@@ -71,12 +71,7 @@ function just_construct_ssa(ci::CodeInfo, code::Vector{Any}, nargs::Int, spvals:
  idx += 1
  oldidx += 1
  end
- for i = 2:length(changemap)
- changemap[i] += changemap[i-1]
- end
- if changemap[end] != 0
- renumber_stuff!(code, changemap)
- end
+ renumber_ir_elements!(code, changemap)
 
  inbounds_depth = 0 # Number of stacked inbounds
  meta = Any[]

base/compiler/typeinfer.jl

@@ -429,12 +429,7 @@ function type_annotate!(sv::InferenceState)
  end
 
  if run_optimizer
- for i = 2:length(changemap)
- changemap[i] += changemap[i - 1]
- end
- if changemap[end] != 0
- renumber_stuff!(body, changemap)
- end
+ renumber_ir_elements!(body, changemap)
  end
 
  # finish marking used-undef variables