[email protected] compat, drop Julia 1.0 support (#70)

Author: aviatesk

.github/workflows/CI.yml

@@ -13,8 +13,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0'
-          - '1'
+          - '1.6'     # current LTS
+          - '1'       # latest stable
           - 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -1,14 +1,14 @@
 name = "LoweredCodeUtils"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
 authors = ["Tim Holy <[email protected]>"]
-version = "2.1.2"
+version = "2.1.4"
 
 [deps]
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
 
 [compat]
-JuliaInterpreter = "0.8.8"
-julia = "1"
+JuliaInterpreter = "0.8.8, 0.9"
+julia = "1.6"
 
 [extras]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

src/codeedges.jl

@@ -100,7 +100,7 @@ const preprinter_sentinel = isdefined(Base.IRShow, :statementidx_lineinfo_printe
 
 if isdefined(Base.IRShow, :show_ir_stmt)
     function print_with_code(preprint, postprint, io::IO, src::CodeInfo)
-        src = JuliaInterpreter.copy_codeinfo(src)
+        src = copy(src)
         JuliaInterpreter.replace_coretypes!(src; rev=true)
         if isdefined(JuliaInterpreter, :reverse_lookup_globalref!)
             JuliaInterpreter.reverse_lookup_globalref!(src.code)
@@ -899,7 +899,7 @@ end
 function print_with_code(io::IO, frame::Frame, obj)
     src = frame.framecode.src
     if isdefined(JuliaInterpreter, :reverse_lookup_globalref!)
-        src = JuliaInterpreter.copy_codeinfo(src)
+        src = copy(src)
         JuliaInterpreter.reverse_lookup_globalref!(src.code)
     end
     print_with_code(io, src, obj)

src/packagedef.jl

@@ -7,8 +7,7 @@ using Base.Meta: isexpr
 
 const SSAValues = Union{Core.Compiler.SSAValue, JuliaInterpreter.SSAValue}
 
-const structheads = VERSION >= v"1.5.0-DEV.702" ? () : (:struct_type, :abstract_type, :primitive_type)
-const trackedheads = (:method, structheads...)
+const trackedheads = (:method,)
 const structdecls = (:_structtype, :_abstracttype, :_primitivetype)
 
 export signature, rename_framemethods!, methoddef!, methoddefs!, bodymethod

src/utils.jl

@@ -76,17 +76,10 @@ function isanonymous_typedef(stmt)
     if isa(stmt, CodeInfo)
         src = stmt    # just for naming consistency
         length(src.code) >= 4 || return false
-        if VERSION >= v"1.5.0-DEV.702"
-            stmt = src.code[end-1]
-            (isexpr(stmt, :call) && is_global_ref(stmt.args[1], Core, :_typebody!)) || return false
-            name = (stmt::Expr).args[2]::Symbol
-            return startswith(String(name), "#")
-        else
-            stmt = src.code[end-1]
-            isexpr(stmt, :struct_type) || return false
-            name = (stmt::Expr).args[1]::Symbol
-            return startswith(String(name), "#")
-        end
+        stmt = src.code[end-1]
+        (isexpr(stmt, :call) && is_global_ref(stmt.args[1], Core, :_typebody!)) || return false
+        name = (stmt::Expr).args[2]::Symbol
+        return startswith(String(name), "#")
     end
     return false
 end
@@ -95,7 +88,6 @@ function istypedef(stmt)
     isa(stmt, Expr) || return false
     stmt = rhs(stmt)
     isa(stmt, Expr) || return false
-    stmt.head ∈ structheads && return true
     @static if all(s->isdefined(Core,s), structdecls)
         if stmt.head === :call
             f = stmt.args[1]
@@ -126,7 +118,6 @@ function typedef_range(src::CodeInfo, idx)
         istart -= 1
     end
     istart >= 1 || error("no initial :global found")
-    stmt.head ∈ structheads && return istart:idx
     iend, n = idx, length(src.code)
     have_typebody = have_equivtypedef = false
     while iend <= n

test/codeedges.jl

@@ -341,8 +341,8 @@ end
         str = String(take!(io))
         @test occursin(r"slot 1:\n  preds: ssas: \[\d+, \d+\], slots: ∅, names: ∅;\n  succs: ssas: \[\d+, \d+, \d+\], slots: ∅, names: ∅;\n  assign @: \[\d+, \d+\]", str)
         @test occursin(r"succs: ssas: ∅, slots: \[\d+\], names: ∅;", str)
-        VERSION >= v"1.1" && @test occursin(r"s:\n  preds: ssas: \[\d+\], slots: ∅, names: ∅;\n  succs: ssas: \[\d+, \d+, \d+\], slots: ∅, names: ∅;\n  assign @: \[\d, \d+\]", str)
-        VERSION >= v"1.1" && @test occursin(r"\d+ preds: ssas: \[\d+\], slots: ∅, names: \[:s\];\n\d+ succs: ssas: ∅, slots: ∅, names: \[:s\];", str)
+        @test occursin(r"s:\n  preds: ssas: \[\d+\], slots: ∅, names: ∅;\n  succs: ssas: \[\d+, \d+, \d+\], slots: ∅, names: ∅;\n  assign @: \[\d, \d+\]", str)
+        @test occursin(r"\d+ preds: ssas: \[\d+\], slots: ∅, names: \[:s\];\n\d+ succs: ssas: ∅, slots: ∅, names: \[:s\];", str)
         LoweredCodeUtils.print_with_code(io, src, cl)
         str = String(take!(io))
         if isdefined(Base.IRShow, :show_ir_stmt)
@@ -357,8 +357,8 @@ end
         edges = CodeEdges(src)
         show(io, edges)
         str = String(take!(io))
-        VERSION >= v"1.1" && @test occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+\], and used by \[\d+, \d+, \d+\]", str)
-        VERSION >= v"1.1" && @test count(occursin("statement $i depends on [1, $(i-1), $(i+1)] and is used by [1, $(i+1)]", str) for i = 1:length(src.code)) == 1
+        @test occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+\], and used by \[\d+, \d+, \d+\]", str)
+        @test count(occursin("statement $i depends on [1, $(i-1), $(i+1)] and is used by [1, $(i+1)]", str) for i = 1:length(src.code)) == 1
         LoweredCodeUtils.print_with_code(io, src, edges)
         str = String(take!(io))
         if isdefined(Base.IRShow, :show_ir_stmt)

test/signatures.jl

@@ -406,30 +406,28 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     rename_framemethods!(frame)
 
     # https://github.com/timholy/Revise.jl/issues/550
-    if Base.VERSION >= v"1.4"
-        using Pkg
-        try
-            # we test with the old version of CBinding, let's do it in an isolated environment
-            Pkg.activate(; temp=true)
-
-            @info "Adding CBinding to the environment for test purposes"
-            Pkg.add(; name="CBinding", version="0.9.4") # `@cstruct` isn't defined for v1.0 and above
-
-            m = Module()
-            Core.eval(m, :(using CBinding))
-
-            ex = :(@cstruct S {
-                val::Int8
-            })
-            empty!(signatures)
-            Core.eval(m, ex)
-            frame = Frame(m, ex)
-            rename_framemethods!(frame)
-            pc = methoddefs!(signatures, frame; define=false)
-            @test !isempty(signatures)   # really we just need to know that `methoddefs!` completed without getting stuck
-        finally
-            Pkg.activate() # back to the original environment
-        end
+    using Pkg
+    try
+        # we test with the old version of CBinding, let's do it in an isolated environment
+        Pkg.activate(; temp=true)
+
+        @info "Adding CBinding to the environment for test purposes"
+        Pkg.add(; name="CBinding", version="0.9.4") # `@cstruct` isn't defined for v1.0 and above
+
+        m = Module()
+        Core.eval(m, :(using CBinding))
+
+        ex = :(@cstruct S {
+            val::Int8
+        })
+        empty!(signatures)
+        Core.eval(m, ex)
+        frame = Frame(m, ex)
+        rename_framemethods!(frame)
+        pc = methoddefs!(signatures, frame; define=false)
+        @test !isempty(signatures)   # really we just need to know that `methoddefs!` completed without getting stuck
+    finally
+        Pkg.activate() # back to the original environment
     end
 end