jl_insert_method_instances: also remove codeinst

JuliaLang · Jul 13, 2022 · de8b202 · de8b202
1 parent e8801cb
commit de8b202
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/dump.c b/src/dump.c
@@ -2346,13 +2346,18 @@ static void jl_insert_method_instances(jl_array_t *list)
  }
  }
  invalidate_backedges(&remove_code_instance_from_validation, caller, world, "jl_insert_method_instance");
+ // The codeinst of this mi haven't yet been removed
+ jl_code_instance_t *codeinst = caller->cache;
+ while (codeinst) {
+ remove_code_instance_from_validation(codeinst);
+ codeinst = codeinst->next;
+ }
  }
  jl_array_del_end(mi->backedges, j - jins);
  if (jins == 0) {
  // None of the callers were valid, so invalidate `mi` too
  jl_array_uint8_set(valids, i, 0);
  invalidate_backedges(&remove_code_instance_from_validation, mi, world, "jl_insert_method_instance");
- // The codeinst of this mi haven't yet been removed
  jl_code_instance_t *codeinst = mi->cache;
  while (codeinst) {
  remove_code_instance_from_validation(codeinst);

diff --git a/test/precompile.jl b/test/precompile.jl
@@ -938,9 +938,7 @@ precompile_test_harness("invoke") do dir
  end
 
  m = get_real_method(M.h)
- mi = m.specializations[1]
- @test !isdefined(mi, :backedges)
- @test !isdefined(mi, :cache)
+ @test isempty(m.specializations)
 end
 
 # test --compiled-modules=no command line option