rm trackedheads

On recent Julia versions we can just pattern match against `:method`
expressions.

Author: aviatesk

src/codeedges.jl

@@ -236,13 +236,13 @@ function direct_links!(cl::CodeLinks, src::CodeInfo)
     P = Pair{Union{SSAValue,SlotNumber,GlobalRef},Links}
 
     for (i, stmt) in enumerate(src.code)
-        if isexpr(stmt, :thunk) && isa(stmt.args[1], CodeInfo)
-            icl = CodeLinks(cl.thismod, stmt.args[1])
+        if isexpr(stmt, :thunk) && (arg1 = stmt.args[1]; arg1 isa CodeInfo)
+            icl = CodeLinks(cl.thismod, arg1)
             add_inner!(cl, icl, i)
             continue
-        elseif isa(stmt, Expr) && stmt.head ∈ trackedheads
-            if stmt.head === :method && length(stmt.args) === 3 && isa(stmt.args[3], CodeInfo)
-                icl = CodeLinks(cl.thismod, stmt.args[3])
+        elseif isexpr(stmt, :method)
+            if length(stmt.args) === 3 && (arg3 = stmt.args[3]; arg3 isa CodeInfo)
+                icl = CodeLinks(cl.thismod, arg3)
                 add_inner!(cl, icl, i)
             end
             name = stmt.args[1]

src/packagedef.jl

@@ -8,7 +8,6 @@ using Base.Meta: isexpr
 
 const SSAValues = Union{Core.Compiler.SSAValue, JuliaInterpreter.SSAValue}
 
-const trackedheads = (:method,)
 const structdecls = (:_structtype, :_abstracttype, :_primitivetype)
 
 export signature, rename_framemethods!, methoddef!, methoddefs!, bodymethod

test/codeedges.jl

@@ -6,7 +6,7 @@ using LoweredCodeUtils: callee_matches, istypedef, exclude_named_typedefs
 using JuliaInterpreter: is_global_ref, is_quotenode
 using Test
 
-function hastrackedexpr(@nospecialize(stmt); heads=LoweredCodeUtils.trackedheads)
+function hastrackedexpr(@nospecialize(stmt))
     haseval = false
     if isa(stmt, Expr)
         if stmt.head === :call
@@ -16,8 +16,8 @@ function hastrackedexpr(@nospecialize(stmt); heads=LoweredCodeUtils.trackedheads
             callee_matches(f, Core, :_setsuper!) && return true, haseval
             f === :include && return true, haseval
         elseif stmt.head === :thunk
-            any(s->any(hastrackedexpr(s; heads=heads)), stmt.args[1].code) && return true, haseval
-        elseif stmt.head ∈ heads
+            any(s->any(hastrackedexpr(s)), stmt.args[1].code) && return true, haseval
+        elseif stmt.head === :method
             return true, haseval
         end
     end