Invalidate CC on cme free as well

jhawthorn · jhawthorn · commit 1da540aeaa15 · 2026-03-30T18:27:55.000-07:00
diff --git a/gc.c b/gc.c
@@ -1278,7 +1278,9 @@ rb_gc_handle_weak_references(VALUE obj)
         GC_ASSERT(imemo_type(obj) == imemo_callcache);
 
         struct rb_callcache *cc = (struct rb_callcache *)obj;
-        if (!rb_gc_handle_weak_references_alive_p(cc->klass)) {
+        if (cc->klass != Qundef &&
+            (!rb_gc_handle_weak_references_alive_p(cc->klass) ||
+             !rb_gc_handle_weak_references_alive_p((VALUE)cc->cme_))) {
             vm_cc_invalidate(cc);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1278,7 +1278,9 @@ rb_gc_handle_weak_references(VALUE obj)`
`1278`	`1278`	`GC_ASSERT(imemo_type(obj) == imemo_callcache);`
`1279`	`1279`
`1280`	`1280`	`struct rb_callcache cc = (struct rb_callcache )obj;`
`1281`		`- if (!rb_gc_handle_weak_references_alive_p(cc->klass)) {`
	`1281`	`+ if (cc->klass != Qundef &&`
	`1282`	`+ (!rb_gc_handle_weak_references_alive_p(cc->klass) \|\|`
	`1283`	`+ !rb_gc_handle_weak_references_alive_p((VALUE)cc->cme_))) {`
`1282`	`1284`	`vm_cc_invalidate(cc);`
`1283`	`1285`	`}`
`1284`	`1286`