Merge pull request #83 from simeonschaub/sds/fix_on_master

fix IRTools on Julia 1.6

Author: DhairyaLGandhi

.gitignore

@@ -1,2 +1,4 @@
 docs/build
 .DS_Store
+
+Manifest.toml

Manifest.toml

@@ -1,7 +1,7 @@
 name = "IRTools"
 uuid = "7869d1d1-7146-5819-86e3-90919afe41df"
 authors = ["Mike J Innes <[email protected]>"]
-version = "0.4.1"
+version = "0.4.2"
 
 [deps]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

Project.toml

@@ -21,7 +21,7 @@ function IRCode(ir::IR)
   for b in IRTools.blocks(ir)
     if b.id == 1
       for (i, arg) in enumerate(IRTools.arguments(b))
-        defs[arg] = Core.Compiler.Argument(i)
+        defs[arg] = Core.SlotNumber(i)
       end
     else
       @assert isempty(BasicBlock(b).args)
@@ -66,15 +66,30 @@ function IRCode(ir::IR)
   end
 end
 
+if VERSION >= v"1.6.0-DEV.272"
+    isgotoifnot(@nospecialize(ex)) = (@assert !isexpr(ex, :gotoifnot); ex isa Core.GotoIfNot)
+    destruct_gotoifnot(@nospecialize(ex)) = Any[ex.cond, ex.dest]
+
+    isreturn(@nospecialize(ex)) = (@assert !isexpr(ex, :return); ex isa ReturnNode)
+    retval(@nospecialize(ex)) = ex.val
+else
+    isgotoifnot(@nospecialize(ex)) = isexpr(ex, :gotoifnot)
+    destruct_gotoifnot(@nospecialize(ex)) = ex.args
+
+    isreturn(@nospecialize(ex)) = isexpr(ex, :return)
+    retval(@nospecialize(ex)) = ex.args[1]
+end
+
 function blockstarts(ci::CodeInfo)
   bs = Int[]
   terminator = false
   for i = 1:length(ci.code)
     ex = ci.code[i]
-    if isexpr(ex, :gotoifnot)
-      push!(bs, ex.args[2])
+    if isgotoifnot(ex)
+      _, dest = destruct_gotoifnot(ex)
+      push!(bs, dest)
       terminator = true
-    elseif isexpr(ex, GotoNode, :return)
+    elseif ex isa GotoNode || isreturn(ex)
       ex isa GotoNode && push!(bs, ex.label)
       i < length(ci.code) && push!(bs, i+1)
       terminator = false
@@ -108,13 +123,14 @@ function IR(ci::CodeInfo, nargs::Integer; meta = nothing)
       continue
     elseif isexpr(ex, :enter)
       _rename[Core.SSAValue(i)] = push!(ir, Expr(:enter, findfirst(==(ex.args[1]), bs)+1))
-    elseif isexpr(ex, GotoNode)
+    elseif ex isa GotoNode
       branch!(ir, findfirst(==(ex.label), bs)+1)
-    elseif isexpr(ex, :gotoifnot)
-      branch!(ir, findfirst(==(ex.args[2]), bs)+1,
-              unless = rename(ex.args[1]))
-    elseif isexpr(ex, :return)
-      return!(ir, rename(ex.args[1]))
+    elseif isgotoifnot(ex)
+      cond, dest = destruct_gotoifnot(ex)
+      branch!(ir, findfirst(==(dest), bs)+1,
+              unless = rename(cond))
+    elseif isreturn(ex)
+      return!(ir, rename(retval(ex)))
     else
       _rename[Core.SSAValue(i)] = push!(ir, IRTools.stmt(rename(ex), line = ci.codelocs[i]))
     end

src/ir/wrap.jl

@@ -57,13 +57,22 @@ using Core.Compiler: CodeInfo, SlotNumber
 function slots!(ci::CodeInfo)
   ss = Dict{Slot,SlotNumber}()
   for i = 1:length(ci.code)
-    ci.code[i] = MacroTools.prewalk(ci.code[i]) do x
+    function f(x)
       x isa Slot || return x
       haskey(ss, x) && return ss[x]
       push!(ci.slotnames, x.id)
       push!(ci.slotflags, 0x00)
       ss[x] = SlotNumber(length(ci.slotnames))
     end
+    if VERSION >= v"1.6.0-DEV.272"
+      ci.code[i] = MacroTools.prewalk(ci.code[i]) do x
+        x isa Core.ReturnNode ? Core.ReturnNode(f(x.val)) :
+        x isa Core.GotoIfNot ? Core.GotoIfNot(f(x.cond), x.dest) :
+        f(x)
+      end
+    else
+      ci.code[i] = MacroTools.prewalk(f, ci.code[i])
+    end
   end
   return ci
 end

src/reflection/utils.jl

@@ -16,6 +16,11 @@ add(a, b) = a+b
 @test passthrough(add, 2, 3) == 5
 @test passthrough(sin, 1.0) == sin(1.0)
 
+f_returnnode(::T) where {T} = T
+@test passthrough(f_returnnode, 1) == Int
+f_gotoifnot(::Val{x}) where {x} = x ? 1 : 0
+@test passthrough(f_gotoifnot, Val(true)) == 1
+
 @test @code_ir(passthrough, add(2, 3)) isa IR
 
 IRTools.refresh(roundtrip)