Ensure accurate invalidation logging data

This modifies #48841 to restore the required logging data. When logging is on, it recalculates the method-match as needed, casting a wider net to ensure that we identify the trigger of the invalidation.
JuliaLang · Mar 12, 2023 · 09ac725 · 09ac725
1 parent 441c570
commit 09ac725
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/staticdata_utils.c b/src/staticdata_utils.c
@@ -841,6 +841,7 @@ static jl_array_t *jl_verify_edges(jl_array_t *targets, size_t minworld)
         jl_value_t *expected = jl_array_ptr_ref(targets, i * 3 + 2);
         size_t min_valid = 0;
         size_t max_valid = ~(size_t)0;
+        jl_value_t *sig = NULL;
         if (invokesig) {
             assert(callee && "unsupported edge");
             jl_methtable_t *mt = jl_method_get_table(((jl_method_instance_t*)callee)->def.method);
@@ -861,7 +862,6 @@ static jl_array_t *jl_verify_edges(jl_array_t *targets, size_t minworld)
             }
         }
         else {
-            jl_value_t *sig;
             if (jl_is_method_instance(callee))
                 sig = ((jl_method_instance_t*)callee)->specTypes;
             else
@@ -907,6 +907,12 @@ static jl_array_t *jl_verify_edges(jl_array_t *targets, size_t minworld)
             jl_array_ptr_1d_push(_jl_debug_method_invalidation, loctag);
             loctag = jl_box_int32((int32_t)i);
             jl_array_ptr_1d_push(_jl_debug_method_invalidation, loctag);
+            if (matches == jl_nothing) {
+                assert(sig);
+                int ambig = 0;
+                matches = jl_matching_methods((jl_tupletype_t*)sig, jl_nothing,
+                                              -1, 0, minworld, &min_valid, &max_valid, &ambig);
+            }
             jl_array_ptr_1d_push(_jl_debug_method_invalidation, matches);
         }
         //jl_static_show((JL_STREAM*)ios_stderr, (jl_value_t*)invokesig);

diff --git a/test/precompile.jl b/test/precompile.jl
@@ -915,7 +915,7 @@ precompile_test_harness("code caching") do dir
     mi = m.specializations[1]
     @test hasvalid(mi, world)       # was compiled with the new method
 
-    # Reporting test
+    # Reporting test (ensure SnoopCompile works)
     @test all(i -> isassigned(invalidations, i), eachindex(invalidations))
     m = only(methods(MB.call_nbits))
     for mi in m.specializations
@@ -936,7 +936,7 @@ precompile_test_harness("code caching") do dir
     j = findfirst(==(tagbad), invalidations)
     @test invalidations[j-1] == "insert_backedges_callee"
     @test isa(invalidations[j-2], Type)
-    @test invalidations[j+1] === nothing || isa(invalidations[j+1], Vector{Any}) # [nbits(::UInt8)]
+    @test isa(invalidations[j+1], Vector{Any}) # [nbits(::UInt8)]
 
     m = only(methods(MB.map_nbits))
     @test !hasvalid(m.specializations[1], world+1) # insert_backedges invalidations also trigger their backedges