Merge pull request #54 from JuliaDebug/teh/revise_568

Fix a missing metheval if define

Author: timholy

Project.toml

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

src/signatures.jl

@@ -436,7 +436,7 @@ function methoddef!(@nospecialize(recurse), signatures, frame::Frame, @nospecial
         sigt, pc = signature(recurse, frame, stmt, pc)
         meth = whichtt(sigt)
         if isa(meth, Method) && (meth.sig <: sigt && sigt <: meth.sig)
-            pc = next_or_nothing!(frame)
+            pc = define ? step_expr!(recurse, frame, stmt, true) : next_or_nothing!(frame)
         elseif define
             pc = step_expr!(recurse, frame, stmt, true)
             meth = whichtt(sigt)

test/signatures.jl

@@ -398,6 +398,22 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
         @test !isempty(signatures)   # really we just need to know that `methoddefs!` completed without getting stuck
     end
 
+    # Scoped names (https://github.com/timholy/Revise.jl/issues/568)
+    ex = :(f568() = -1)
+    Core.eval(Lowering, ex)
+    @test Lowering.f568() == -1
+    empty!(signatures)
+    ex = :(f568() = -2)
+    frame = Frame(Lowering, ex)
+    pcstop = findfirst(LoweredCodeUtils.ismethod3, frame.framecode.src.code)
+    pc = 1
+    while pc < pcstop
+        pc = JuliaInterpreter.step_expr!(finish_and_return!, frame, true)
+    end
+    pc = methoddef!(finish_and_return!, signatures, frame, pc; define=true)
+    @test Tuple{typeof(Lowering.f568)} ∈ signatures
+    @test Lowering.f568() == -2
+
     # Undefined names
     # This comes from FileWatching; WindowsRawSocket is only defined on Windows
     ex = quote