Use a single signature-dict and switch to LineNumberNode

This reduces the number of lookups, and should therefore be slightly more
efficient.

Author: timholy

src/CodeTracking.jl

@@ -17,11 +17,11 @@ Return the file and line of the definition of `method`. `line`
 is the first line of the method's body.
 """
 function whereis(method::Method)
-    lin = get(method_locations, method.sig, nothing)
+    lin = get(method_info, method.sig, nothing)
     if lin === nothing
         file, line = String(method.file), method.line
     else
-        file, line = fileline(lin)
+        file, line = fileline(lin[1])
     end
     if !isabspath(file)
         # This is a Base or Core method
@@ -68,15 +68,15 @@ end
 Return an expression that defines `method`.
 """
 function definition(method::Method, ::Type{Expr})
-    def = get(method_definitions, method.sig, nothing)
+    def = get(method_info, method.sig, nothing)
     if def === nothing
         f = method_lookup_callback[]
         if f !== nothing
             Base.invokelatest(f, method)
         end
-        def = get(method_definitions, method.sig, nothing)
+        def = get(method_info, method.sig, nothing)
     end
-    return def === nothing ? nothing : copy(def)
+    return def === nothing ? nothing : copy(def[2])
 end
 
 definition(method::Method) = definition(method, Expr)

src/data.jl

@@ -33,9 +33,7 @@ function Base.show(io::IO, info::PkgFiles)
     show(io, info.files)
 end
 
-const method_locations = IdDict{Type,LineInfoNode}()
-
-const method_definitions = IdDict{Type,Expr}()
+const method_info = IdDict{Type,Tuple{LineNumberNode,Expr}}()
 
 const _pkgfiles = Dict{PkgId,PkgFiles}()
 

src/utils.jl

@@ -13,7 +13,11 @@ function isfuncexpr(ex)
     return false
 end
 
-fileline(lin::LineInfoNode) = String(lin.file), lin.line
+fileline(lin::LineInfoNode)   = String(lin.file), lin.line
+fileline(lnn::LineNumberNode) = String(lnn.file), lnn.line
+
+# This is piracy, but it's not ambiguous in terms of what it should do
+Base.convert(::Type{LineNumberNode}, lin::LineInfoNode) = LineNumberNode(lin.line, lin.file)
 
 function basepath(id::PkgId)
     id.name ∈ ("Main", "Base", "Core") && return ""