More 1.12 compat (#112)

* More 1.12 compat

Depends on JuliaDebug/JuliaInterpreter.jl#635, so will need
appropriate version bumps before release.

* Update src/codeedges.jl

Co-authored-by: Shuhei Kadowaki <[email protected]>

---------

Co-authored-by: Shuhei Kadowaki <[email protected]>

Author: Keno

src/codeedges.jl

@@ -156,7 +156,7 @@ function postprint_linelinks(io::IO, idx::Int, src::CodeInfo, cl::CodeLinks, bbc
     printstyled(io, bbchanged ? " " : "│", color=:light_black)
     printstyled(io, "             # ", color=:yellow)
     stmt = src.code[idx]
-    if isexpr(stmt, :(=))
+    if is_assignment_like(stmt)
         lhs = stmt.args[1]
         if @issslotnum(lhs)
             # id = lhs.id
@@ -184,6 +184,9 @@ function namedkeys(cl::CodeLinks)
     return ukeys
 end
 
+is_assignment_like(stmt::Expr) = isexpr(stmt, :(=)) || (isexpr(stmt, :const) && length(stmt.args) == 2)
+is_assignment_like(@nospecialize stmt) = false
+
 function direct_links!(cl::CodeLinks, src::CodeInfo)
     # Utility for when a stmt itself contains a CodeInfo
     function add_inner!(cl::CodeLinks, icl::CodeLinks, idx)
@@ -238,7 +241,7 @@ function direct_links!(cl::CodeLinks, src::CodeInfo)
             end
             rhs = stmt
             target = P(SSAValue(i), cl.ssapreds[i])
-        elseif isexpr(stmt, :(=))
+        elseif is_assignment_like(stmt)
             # An assignment
             stmt = stmt::Expr
             lhs, rhs = stmt.args[1], stmt.args[2]
@@ -415,7 +418,7 @@ function CodeEdges(src::CodeInfo, cl::CodeLinks)
     emptylist = Int[]
     for (i, stmt) in enumerate(src.code)
         # Identify line predecents for slots and named variables
-        if isexpr(stmt, :(=))
+        if is_assignment_like(stmt)
             stmt = stmt::Expr
             lhs = stmt.args[1]
             # Mark predecessors and successors of this line by following ssas & named assignments
@@ -899,7 +902,7 @@ function add_inplace!(isrequired, src, edges, norequire)
                     for k in edges.preds[j]
                         isrequired[k] || continue
                         predstmt = src.code[k]
-                        if isexpr(predstmt, :(=))
+                        if is_assignment_like(predstmt)
                             lhs = predstmt.args[1]
                             if @issslotnum(lhs) && lhs.id == id
                                 changed |= mark_if_inplace(stmt, j)

src/utils.jl

@@ -59,7 +59,7 @@ function callee_matches(f, mod, sym)
 end
 
 function rhs(stmt)
-    isexpr(stmt, :(=)) && return (stmt::Expr).args[2]
+    is_assignment_like(stmt) && return (stmt::Expr).args[2]
     return stmt
 end
 
@@ -120,7 +120,7 @@ function isanonymous_typedef(stmt)
         is_global_ref(stmt.args[1], Core, :_typebody!) || return false
         @static if VERSION ≥ v"1.9.0-DEV.391"
             stmt = isa(stmt.args[3], Core.SSAValue) ? src.code[end-3] : src.code[end-2]
-            isexpr(stmt, :(=)) || return false
+            is_assignment_like(stmt) || return false
             name = stmt.args[1]
             if isa(name, GlobalRef)
                 name = name.name
@@ -185,7 +185,7 @@ function typedef_range(src::CodeInfo, idx)
                     # Advance to the type-assignment
                     while iend <= n
                         stmt = src.code[iend]
-                        isexpr(stmt, :(=)) && break
+                        is_assignment_like(stmt) && break
                         iend += 1
                     end
                 end