kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

remove invalidated cc 

if cc is invalidated, cc should be released from iseq.
This commit is contained in:
Koichi Sasada 2021-01-06 13:06:25 +09:00
parent 442bd0e92c
commit 954d6c7432
Notes: git 2021-01-06 14:58:13 +09:00 
Merged: https://github.com/ruby/ruby/pull/4030
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iseq.c
View File

@ -359,8 +359,12 @@ rb_iseq_mark(const rb_iseq_t *iseq)
rb_gc_mark_movable((VALUE)ci);
}
if (cc && vm_cc_markable(cc)) {
rb_gc_mark_movable((VALUE)cc);
// TODO: check enable
if (!vm_cc_invalidated_p(cc)) {
rb_gc_mark_movable((VALUE)cc);
}
else {
cds[i].cc = rb_vm_empty_cc();
}
}
}
}

11
vm_callinfo.h
View File

@ -357,6 +357,17 @@ vm_cc_markable(const struct rb_callcache *cc)
return FL_TEST_RAW((VALUE)cc, VM_CALLCACHE_UNMARKABLE) == 0;
}
static inline bool
vm_cc_invalidated_p(const struct rb_callcache *cc)
{
if (cc->klass && METHOD_ENTRY_INVALIDATED(vm_cc_cme(cc))) {
return false;
}
else {
return true;
}
}
// For MJIT. cc_cme is supposed to have inlined `vm_cc_cme(cc)`.
static inline bool
vm_cc_valid_p(const struct rb_callcache *cc, const rb_callable_method_entry_t *cc_cme, VALUE klass)