Add method table as key for method_info

src/CodeTracking.jl

@@ -11,7 +11,7 @@ CodeTracking can be thought of as an extension of InteractiveUtils, and pairs we
 module CodeTracking
 
 using Base: PkgId
-using Core: LineInfoNode
+using Core: LineInfoNode, MethodTable
 using Base.Meta: isexpr
 using UUIDs
 using InteractiveUtils
@@ -29,12 +29,12 @@ include("utils.jl")
 
 # These values get populated by Revise
 
-# `method_info[sig]` is either:
+# `method_info[mt => sig]` is either:
 #   - `missing`, to indicate that the method cannot be located
 #   - a list of `(lnn,ex)` pairs. In almost all cases there will be just one of these,
 #     but "mistakes" in moving methods from one file to another can result in more than
 #     definition. The last pair in the list is the currently-active definition.
-const method_info = IdDict{Type,Union{Missing,Vector{Tuple{LineNumberNode,Expr}}}}()
+const method_info = IdDict{Pair{<:Union{Nothing, MethodTable}, <:Type},Union{Missing,Vector{Tuple{LineNumberNode,Expr}}}}()
 
 const _pkgfiles = Dict{PkgId,PkgFiles}()
 
@@ -58,6 +58,9 @@ const expressions_callback = Ref{Any}(nothing)
 const juliabase = joinpath("julia", "base")
 const juliastdlib = joinpath("julia", "stdlib", "v$(VERSION.major).$(VERSION.minor)")
 
+method_table(method::Method) = isdefined(method, :external_mt) ? method.external_mt::MethodTable : nothing
+method_info_key(method::Method) = method_table(method) => method.sig
+
 ### Public API
 
 """
@@ -70,13 +73,13 @@ the method declaration, otherwise it is the first line of the method's body.
 function whereis(method::Method)
     file, line = String(method.file), method.line
     startswith(file, "REPL[") && return file, line
-    lin = get(method_info, method.sig, nothing)
+    lin = get(method_info, method_info_key(method), nothing)
     if lin === nothing
         f = method_lookup_callback[]
         if f !== nothing
             try
                 Base.invokelatest(f, method)
-                lin = get(method_info, method.sig, nothing)
+                lin = get(method_info, method_info_key(method), nothing)
             catch
             end
         end
@@ -298,13 +301,13 @@ See also [`code_expr`](@ref).
 """
 function definition(::Type{Expr}, method::Method)
     file = String(method.file)
-    def = startswith(file, "REPL[") ? nothing : get(method_info, method.sig, nothing)
+    def = startswith(file, "REPL[") ? nothing : get(method_info, method_info_key(method), nothing)
     if def === nothing
         f = method_lookup_callback[]
         if f !== nothing
             try
                 Base.invokelatest(f, method)
-                def = get(method_info, method.sig, nothing)
+                def = get(method_info, method_info_key(method), nothing)
             catch
             end
         end

src/utils.jl

@@ -400,5 +400,5 @@ getpkgid(uuid::UUID, libname) = PkgId(uuid, libname)
 # callers vulnerable to invalidation. These convenience utilities allow callers to insulate
 # themselves from invalidation. These are used by Revise.
 # example package triggering invalidation: StaticArrays (new `convert(Type{Array{T,N}}, ::AbstractArray)` methods)
-invoked_setindex!(dct::IdDict{K,V}, @nospecialize(val), @nospecialize(key)) where {K,V} = Base.invokelatest(setindex!, dct, val, key)::typeof(dct)
-invoked_get!(::Type{T}, dct::IdDict{K,V}, @nospecialize(key)) where {K,V,T<:V} = Base.invokelatest(get!, T, dct, key)::V
+invoked_setindex!(dct::IdDict{K,V}, @nospecialize(val), @nospecialize(key)) where {K,V} = Base.invokelatest(setindex!, dct, val, convert(K, key))::typeof(dct)
+invoked_get!(::Type{T}, dct::IdDict{K,V}, @nospecialize(key)) where {K,V,T<:V} = Base.invokelatest(get!, T, dct, convert(K, key))::V

test/runtests.jl

@@ -101,7 +101,7 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
 
     # Test a method marked as missing
     m = @which sum(1:5)
-    CodeTracking.method_info[m.sig] = missing
+    CodeTracking.method_info[nothing => m.sig] = missing
     @test whereis(m) == (CodeTracking.maybe_fix_path(String(m.file)), m.line)
     @test definition(m) === nothing
 
@@ -323,7 +323,8 @@ end
             Revise.add_revise_deps()
             sigs = signatures_at(CodeTracking, "src/utils.jl", 5)
             @test length(sigs) == 1       # only isn't available on julia 1.0
-            @test first(sigs) == Tuple{typeof(CodeTracking.checkname), Expr, Any}
+            (mt, sig) = first(sigs)
+            @test sig == Tuple{typeof(CodeTracking.checkname), Expr, Any}
             @test pkgfiles(CodeTracking).id == Base.PkgId(CodeTracking)
         end
 
@@ -454,3 +455,19 @@ end
     @test CodeTracking.strip_gensym("#𝓔′#90") == :𝓔′
     @test CodeTracking.strip_gensym("𝓔′##kw") == :𝓔′
 end
+
+if isdefined(Base, :Experimental) && isdefined(Base.Experimental, :(var"@MethodTable"))
+
+@testset "External method tables" begin
+    mod = @eval module $(gensym(:ExternalMT))
+        Base.Experimental.@MethodTable method_table
+    end
+    ex = :(Base.Experimental.@overlay method_table +(x::String, y::String) = x * y)
+    method = Core.eval(mod, ex)
+    lnn = LineNumberNode(Int(method.line), method.file)
+    @test CodeTracking.definition(Expr, method) === nothing
+    CodeTracking.method_info[method.external_mt => method.sig] = [(lnn, ex)]
+    @test CodeTracking.definition(Expr, method) == ex
+end
+
+end