type inference fix

fixes #21
FluxML · Feb 4, 2020 · 97a13bd · 97a13bd
1 parent e3fd59d
commit 97a13bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/ir/ir.jl b/src/ir/ir.jl
@@ -538,6 +538,8 @@ function setindex!(ir::IR, x, i::Variable)
   b[i] = x
 end
 
+setindex!(b::Block, x, i::Variable) = setindex!(b.ir, x, i)
+
 function Base.delete!(ir::IR, i::Variable)
   ir[i] = nothing
   ir.defs[i.id] = (-1, -1)

diff --git a/src/reflection/utils.jl b/src/reflection/utils.jl
@@ -38,7 +38,13 @@ function slots!(ir::IR)
     for br in BasicBlock(b).branches
       isreturn(br) && continue
       for (i, val) in enumerate(br.args)
-        push!(b, :($(phislot(br.block, i)) = $val))
+        ϕ = phislot(br.block, i)
+        if val in keys(b) && !isexpr(b[val].expr, :(=))
+          b[val] = :($ϕ = $(b[val].expr))
+          slots[val] = ϕ
+        else
+          push!(b, :($ϕ = $val))
+        end
       end
       empty!(br.args)
     end