Skip to content

Commit

Permalink
check liveness of cc->klass and cc->cme_
Browse files Browse the repository at this point in the history
`cc->klass` and `cc->cme_` can be free'ed while last marking
so that it should be checked bofore updating the pointers.

Note that `T_MOVED` is living, but `is_live_object()` returns false.
  • Loading branch information
ko1 committed Jul 29, 2023
1 parent b0f44cf commit 63d04b8
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -10128,16 +10128,20 @@ gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj)
case imemo_callcache:
{
const struct rb_callcache *cc = (const struct rb_callcache *)obj;
if (cc->klass) {
UPDATE_IF_MOVED(objspace, cc->klass);
if (!is_live_object(objspace, cc->klass)) {
vm_cc_invalidate(cc);
}
else if (cc->cme_) { // cc->cme_ is available if cc->klass is given

if (!cc->klass) {
// already invalidated
}
else {
if ( // cc->klass is living
(BUILTIN_TYPE(cc->klass) == T_MOVED || is_live_object(objspace, cc->klass)) &&
// cc->cme_ is living
(cc->cme_ && ((BUILTIN_TYPE((VALUE)cc->cme_) == T_MOVED) || is_live_object(objspace, (VALUE)cc->cme_)))) {
UPDATE_IF_MOVED(objspace, cc->klass);
TYPED_UPDATE_IF_MOVED(objspace, struct rb_callable_method_entry_struct *, cc->cme_);
if (!is_live_object(objspace, (VALUE)cc->cme_)) {
vm_cc_invalidate(cc);
}
}
else {
vm_cc_invalidate(cc);
}
}
}
Expand Down

0 comments on commit 63d04b8

Please sign in to comment.