Find specializations with Base.specializations (#348)

Also adapts to the new NamedTuple printing

Author: timholy

SnoopPrecompile/test/runtests.jl

@@ -2,23 +2,26 @@ using SnoopPrecompile
 using Test
 using UUIDs
 
+
 @testset "SnoopPrecompile.jl" begin
+    specializations(m::Method) = isdefined(Base, :specializations) ? Base.specializations(m) : m.specializations
+
     push!(LOAD_PATH, @__DIR__)
 
     using SnoopPC_A
     if VERSION >= v"1.8.0-rc1"
         # Check that calls inside :setup are not precompiled
         m = which(Tuple{typeof(Base.vect), Vararg{T}} where T)
         have_mytype = false
-        for mi in m.specializations
+        for mi in specializations(m)
             mi === nothing && continue
             have_mytype |= Base.unwrap_unionall(mi.specTypes).parameters[2] === SnoopPC_A.MyType
         end
         have_mytype && @warn "Code in setup block was precompiled"
         # Check that calls inside @precompile_calls are precompiled
         m = only(methods(SnoopPC_A.call_findfirst))
         count = 0
-        for mi in m.specializations
+        for mi in specializations(m)
             mi === nothing && continue
             sig = Base.unwrap_unionall(mi.specTypes)
             @test sig.parameters[2] == SnoopPC_A.MyType
@@ -29,7 +32,7 @@ using UUIDs
         # Even one that was runtime-dispatched
         m = which(Tuple{typeof(findfirst), Base.Fix2{typeof(==), T}, Vector{T}} where T)
         count = 0
-        for mi in m.specializations
+        for mi in specializations(m)
             mi === nothing && continue
             sig = Base.unwrap_unionall(mi.specTypes)
             if sig.parameters[3] == Vector{SnoopPC_A.MyType}

src/SnoopCompile.jl

@@ -57,9 +57,15 @@ using OrderedCollections
 import YAML  # For @snoopl
 using Requires
 
+if isdefined(Base, :specializations)
+    specializations(m::Method) = Base.specializations(m)
+else
+    specializations(m::Method) = m.specializations
+end
+
 # Parcel Regex
 const anonrex = r"#{1,2}\d+#{1,2}\d+"         # detect anonymous functions
-const kwrex = r"^#kw##(.*)$|^#([^#]*)##kw$"   # detect keyword-supplying functions
+const kwrex = r"^#kw##(.*)$|^#([^#]*)##kw$"   # detect keyword-supplying functions (prior to Core.kwcall)
 const kwbodyrex = r"^##(\w[^#]*)#\d+"         # detect keyword body methods
 const genrex = r"^##s\d+#\d+$"                # detect generators for @generated functions
 const innerrex = r"^#[^#]+#\d+"               # detect inner functions

src/invalidations.jl

@@ -53,7 +53,7 @@ end
 
 dummy() = nothing
 dummy()
-const dummyinstance = which(dummy, ()).specializations[1]
+const dummyinstance = first(specializations(which(dummy, ())))
 
 mutable struct InstanceNode
     mi::MethodInstance

src/parcel_snoopi_deep.jl

@@ -1632,7 +1632,7 @@ function Base.summary(io::IO, mtrigs::MethodTriggers)
     hascb = false
     for mi in callers
         tt = Base.unwrap_unionall(mi.specTypes)::DataType
-        mlist = Base._methods_by_ftype(tt, -1, typemax(UInt))
+        mlist = Base._methods_by_ftype(tt, -1, Base.get_world_counter())
         if length(mlist) < 10
             cts = Base.code_typed_by_type(tt; debuginfo=:source)
             for (ct::CodeInfo, _) in cts

test/snoopi.jl

@@ -84,7 +84,7 @@ if Base.VERSION >= v"1.6.0-DEV.736"
         fb = Base.bodyfunction(m)
         mb = methods(fb).ms[1]
         @test occursin("#_#", String(mb.name))
-        mi = mb.specializations[1]
+        mi = first(SnoopCompile.specializations(mb))
         modgens = Dict{Module, Vector{Method}}()
         tmp = String[]
         SnoopCompile.add_repr!(tmp, modgens, mi; check_eval=true)  # no error
@@ -184,7 +184,11 @@ uncompiled(x) = x + 1
     @test any(str->occursin("precompile(Tuple{typeof(genkw1)})", str), FK)
     @test !any(str->occursin("precompile(Tuple{typeof(genkw2)})", str), FK)
     if isdefined(Core, :kwcall)
-        @test any(str->occursin("Tuple{typeof(Core.kwcall),NamedTuple{(:b,), Tuple{String}},typeof(genkw2)}", str), FK)
+        if Base.VERSION >= v"1.10.0-DEV.886"
+            @test any(str->occursin("Tuple{typeof(Core.kwcall),@NamedTuple{b::String},typeof(genkw2)}", str), FK)
+        else
+            @test any(str->occursin("Tuple{typeof(Core.kwcall),NamedTuple{(:b,), Tuple{String}},typeof(genkw2)}", str), FK)
+        end
     else
         @test any(str->occursin("Tuple{Core.kwftype(typeof(genkw2)),NamedTuple{(:b,),$(SP)Tuple{String}},typeof(genkw2)}", str), FK)
     end

test/snoopr.jl

@@ -277,7 +277,7 @@ end
             sig, root = only(tree.mt_backedges)
             @test sig.parameters[1] === typeof(PkgC.nbits)
             @test sig.parameters[2] === Integer
-            @test root.mi == only(methods(PkgD.call_nbits)).specializations[1]
+            @test root.mi == first(SnoopCompile.specializations(only(methods(PkgD.call_nbits))))
         end
         Pkg.activate(cproj)
     elseif Base.VERSION >= v"1.7.0-DEV.254"   # julia#39132 (redirect to Pipe)