Truncate struct def blocks prior to final :global (#60)

Fixes timholy/Revise.jl#599

Author: timholy

Project.toml

@@ -1,7 +1,7 @@
 name = "LoweredCodeUtils"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
 authors = ["Tim Holy <tim.holy@gmail.com>"]
-version = "1.2.7"
+version = "1.2.8"
 
 [deps]
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"

src/utils.jl

@@ -117,6 +117,7 @@ end
 function typedef_range(src::CodeInfo, idx)
     stmt = src.code[idx]
     istypedef(stmt) || error(stmt, " is not a typedef")
+    stmt = stmt::Expr
     isanonymous_typedef(stmt) && return idx:idx
     # Search backwards to the previous :global
     istart = idx
@@ -125,11 +126,17 @@ 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)
     while iend <= n
         stmt = src.code[iend]
         if isa(stmt, Expr)
             (stmt.head === :global || stmt.head === :return) && break
+            if stmt.head === :call && (is_global_ref(stmt.args[1], Core, :_typebody!) ||
+                                       isdefined(Core, :_typebody!) && is_quotenode(stmt.args[1], Core._typebody!))
+                iend += 1   # compensate for the `iend-1` in the return
+                break
+            end
         end
         is_return(stmt) && break
         iend += 1

test/codeedges.jl

@@ -289,6 +289,22 @@ end
     idx = findfirst(stmt->Meta.isexpr(stmt, :leave), src.code)
     @test lr[idx]
 
+    # https://github.com/timholy/Revise.jl/issues/599
+    thk = Meta.lower(Main, quote
+        mutable struct A
+            x::Int
+
+            A(x) = new(f(x))
+            f(x) = x^2
+        end
+    end)
+    src = thk.args[1]
+    edges = CodeEdges(src)
+    idx = findfirst(stmt->Meta.isexpr(stmt, :method), src.code)
+    lr = lines_required(idx, src, edges; exclude_named_typedefs=true)
+    idx = findfirst(stmt->Meta.isexpr(stmt, :(=)) && Meta.isexpr(stmt.args[2], :call) && is_global_ref(stmt.args[2].args[1], Core, :Box), src.code)
+    @test lr[idx]
+
     @testset "Display" begin
         # worth testing because this has proven quite crucial for debugging and
         # ensuring that these structures are as "self-documenting" as possible.