Unbreak primitivetype & abstracttype (#61)

#60 introduced an important bugfix, but it inadvertently
introduced new  bugs for primitivetype & abstracttype.

Fixes timholy/Revise.jl#611

Author: timholy

Project.toml

@@ -1,7 +1,7 @@
 name = "LoweredCodeUtils"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
 authors = ["Tim Holy <[email protected]>"]
-version = "1.2.8"
+version = "1.2.9"
 
 [deps]
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"

src/utils.jl

@@ -128,14 +128,29 @@ function typedef_range(src::CodeInfo, idx)
     istart >= 1 || error("no initial :global found")
     stmt.head ∈ structheads && return istart:idx
     iend, n = idx, length(src.code)
+    have_typebody = have_equivtypedef = false
     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
+            if stmt.head === :call
+                if (is_global_ref(stmt.args[1], Core, :_typebody!) ||
+                    isdefined(Core, :_typebody!) && is_quotenode(stmt.args[1], Core._typebody!))
+                    have_typebody = true
+                elseif (is_global_ref(stmt.args[1], Core, :_equiv_typedef) ||
+                    isdefined(Core, :_equiv_typedef) && is_quotenode(stmt.args[1], Core._equiv_typedef))
+                    have_equivtypedef = true
+                    # Advance to the type-assignment
+                    while iend <= n
+                        stmt = src.code[iend]
+                        isexpr(stmt, :(=)) && break
+                        iend += 1
+                    end
+                end
+                if have_typebody && have_equivtypedef
+                    iend += 1   # compensate for the `iend-1` in the return
+                    break
+                end
             end
         end
         is_return(stmt) && break

test/codeedges.jl

@@ -304,6 +304,17 @@ end
     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]
+    # but make sure we don't break primitivetype & abstracttype (https://github.com/timholy/Revise.jl/pull/611)
+    if isdefined(Core, :_primitivetype)
+        thk = Meta.lower(Main, quote
+            primitive type WindowsRawSocket sizeof(Ptr) * 8 end
+        end)
+        src = thk.args[1]
+        edges = CodeEdges(src)
+        idx = findfirst(istypedef, src.code)
+        r = LoweredCodeUtils.typedef_range(src, idx)
+        @test last(r) == length(src.code) - 1
+    end
 
     @testset "Display" begin
         # worth testing because this has proven quite crucial for debugging and