Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MethodInstance multiplicity #278

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Fix MethodInstance multiplicity #278

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de63569
Fix MethodInstance multiplicity
timholy Feb 15, 2022
5199d5b
Generalize a test
timholy Feb 15, 2022
53fb824
Don't insist that errors trigger inference
timholy Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions test/snoopi_deep.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,14 @@ end
return nothing
end
end
cats = categories(@snoopi_deep try M.checkstatus(false, M.MyType()) catch end)
@test cats == [SnoopCompile.FromTestCallee, SnoopCompile.ErrorPath]
SnoopCompile.show_suggest(io, cats, nothing, nothing)
@test occursin(r"error path.*ignore", String(take!(io)))
tinf = @snoopi_deep try M.checkstatus(false, M.MyType()) catch end
if !isempty(inference_triggers(tinf))
# Exceptions do not trigger a fresh entry into inference on Julia 1.8+
cats = categories(tinf)
@test cats == [SnoopCompile.FromTestCallee, SnoopCompile.ErrorPath]
SnoopCompile.show_suggest(io, cats, nothing, nothing)
@test occursin(r"error path.*ignore", String(take!(io)))
end

# Core.Box
@test !SnoopCompile.hascorebox(AbstractVecOrMat{T} where T) # test Union handling
Expand Down Expand Up @@ -631,7 +635,12 @@ end
frames = flatten(tinf; sortby=inclusive)

fg = SnoopCompile.flamegraph(tinf)
@test length(collect(AbstractTrees.PreOrderDFS(fg))) ∈ (5, 6, 14) # depends on constant-prop
fgnodes = collect(AbstractTrees.PreOrderDFS(fg))
for tgtname in (Base.VERSION < v"1.7" ? (:h, :i) : (:h, :i, :+))
@test mapreduce(|, fgnodes; init=false) do node
node.data.sf.linfo.def.name == tgtname
end
end
# Test that the span covers the whole tree, and check for const-prop
has_constprop = false
for leaf in AbstractTrees.PreOrderDFS(fg)
Expand Down Expand Up @@ -889,7 +898,8 @@ end
# we get mt_backedges with a MethodInstance middle entry too
strees2 = precompile_blockers(invalidations, tinf; min_world_exclude=0)
sig, root, hits = only(only(strees2).mt_backedges)
@test sig == methodinstance(StaleA.stale, (String,))
mi_stale = only(filter(mi -> endswith(String(mi.def.file), "StaleA.jl"), methodinstances(StaleA.stale, (String,))))
@test sig == mi_stale
@test root == Core.MethodInstance(only(hits)) == methodinstance(StaleB.useA, ())
# What happens when we can't find it in the tree?
idx = findfirst(isequal("jl_method_table_insert"), invalidations)
Expand Down