Relax is_self_call to allow empty names (#19)

Also make it standalone so it can be called directly by Revise.

Author: timholy

Project.toml

@@ -6,11 +6,12 @@ version = "0.3.7"
 [deps]
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
 
-[extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
 [compat]
 JuliaInterpreter = "0.3, 0.4, 0.5, 0.6, 0.7"
 
+[extras]
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
 [targets]
-test = ["Test"]
+test = ["InteractiveUtils", "Test"]

src/LoweredCodeUtils.jl

@@ -478,26 +478,28 @@ function _methoddefs!(@nospecialize(recurse), signatures, frame::Frame, pc; defi
     return pc
 end
 
+function is_self_call(stmt, slotnames, argno=1)
+    if isa(stmt, Expr)
+        if stmt.head == :call
+            a = stmt.args[argno]
+            if isa(a, SlotNumber) || isa(a, Core.SlotNumber)
+                sn = slotnames[a.id]
+                if sn == Symbol("#self#") || sn == Symbol("") # allow empty to fix https://github.com/timholy/CodeTracking.jl/pull/48
+                    return true
+                end
+            end
+        end
+    end
+    return false
+end
+
 """
     mbody = bodymethod(m::Method)
 
 Return the "body method" for a method `m`. `mbody` contains the code of the function body
 when `m` was defined.
 """
 function bodymethod(mkw::Method)
-    function is_self_call(stmt, slotnames, argno=1)
-        if isa(stmt, Expr)
-            if stmt.head == :call
-                a = stmt.args[argno]
-                if isa(a, SlotNumber)
-                    if slotnames[a.id] == Symbol("#self#")
-                        return true
-                    end
-                end
-            end
-        end
-        return false
-    end
     m = mkw
     local src
     while true
@@ -519,7 +521,7 @@ function bodymethod(mkw::Method)
     stmt = src.code[end-1]
     if isexpr(stmt, :call) && (f = stmt.args[1]; isa(f, QuoteNode))
         # Check that it has a #self# call
-        hasself = any(i->is_self_call(stmt, src.slotnames, i), 1:length(stmt.args))
+        hasself = any(i->is_self_call(stmt, src.slotnames, i), 2:length(stmt.args))
         hasself || return m
         f = f.value
         mths = methods(f)

test/runtests.jl

@@ -1,3 +1,4 @@
+using InteractiveUtils
 using LoweredCodeUtils, JuliaInterpreter
 using JuliaInterpreter: finish_and_return!
 using Core: CodeInfo
@@ -250,6 +251,10 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     @test startswith(String(bodymethod(first(methods(bodymethtest3))).name), "#")
     @test bodymethod(first(methods(bodymethtest4))).nargs == 3  # one extra for #self#
     @test bodymethod(first(methods(bodymethtest5))).nargs == 3
+    m = @which sum([1]; dims=1)
+    # Issue in https://github.com/timholy/CodeTracking.jl/pull/48
+    mbody = bodymethod(m)
+    @test mbody != m && mbody.file != :none
 
     ex = :(typedsig(x) = 1)
     frame = JuliaInterpreter.prepare_thunk(Lowering, ex)