Add a crude print_with_code implementation on <Julia1.6

Also has small code cleanups and enhancements

Author: timholy

src/codeedges.jl

@@ -123,7 +123,17 @@ if isdefined(Base.IRShow, :show_ir_stmt)
         return nothing
     end
 else
-    print_with_code(preprint, postprint, io::IO, src::CodeInfo) = print(io, "No IR statement printer available on this version of Julia")
+    function print_with_code(preprint, postprint, io::IO, src::CodeInfo)
+        println(io, "No IR statement printer available on this version of Julia, just aligning statements.")
+        preprint(io)
+        for idx = 1:length(src.code)
+            preprint(io, idx)
+            print(io, src.code[idx])
+            println(io)
+            postprint(io, idx, false)
+        end
+        postprint(io)
+    end
 end
 
 """
@@ -185,7 +195,7 @@ function direct_links!(cl::CodeLinks, src::CodeInfo)
     for (i, stmt) in enumerate(src.code)
         if isexpr(stmt, :thunk) && isa(stmt.args[1], CodeInfo)
             icl = CodeLinks(stmt.args[1])
-            for (name, assigns) in icl.nameassigns
+            for (name, _) in icl.nameassigns
                 assign = get(cl.nameassigns, name, nothing)
                 if assign === nothing
                     cl.nameassigns[name] = assign = Int[]
@@ -353,6 +363,12 @@ Analyze `src` and determine the chain of dependencies.
   for an object `v::Union{Symbol,GlobalRef}`.
 """
 function CodeEdges(src::CodeInfo)
+    src.inferred && error("supply lowered but not inferred code")
+    cl = CodeLinks(src)
+    CodeEdges(src, cl)
+end
+
+function CodeEdges(src::CodeInfo, cl::CodeLinks)
     function pushall!(dest, src)
         for item in src
             push!(dest, item)
@@ -463,7 +479,12 @@ function print_with_code(io::IO, src::CodeInfo, edges::CodeEdges)
         end
         printstyled(io, "\nCode:\n", color=:yellow)
     end
-    preprint(::IO, ::Int) = nothing
+    @static if isdefined(Base.IRShow, :show_ir_stmt)
+        preprint(::IO, ::Int) = nothing
+    else
+        nd = ndigits(length(src.code))
+        preprint(io::IO, i::Int) = print(io, lpad(i, nd), "  ")
+    end
     postprint(::IO) = nothing
     postprint(io::IO, idx::Int, bbchanged::Bool) = postprint_lineedges(io, idx, edges, bbchanged)
 
@@ -606,6 +627,14 @@ function lines_required!(isrequired::AbstractVector{Bool}, objs, src::CodeInfo,
     return isrequired
 end
 
+function caller_matches(f, mod, sym)
+    is_global_ref(f, mod, sym) && return true
+    if isdefined(mod, sym)
+        is_quotenode(f, getfield(mod, sym)) && return true
+    end
+    return false
+end
+
 """
     selective_eval!([recurse], frame::Frame, isrequired::AbstractVector{Bool}, istoplevel=false)
 
@@ -676,3 +705,12 @@ function print_with_code(io::IO, src::CodeInfo, isrequired::AbstractVector{Bool}
 
     print_with_code(preprint, postprint, io, src)
 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)
+        JuliaInterpreter.reverse_lookup_globalref!(src.code)
+    end
+    print_with_code(io, src, obj)
+end

test/codeedges.jl

@@ -1,5 +1,6 @@
 using LoweredCodeUtils
 using LoweredCodeUtils.JuliaInterpreter
+using LoweredCodeUtils: caller_matches
 using JuliaInterpreter: is_global_ref, is_quotenode
 using Test
 
@@ -17,21 +18,15 @@ function hastrackedexpr(stmt; heads=LoweredCodeUtils.trackedheads)
     haseval = false
     if isa(stmt, Expr)
         if stmt.head === :call
-            haseval = JuliaInterpreter.hasarg(isequal(:eval), stmt.args)
             f = stmt.args[1]
-            is_global_ref(f, Core, :_typebody!) && return true, haseval
-            if isdefined(Core, :_typebody!)
-                is_quotenode(f, Core._typebody!) && return true, haseval
-            end
-            is_global_ref(f, Core, :_setsuper!) && return true, haseval
-            if isdefined(Core, :_setsuper!)
-                is_quotenode(f, Core._setsuper!) && return true, haseval
-            end
+            haseval = f === :eval || (caller_matches(f, Base, :getproperty) && is_quotenode(stmt.args[2], :eval))
+            caller_matches(f, Core, :_typebody!) && return true, haseval
+            caller_matches(f, Core, :_setsuper!) && return true, haseval
             f === :include && return true, haseval
-        end
-        stmt.head ∈ heads && return true, haseval
-        if stmt.head == :thunk
+        elseif stmt.head === :thunk
             any(s->any(hastrackedexpr(s; heads=heads)), stmt.args[1].code) && return true, haseval
+        elseif stmt.head ∈ heads
+            return true, haseval
         end
     end
     return false, haseval
@@ -87,8 +82,7 @@ end
         k = rand()
         b = 2*a + 5
     end
-    lwr = Meta.lower(ModSelective, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, lwr)
+    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     # Check that the result of direct evaluation agrees with selective evaluation
@@ -127,8 +121,7 @@ end
             a2 = 2
         end
     end
-    lwr = Meta.lower(ModSelective, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, lwr)
+    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = lines_required(:a2, src, edges)
@@ -149,8 +142,7 @@ end
             y3 = 7
         end
     end
-    lwr = Meta.lower(ModSelective, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, lwr)
+    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     isrequired = lines_required(:a3, src, edges)
@@ -171,8 +163,7 @@ end
     Core.eval(ModEval, ex)
     @test ModEval.foo() == 0
     @test ModEval.bar() == 1
-    lwr = Meta.lower(ModSelective, ex)
-    frame = JuliaInterpreter.prepare_thunk(ModSelective, lwr)
+    frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
     src = frame.framecode.src
     edges = CodeEdges(src)
     # Mark just the load of Core.eval
@@ -293,5 +284,16 @@ end
         else
             @test occursin("No IR statement printer", str)
         end
+        # Works with Frames too
+        frame = JuliaInterpreter.prepare_thunk(ModSelective, ex)
+        edges = CodeEdges(frame.framecode.src)
+        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
+        else
+            @test occursin("No IR statement printer", str)
+        end
     end
 end