Fix tests on 1.8 & nightly (#74)

This package never got updated for changes in lowering in Julia 1.8.
Moreover, other changes in lowering were made for Julia 1.9.
This gets the existing test suite passing, in part by disabling some of the
specific tests on recent Julia versions. The disabled tests check for fairly
specific features of lowering (which lines depend on which exact other lines),
and those features have not proven to be particularly durable.
Hopefully none of these tests were among our only ways of checking
whether function is preserved (which is the more important metric
of success). Revise will be a good testbed, but for it to
pass we'll also need #73.

Author: timholy

src/signatures.jl

@@ -609,6 +609,9 @@ function bodymethod(mkw::Method)
                 has_self_call(src, src.code[id]) || return m
             end
             f = stmt.args[end-2]
+            if isa(f, JuliaInterpreter.SSAValue)
+                f = src.code[f.id]
+            end
         else
             has_self_call(src, stmt) || return m
         end

src/utils.jl

@@ -66,6 +66,40 @@ ismethod3(frame::Frame) = ismethod3(pc_expr(frame))
 ismethod(stmt)  = isexpr(stmt, :method)
 ismethod1(stmt) = isexpr(stmt, :method, 1)
 ismethod3(stmt) = isexpr(stmt, :method, 3)
+function ismethod_with_name(src, stmt, target::AbstractString; reentrant::Bool=false)
+    if reentrant
+        name = stmt
+    else
+        ismethod3(stmt) || return false
+        name = stmt.args[1]
+        if name === nothing
+            name = stmt.args[2]
+        end
+    end
+    isdone = false
+    while !isdone
+        if name isa AnySSAValue || name isa AnySlotNumber
+            name = src.code[name.id]
+        elseif isexpr(name, :call) && is_quotenode_egal(name.args[1], Core.svec)
+            name = name.args[2]
+        elseif isexpr(name, :call) && is_quotenode_egal(name.args[1], Core.apply_type)
+            for arg in name.args[2:end]
+                ismethod_with_name(src, arg, target; reentrant=true) && return true
+            end
+            isdone = true
+        elseif isexpr(name, :call) && is_quotenode_egal(name.args[1], UnionAll)
+            for arg in name.args[2:end]
+                ismethod_with_name(src, arg, target; reentrant=true) && return true
+            end
+            isdone = true
+        else
+            isdone = true
+        end
+    end
+    return match(Regex("(^|#)$target(\$|#)"), string(name)) !== nothing
+end
+
+
 
 # anonymous function types are defined in a :thunk expr with a characteristic CodeInfo
 function isanonymous_typedef(stmt)

test/codeedges.jl

@@ -65,7 +65,7 @@ end
     # Check that the result of direct evaluation agrees with selective evaluation
     Core.eval(ModEval, ex)
     isrequired = lines_required(:x, src, edges)
-    @test sum(isrequired) == 1
+    @test sum(isrequired) == 1 + isdefined(Core, :get_binding_type) * 3  # get_binding_type + convert + typeassert
     selective_eval_fromstart!(frame, isrequired)
     @test ModSelective.x === ModEval.x
     @test allmissing(ModSelective, (:y, :z, :a, :b, :k))
@@ -204,7 +204,7 @@ end
     frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
-    isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod3(stmt)&&stmt.args[1]===:NoParam,false), src, edges)  # initially mark only the constructor
+    isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod_with_name(src, stmt, "NoParam"),false), src, edges)  # initially mark only the constructor
     selective_eval_fromstart!(frame, isrequired, true)
     @test isa(ModSelective.NoParam(), ModSelective.NoParam)
     # Parametric
@@ -216,7 +216,7 @@ end
     frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
-    isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod3(stmt)&&stmt.args[1]===:Struct,false), src, edges)  # initially mark only the constructor
+    isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod_with_name(src, stmt, "Struct"),false), src, edges)  # initially mark only the constructor
     selective_eval_fromstart!(frame, isrequired, true)
     @test isa(ModSelective.Struct([1,2,3]), ModSelective.Struct{Int})
     # Keyword constructor (this generates :copyast expressions)
@@ -341,29 +341,42 @@ 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)
-        @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)
+        @test occursin(r"s:\n  preds: ssas: \[\d+\], slots: ∅, names: ∅;\n  succs: ssas: \[\d+, \d+, \d+\], slots: ∅, names: ∅;\n  assign @: \[\d, \d+\]", str) ||
+              occursin(r"s:\n  preds: ssas: \[\d+, \d+\], slots: ∅, names: ∅;\n  succs: ssas: \[\d+, \d+, \d+\], slots: ∅, names: ∅;\n  assign @: \[\d, \d+\]", str)   # with global var inference
+        if Base.VERSION < v"1.8" # changed by global var inference
+            @test occursin(r"\d+ preds: ssas: \[\d+\], slots: ∅, names: \[:s\];\n\d+ succs: ssas: ∅, slots: ∅, names: \[:s\];", str)
+        end
         LoweredCodeUtils.print_with_code(io, src, cl)
         str = String(take!(io))
         if isdefined(Base.IRShow, :show_ir_stmt)
             @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("# see name s", str)
             @test occursin("# see slot 1", str)
-            @test occursin(r"# preds: ssas: \[\d+\], slots: ∅, names: \[:s\]; succs: ssas: ∅, slots: ∅, names: \[:s\];", str)
+            if Base.VERSION < v"1.8"  # changed by global var inference
+                @test occursin(r"# preds: ssas: \[\d+\], slots: ∅, names: \[:s\]; succs: ssas: ∅, slots: ∅, names: \[:s\];", str)
+            end
         else
             @test occursin("No IR statement printer", str)
         end
         # CodeEdges
         edges = CodeEdges(src)
         show(io, edges)
         str = String(take!(io))
-        @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
+        @test occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+\], and used by \[\d+, \d+, \d+\]", str) ||
+              occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+, \d+\], and used by \[\d+, \d+, \d+\]", str)   # global var inference
+        if Base.VERSION < v"1.9"
+            @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) ||
+                  (count(occursin("statement $i depends on [4, $(i-1), $(i+4)] and is used by [$(i+2)]", str) for i = 1:length(src.code)) == 1)
+        end
         LoweredCodeUtils.print_with_code(io, src, edges)
         str = String(take!(io))
         if isdefined(Base.IRShow, :show_ir_stmt)
-            @test occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+\], and used by \[\d+, \d+, \d+\]", str)
-            @test count(occursin("preds: [1, $(i-1), $(i+1)], succs: [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) ||
+                  occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+, \d+\], and used by \[\d+, \d+, \d+\]", str)
+            if Base.VERSION < v"1.9"
+                @test (count(occursin("preds: [1, $(i-1), $(i+1)], succs: [1, $(i+1)]", str) for i = 1:length(src.code)) == 1) ||
+                      (count(occursin("preds: [4, $(i-1), $(i+4)], succs: [$(i+2)]", str) for i = 1:length(src.code)) == 1)   # global var inference
+            end
         else
             @test occursin("No IR statement printer", str)
         end
@@ -373,8 +386,12 @@ end
         LoweredCodeUtils.print_with_code(io, frame, edges)
         str = String(take!(io))
         if isdefined(Base.IRShow, :show_ir_stmt)
-            @test occursin(r"s: assigned on \[\d, \d+\], depends on \[\d+\], and used by \[\d+, \d+, \d+\]", str)
-            @test count(occursin("preds: [1, $(i-1), $(i+1)], succs: [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) ||
+                  occursin(r"s: assigned on \[\d, \d+\], depends on \[\d, \d+\], and used by \[\d+, \d+, \d+\]", str)   # global var inference
+            if Base.VERSION < v"1.9"
+                @test (count(occursin("preds: [1, $(i-1), $(i+1)], succs: [1, $(i+1)]", str) for i = 1:length(src.code)) == 1) ||
+                      (count(occursin("preds: [4, $(i-1), $(i+4)], succs: [$(i+2)]", str) for i = 1:length(src.code)) == 1)  # global var inference
+            end
         else
             @test occursin("No IR statement printer", str)
         end

test/signatures.jl

@@ -279,7 +279,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
-    @test length(signatures) >= 3
+    @test length(signatures) >= 3 - isdefined(Core, :kwcall)
 
     ex = :(typedsig(x) = 1)
     frame = Frame(Lowering, ex)
@@ -350,8 +350,10 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     @test length(ks) == 2
     @test dct[ks[1]] == dct[ks[2]]
     @test isdefined(Lowering, ks[1]) || isdefined(Lowering, ks[2])
-    nms = filter(sym->occursin(r"#Items#\d+#\d+", String(sym)), names(Lowering; all=true))
-    @test length(nms) == 1
+    if !isdefined(Core, :kwcall)
+        nms = filter(sym->occursin(r"#Items#\d+#\d+", String(sym)), names(Lowering; all=true))
+        @test length(nms) == 1
+    end
 
     # https://github.com/timholy/Revise.jl/issues/422
     ex = :(@generated function fneg(x::T) where T<:LT{<:FloatingTypes}