Switch to JuliaInterpreter 0.8

Author: timholy

.appveyor.yml

@@ -1,9 +1,6 @@
 environment:
   matrix:
   - julia_version: 1.0
-  - julia_version: 1.1
-  - julia_version: 1.2
-  - julia_version: 1.3
   - julia_version: 1
   - julia_version: nightly
 

.travis.yml

@@ -6,9 +6,6 @@ os:
 
 julia:
   - 1.0
-  - 1.1
-  - 1.2
-  - 1.3
   - 1
   - nightly
 
@@ -25,7 +22,7 @@ codecov: true
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.4
+      julia: 1
       os: linux
       arch: x64
       script:

Project.toml

@@ -1,13 +1,13 @@
 name = "LoweredCodeUtils"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
 authors = ["Tim Holy <[email protected]>"]
-version = "1.1.3"
+version = "1.2.0"
 
 [deps]
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
 
 [compat]
-JuliaInterpreter = "0.7.23"
+JuliaInterpreter = "0.8"
 julia = "1"
 
 [extras]

docs/src/edges.md

@@ -251,7 +251,7 @@ We can test this with the following:
 ```julia
 julia> using JuliaInterpreter
 
-julia> frame = JuliaInterpreter.prepare_thunk(Main, lwr)
+julia> frame = Frame(Main, lwr.args[1])
 Frame for Main
    1 2  1 ─       s = 0
    2 3  │         k = 5

docs/src/signatures.md

@@ -140,7 +140,7 @@ We can also rename these methods, if we first turn it into a `frame`:
 ```julia
 julia> using JuliaInterpreter
 
-julia> frame = JuliaInterpreter.prepare_thunk(Main, lwr)
+julia> frame = Frame(Main, lwr.args[1])
 Frame for Main
    1 0  1 ─       $(Expr(:thunk, CodeInfo(
    2 0  1 ─     return $(Expr(:method, :f))

src/packagedef.jl

@@ -32,10 +32,13 @@ if ccall(:jl_generating_output, Cint, ()) == 1
         @assert precompile(Tuple{typeof(f), Any, ct, Frame})
         @assert precompile(Tuple{Core.kwftype(typeof(f)), kwdefine, typeof(f), Function, ct, Frame})
     end
+    @assert precompile(Tuple{typeof(rename_framemethods!), Any, Frame, Dict{Symbol,MethodInfo},
+                             Vector{SelfCall}, Dict{Symbol,Union{Nothing, Bool, Symbol}}})
     @assert precompile(Tuple{typeof(rename_framemethods!), Any, Frame, Dict{Symbol,MethodInfo},
                              Vector{NamedTuple{(:linetop, :linebody, :callee, :caller),Tuple{Int64,Int64,Symbol,Union{Bool, Symbol}}}},
                              Dict{Symbol,Union{Bool, Symbol}}})
     @assert precompile(Tuple{typeof(identify_framemethod_calls), Frame})
+    @assert precompile(Tuple{typeof(callchain), Vector{SelfCall}})
     @assert precompile(Tuple{typeof(callchain), Vector{NamedTuple{(:linetop, :linebody, :callee, :caller),Tuple{Int64,Int64,Symbol,Union{Bool, Symbol}}}}})
 
     @assert precompile(CodeEdges, (CodeInfo,))

src/signatures.jl

@@ -110,7 +110,7 @@ struct SelfCall
     linetop::Int
     linebody::Int
     callee::Symbol
-    caller::Union{Symbol,Bool}
+    caller::Union{Symbol,Bool,Nothing}
 end
 
 """
@@ -169,7 +169,7 @@ function identify_framemethod_calls(frame)
             end
             msrc = stmt.args[3]
             if msrc isa CodeInfo
-                key = key::Union{Symbol,Bool}
+                key = key::Union{Symbol,Bool,Nothing}
                 for (j, mstmt) in enumerate(msrc.code)
                     isa(mstmt, Expr) || continue
                     if mstmt.head === :call
@@ -209,7 +209,7 @@ function identify_framemethod_calls(frame)
 end
 
 function callchain(selfcalls)
-    calledby = Dict{Symbol,Union{Symbol,Bool}}()
+    calledby = Dict{Symbol,Union{Symbol,Bool,Nothing}}()
     for sc in selfcalls
         startswith(String(sc.callee), '#') || continue
         caller = get(calledby, sc.callee, nothing)

test/codeedges.jl

@@ -59,7 +59,7 @@ end
         k = rand()
         b = 2*a + 5
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     # Check that the result of direct evaluation agrees with selective evaluation
@@ -98,7 +98,7 @@ end
             a2 = 2
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = lines_required(:a2, src, edges)
@@ -119,7 +119,7 @@ end
             y3 = 7
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = lines_required(:a3, src, edges)
@@ -140,7 +140,7 @@ end
     Core.eval(ModEval, ex)
     @test ModEval.foo() == 0
     @test ModEval.bar() == 1
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     # Mark just the load of Core.eval
@@ -167,7 +167,7 @@ end
             k11 += i
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     JuliaInterpreter.finish_and_return!(frame, true)
     @test ModSelective.k11 == 11
     @test 3 <= ModSelective.s11 <= 15
@@ -180,7 +180,7 @@ end
 
     # Control-flow in an abstract type definition
     ex = :(abstract type StructParent{T, N} <: AbstractArray{T, N} end)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     # Check that the StructParent name is discovered everywhere it is used
@@ -191,7 +191,7 @@ end
     @test supertype(ModSelective.StructParent) === AbstractArray
     # Also check redefinition (it's OK when the definition doesn't change)
     Core.eval(ModEval, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModEval, ex)
+    frame = Frame(ModEval, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = minimal_evaluation(hastrackedexpr, src, edges)
@@ -201,7 +201,7 @@ end
     # Finding all dependencies in a struct definition
     # Nonparametric
     ex = :(struct NoParam end)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    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
@@ -213,7 +213,7 @@ end
             x::Vector{T}
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    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
@@ -230,7 +230,7 @@ end
             end
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod3(stmt),false), src, edges)  # initially mark only the constructor
@@ -240,7 +240,7 @@ end
 
     # Anonymous functions
     ex = :(max_values(T::Union{map(X -> Type{X}, Base.BitIntegerSmall_types)...}) = 1 << (8*sizeof(T)))
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+    frame = Frame(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = fill(false, length(src.code))
@@ -259,7 +259,7 @@ end
         end
     end
     Core.eval(ModEval, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModEval, ex)
+    frame = Frame(ModEval, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = minimal_evaluation(stmt->(LoweredCodeUtils.ismethod3(stmt),false), src, edges; exclude_named_typedefs=true)  # initially mark only the constructor
@@ -325,7 +325,7 @@ end
             @test occursin("No IR statement printer", str)
         end
         # Works with Frames too
-        frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+        frame = Frame(ModSelective, ex)
         edges = CodeEdges(frame.framecode.src)
         LoweredCodeUtils.print_with_code(io, frame, edges)
         str = String(take!(io))

test/signatures.jl

@@ -87,7 +87,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
                :((::Caller)(x::String) = length(x)),
                )
         Core.eval(Lowering, ex)
-        frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+        frame = Frame(Lowering, ex)
         rename_framemethods!(frame)
         pc = methoddefs!(signatures, frame; define=false)
         push!(newcode, frame.framecode.src)
@@ -145,25 +145,25 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
         end
     end
     Core.eval(Lowering, ex)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     methoddefs!(signatures, frame; define=false)
     @test length(signatures) == 1
     @test LoweredCodeUtils.whichtt(signatures[1]) == first(methods(Lowering.fouter))
 
     # Check output of methoddef!
-    frame = JuliaInterpreter.prepare_thunk(Lowering, :(function nomethod end))
+    frame = Frame(Lowering, :(function nomethod end))
     ret = methoddef!(empty!(signatures), frame; define=true)
     @test isempty(signatures)
     @test ret === nothing
-    frame = JuliaInterpreter.prepare_thunk(Lowering, :(function amethod() nothing end))
+    frame = Frame(Lowering, :(function amethod() nothing end))
     ret = methoddef!(empty!(signatures), frame; define=true)
     @test !isempty(signatures)
     @test isa(ret, NTuple{2,Int})
 
     # Anonymous functions in method signatures
     ex = :(max_values(T::Union{map(X -> Type{X}, Base.BitIntegerSmall_types)...}) = 1 << (8*sizeof(T)))  # base/abstractset.jl
-    frame = JuliaInterpreter.prepare_thunk(Base, ex)
+    frame = Frame(Base, ex)
     rename_framemethods!(frame)
     signatures = Set{Any}()
     methoddef!(signatures, frame; define=false)
@@ -172,11 +172,11 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
 
     # define
     ex = :(fdefine(x) = 1)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
     @test_throws MethodError Lowering.fdefine(0)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     empty!(signatures)
     methoddefs!(signatures, frame; define=true)
     @test Lowering.fdefine(0) == 1
@@ -191,7 +191,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
             return ex
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=true)
@@ -200,14 +200,14 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     ex = quote
         another_kwdef(x, y=1; z="hello") = 333
     end
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=true)
     @test length(signatures) == 5
     @test Lowering.another_kwdef(0) == 333
     ex = :(@generated genkw2(; b=2) = nothing)  # https://github.com/timholy/Revise.jl/issues/290
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     # rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=true)
@@ -229,7 +229,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
             end
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(Base, ex)
+    frame = Frame(Base, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     stmt = JuliaInterpreter.pc_expr(frame)
@@ -242,7 +242,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
 
     # With anonymous functions in signatures
     ex = :(const BitIntegerType = Union{map(T->Type{T}, Base.BitInteger_types)...})
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
@@ -275,17 +275,17 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
             end
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(Base, ex)
+    frame = Frame(Base, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
     @test length(signatures) >= 3
 
     ex = :(typedsig(x) = 1)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     methoddefs!(signatures, frame; define=true)
     ex = :(typedsig(x::Int) = 2)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     JuliaInterpreter.next_until!(LoweredCodeUtils.ismethod3, frame, true)
     empty!(signatures)
     methoddefs!(signatures, frame; define=true)
@@ -299,7 +299,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
         keywrd3(x; kwarg=:stuff) = 3
     end
     Core.eval(Lowering, ex)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     pc, pc3 = methoddef!(signatures, frame; define=false)
@@ -312,7 +312,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
 
     # Module-scoping
     ex = :(Base.@irrational π        3.14159265358979323846  pi)
-    frame = JuliaInterpreter.prepare_thunk(Base.MathConstants, ex)
+    frame = Frame(Base.MathConstants, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
@@ -330,7 +330,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
         end
     end
     Core.eval(Lowering, ex)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
     empty!(signatures)
     methoddefs!(signatures, frame; define=false)
@@ -344,7 +344,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
         end
     end
     Core.eval(Lowering, ex)
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     dct = rename_framemethods!(frame)
     ks = collect(filter(k->startswith(String(k), "#Items#"), keys(dct)))
     @test length(ks) == 2
@@ -364,7 +364,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
      end)
     empty!(signatures)
     Core.eval(Lowering422, ex)
-    frame = JuliaInterpreter.prepare_thunk(Lowering422, ex)
+    frame = Frame(Lowering422, ex)
     rename_framemethods!(frame)
     pc = methoddefs!(signatures, frame; define=false)
     @test typeof(Lowering422.fneg) ∈ Set(Base.unwrap_unionall(sig).parameters[1] for sig in signatures)
@@ -384,6 +384,6 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
             end
         end
     end
-    frame = JuliaInterpreter.prepare_thunk(Lowering, ex)
+    frame = Frame(Lowering, ex)
     rename_framemethods!(frame)
 end