Use MethodInfoKey from CodeTracking

Author: serenity4

src/LoweredCodeUtils.jl

@@ -9,6 +9,8 @@ module LoweredCodeUtils
 # This somewhat unusual structure is in place to support
 # the VS Code extension integration.
 
+using CodeTracking: MethodInfoKey
+
 using JuliaInterpreter
 using JuliaInterpreter: SSAValue, SlotNumber, Frame
 using JuliaInterpreter: @lookup, moduleof, pc_expr, step_expr!, is_global_ref, is_global_ref_egal, is_quotenode_egal, whichtt,

src/packagedef.jl

@@ -1,6 +1,6 @@
 Base.Experimental.@optlevel 1
 
-using Core: SimpleVector, MethodTable
+using Core: SimpleVector
 using Core.IR: CodeInfo, GotoIfNot, GotoNode, IR, MethodInstance, ReturnNode
 @static if isdefined(Core.IR, :EnterNode)
     using Core.IR: EnterNode

src/signatures.jl

@@ -56,7 +56,7 @@ function signature(@nospecialize(recurse), frame::Frame, @nospecialize(stmt), pc
     mt = extract_method_table(frame, stmt; eval = false)
     sigsv = @lookup(frame, stmt.args[2])::SimpleVector
     sigt = signature(sigsv)
-    return Pair{Union{Nothing,MethodTable},Any}(mt, sigt), lastpc
+    return MethodInfoKey(mt, sigt), lastpc
 end
 signature(@nospecialize(recurse), frame::Frame, pc) = signature(recurse, frame, pc_expr(frame, pc), pc)
 signature(frame::Frame, pc) = signature(finish_and_return!, frame, pc)
@@ -534,7 +534,7 @@ occurs for "empty method" expressions, e.g., `:(function foo end)`. `pc` will be
 By default the method will be defined (evaluated). You can prevent this by setting `define=false`.
 This is recommended if you are simply extracting signatures from code that has already been evaluated.
 """
-function methoddef!(@nospecialize(recurse), signatures::Vector{Pair{Union{Nothing,MethodTable},Any}}, frame::Frame, @nospecialize(stmt), pc::Int; define::Bool=true)
+function methoddef!(@nospecialize(recurse), signatures::Vector{MethodInfoKey}, frame::Frame, @nospecialize(stmt), pc::Int; define::Bool=true)
     framecode, pcin = frame.framecode, pc
     if ismethod3(stmt)
         pc3 = pc

test/signatures.jl

@@ -2,6 +2,7 @@ module Signatures
 
 using LoweredCodeUtils
 using InteractiveUtils
+using CodeTracking: MethodInfoKey
 using JuliaInterpreter
 using JuliaInterpreter: finish_and_return!
 using Core: CodeInfo
@@ -34,7 +35,7 @@ bodymethtest4(x, y=1) = 4
 bodymethtest5(x, y=Dict(1=>2)) = 5
 
 @testset "Signatures" begin
-    signatures = Set{Any}()
+    signatures = MethodInfoKey[]
     newcode = CodeInfo[]
     for ex in (:(f(x::Int8; y=0) = y),
                :(f(x::Int16; y::Int=0) = 2),
@@ -139,7 +140,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     @test g(3) == 6
 
     # Don't be deceived by inner methods
-    signatures = []
+    signatures = MethodInfoKey[]
     ex = quote
         function fouter(x)
             finner(::Float16) = 2x
@@ -168,7 +169,7 @@ bodymethtest5(x, y=Dict(1=>2)) = 5
     ex = :(max_values(T::Union{map(X -> Type{X}, Base.BitIntegerSmall_types)...}) = 1 << (8*sizeof(T)))  # base/abstractset.jl
     frame = Frame(Base, ex)
     rename_framemethods!(frame)
-    signatures = Set{Any}()
+    signatures = MethodInfoKey[]
     methoddef!(signatures, frame; define=false)
     @test length(signatures) == 1
     mt, sig = first(signatures)
@@ -507,7 +508,7 @@ end
 @testset "Support for external method tables" begin
     ExternalMT = Module()
     Core.eval(ExternalMT, :(Base.Experimental.@MethodTable method_table))
-    signatures = []
+    signatures = MethodInfoKey[]
 
     ex = :(Base.sin(::Float64) = "sin")
     Core.eval(ExternalMT, ex)