updates to emit code

chemicalfiend · Aug 22, 2018 · 6137cf3 · 6137cf3
1 parent 553db28
commit 6137cf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/compiler/emit.jl b/src/compiler/emit.jl
@@ -75,7 +75,7 @@ function reverse_stacks!(adj, stks, nargs)
     repl = Dict()
     for (i, (b′, α)) in enumerate(stks)
       b == b′ || continue
-      loc = max(2,range(ir.cfg.blocks[b])[1])
+      loc = max(2,afterphi(ir, range(ir.cfg.blocks[b])[1]))
       if adj.perm[b′] == 1
         val = insert_node!(ir, loc, Any, xcall(:getindex, t, i+nargs))
       else

diff --git a/src/compiler/interface2.jl b/src/compiler/interface2.jl
@@ -9,6 +9,7 @@ ignore(T) = all(T -> T <: Type, T.parameters)
   argnames!(meta, Symbol("#self#"), :ctx, :f, :args)
   forw = varargs!(meta, forw, 3)
   forw = inlineable!(forw)
+  usetyped || (forw = slots!(forw))
   update!(meta, forw)
   return meta.code
 end
@@ -23,7 +24,7 @@ end
   meta, _, back = g
   resize!(back.argtypes, 2)
   argnames!(meta, Symbol("#self#"), :Δ)
-  back = inlineable!(back)
+  back = slots!(inlineable!(back))
   update!(meta, back)
   if usetyped
     # Enable type inference

diff --git a/src/tools/reflection.jl b/src/tools/reflection.jl
@@ -152,7 +152,6 @@ function varargs!(meta, ir::IRCode, n = 1)
 end
 
 function update!(meta, ir::IRCode)
-  usetyped || (ir = slots!(ir))
   Core.Compiler.replace_code_newstyle!(meta.code, ir, length(ir.argtypes)-1)
   usetyped || (meta.code.ssavaluetypes = length(meta.code.code))
   slots!(meta.code)