Minor fixups

Author: Ian Atol

base/compiler/ssair/ir.jl

@@ -712,17 +712,17 @@ function dominates_ssa(compact::IncrementalCompact, domtree::DomTree, x::AnySSAV
     if xb == yb
         xinfo = yinfo = nothing
         if isa(x, OldSSAValue)
-            x′ = compact.ssa_rename[x]::SSAValue
+            x′ = compact.ssa_rename[x.id]::SSAValue
         elseif isa(x, NewSSAValue)
-            xinfo = compact.new_new_nodes.infos[x.id]
+            xinfo = compact.new_new_nodes.info[x.id]
             x′ = SSAValue(xinfo.pos)
         else
             x′ = x
         end
         if isa(y, OldSSAValue)
-            y′ = compact.ssa_rename[y]::SSAValue
+            y′ = compact.ssa_rename[y.id]::SSAValue
         elseif isa(y, NewSSAValue)
-            yinfo = compact.new_new_nodes.infos[x.id]
+            yinfo = compact.new_new_nodes.info[y.id]
             y′ = SSAValue(yinfo.pos)
         else
             y′ = y

test/compiler/irpasses.jl

@@ -843,7 +843,7 @@ let e = Expr(:call, Core.GlobalRef(Base, :arrayset), false, Core.SSAValue(4), Co
 end
 
 # Test that SROA doesn't try to forward a previous iteration's SSA value
-function sroa_no_forward()
+let sroa_no_forward() = begin
     res = (0, 0)
     for i in 1:5
         a = first(res)
@@ -853,5 +853,6 @@ function sroa_no_forward()
         end
     end
     return res
+    end
+    @test sroa_no_forward() == (1, 2.0)
 end
-@test sroa_no_forward() == (1, 2.0)