Merge pull request #43 from JuliaDebug/teh/ji0.8

JuliaInterpeter 0.8 and various improvements

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/codeedges.jl

@@ -94,6 +94,8 @@ function print_names(io::IO, cl::CodeLinks)
     end
 end
 
+const preprinter_sentinel = isdefined(Base.IRShow, :statementidx_lineinfo_printer) ? 0 : typemin(Int32)
+
 if isdefined(Base.IRShow, :show_ir_stmt)
     function print_with_code(preprint, postprint, io::IO, src::CodeInfo)
         src = JuliaInterpreter.copy_codeinfo(src)
@@ -118,7 +120,7 @@ if isdefined(Base.IRShow, :show_ir_stmt)
             bb_idx_prev = bb_idx
         end
         max_bb_idx_size = ndigits(length(cfg.blocks))
-        line_info_preprinter(io, " "^(max_bb_idx_size + 2), typemin(Int32))
+        line_info_preprinter(io, " "^(max_bb_idx_size + 2), preprinter_sentinel)
         postprint(io)
         return nothing
     end
@@ -684,8 +686,10 @@ function lines_required!(isrequired::AbstractVector{Bool}, objs, src::CodeInfo,
         # So far, everything is generic graph traversal. Now we add some domain-specific information.
         # New struct definitions, including their constructors, get spread out over many
         # statements. If we're evaluating any of them, it's important to evaluate *all* of them.
-        for (idx, stmt) in enumerate(src.code)
-            isrequired[idx] || continue
+        idx = 1
+        while idx < length(src.code)
+            stmt = src.code[idx]
+            isrequired[idx] || (idx += 1; continue)
             for (typedefr, typedefn) in zip(typedef_blocks, typedef_names)
                 if idx ∈ typedefr
                     ireq = view(isrequired, typedefr)
@@ -698,12 +702,14 @@ function lines_required!(isrequired::AbstractVector{Bool}, objs, src::CodeInfo,
                             for s in var.succs
                                 s ∈ norequire && continue
                                 stmt2 = src.code[s]
-                                if isexpr(stmt2, :method) && (stmt2::Expr).args[1] === false
+                                if isexpr(stmt2, :method) && (fname = (stmt2::Expr).args[1]; fname === false || fname === nothing)
                                     isrequired[s] = true
                                 end
                             end
                         end
                     end
+                    idx = last(typedefr) + 1
+                    continue
                 end
             end
             # Anonymous functions may not yet include the method definition
@@ -720,6 +726,7 @@ function lines_required!(isrequired::AbstractVector{Bool}, objs, src::CodeInfo,
                     end
                 end
             end
+            idx += 1
         end
         iter += 1  # just for diagnostics
     end

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)
@@ -442,19 +442,18 @@ function methoddef!(@nospecialize(recurse), signatures, frame::Frame, @nospecial
     framecode, pcin = frame.framecode, pc
     if ismethod3(stmt)
         pc3 = pc
-        sigt, pc = signature(recurse, frame, stmt, pc)
-        if sigt === nothing && define
-            step_expr!(recurse, frame, stmt, true)
-        end
+        arg1 = stmt.args[1]
         sigt, pc = signature(recurse, frame, stmt, pc)
         meth = whichtt(sigt)
-        if (meth === nothing || !(meth.sig <: sigt && sigt <: meth.sig)) && define
-            step_expr!(recurse, frame, stmt, true)
+        if isa(meth, Method) && (meth.sig <: sigt && sigt <: meth.sig)
+            pc = next_or_nothing!(frame)
+        elseif define
+            pc = step_expr!(recurse, frame, stmt, true)
             meth = whichtt(sigt)
         end
         if isa(meth, Method)
             push!(signatures, meth.sig)
-        elseif stmt.args[1] === false
+        elseif arg1 === false || arg1 === nothing
             # If it's anonymous and not defined, define it
             pc = step_expr!(recurse, frame, stmt, true)
             meth = whichtt(sigt)
@@ -465,13 +464,13 @@ function methoddef!(@nospecialize(recurse), signatures, frame::Frame, @nospecial
             code = framecode.src
             codeloc = codelocation(code, pc)
             loc = linetable(code, codeloc)
-            ft = Base.unwrap_unionall(Base.unwrap_unionall(sigt).parameters[1])
+            ft = Base.unwrap_unionall((Base.unwrap_unionall(sigt)::DataType).parameters[1])
             if !startswith(String(ft.name.name), "##")
                 @warn "file $(loc.file), line $(loc.line): no method found for $sigt"
             end
         end
         frame.pc = pc
-        return ( define ? step_expr!(recurse, frame, stmt, true) : next_or_nothing!(frame) ), pc3
+        return pc, pc3
     end
     ismethod1(stmt) || error("expected method opening, got ", stmt)
     name = stmt.args[1]
@@ -488,7 +487,8 @@ function methoddef!(@nospecialize(recurse), signatures, frame::Frame, @nospecial
             stmt = pc_expr(frame, pc)
         end
         pc3 = pc
-        name3 = (stmt::Expr).args[1]
+        stmt = stmt::Expr
+        name3 = stmt.args[1]
         sigt === nothing && (error("expected a signature"); return next_or_nothing(frame, pc)), pc3
         # Methods like f(x::Ref{<:Real}) that use gensymmed typevars will not have the *exact*
         # signature of the active method. So let's get the active signature.
@@ -575,7 +575,7 @@ function bodymethod(mkw::Method)
     local src
     while true
         framecode = JuliaInterpreter.get_framecode(m)
-        fakeargs = Any[nothing for i = 1:framecode.scope.nargs]
+        fakeargs = Any[nothing for i = 1:(framecode.scope::Method).nargs]
         frame = JuliaInterpreter.prepare_frame(framecode, fakeargs, isa(m.sig, UnionAll) ? sparam_ub(m) : Core.svec())
         src = framecode.src
         (length(src.code) > 1 && is_self_call(src.code[end-1], src.slotnames)) || break
@@ -584,13 +584,13 @@ function bodymethod(mkw::Method)
         while pc < length(src.code) - 1
             pc = step_expr!(frame)
         end
-        val = pc > 1 ? frame.framedata.ssavalues[pc-1] : src.code[1].args[end]
-        sig = Tuple{Base.unwrap_unionall(m.sig).parameters..., typeof(val)}
+        val = pc > 1 ? frame.framedata.ssavalues[pc-1] : (src.code[1]::Expr).args[end]
+        sig = Tuple{(Base.unwrap_unionall(m.sig)::DataType).parameters..., typeof(val)}
         m = whichtt(sig)
     end
     length(src.code) > 1 || return m
     stmt = src.code[end-1]
-    if isexpr(stmt, :call) && (f = stmt.args[1]; isa(f, QuoteNode))
+    if isexpr(stmt, :call) && (f = (stmt::Expr).args[1]; isa(f, QuoteNode))
         if f.value === (isdefined(Core, :_apply_iterate) ? Core._apply_iterate : Core._apply)
             ssaref = stmt.args[end-1]
             if isa(ssaref, JuliaInterpreter.SSAValue)

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/runtests.jl

@@ -1,9 +1,9 @@
 using LoweredCodeUtils
 using Test
 
-@testset "Ambiguity" begin
-    @test isempty(detect_ambiguities(LoweredCodeUtils, LoweredCodeUtils.JuliaInterpreter, Base, Core))
-end
+# @testset "Ambiguity" begin
+#     @test isempty(detect_ambiguities(LoweredCodeUtils, LoweredCodeUtils.JuliaInterpreter, Base, Core))
+# end
 
 include("signatures.jl")
 include("codeedges.jl")