1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't unpoison the CC in vm_ccs_free

Browse Source 
The poison status is maintained by the GC, so don't unpoison it in vm_ccs_free.
If the object is not a garbage object, then it should not be poisoned.
This commit is contained in:
Peter Zhu 2024-12-19 13:52:01 -05:00
parent 84eff67644
commit 33f95d632d
Notes: git 2024-12-19 21:25:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/12402
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
imemo.c
View File

@ -461,7 +461,6 @@ vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, VALUE klass)
for (int i=0; i<ccs->len; i++) { for (int i=0; i<ccs->len; i++) {
const struct rb_callcache *cc = ccs->entries[i].cc; const struct rb_callcache *cc = ccs->entries[i].cc;
if (!alive) { if (!alive) {
void *ptr = asan_unpoison_object_temporary((VALUE)cc);
// ccs can be free'ed. // ccs can be free'ed.
if (rb_gc_pointer_to_heap_p((VALUE)cc) && if (rb_gc_pointer_to_heap_p((VALUE)cc) &&
!rb_objspace_garbage_object_p((VALUE)cc) && !rb_objspace_garbage_object_p((VALUE)cc) &&
@ -470,14 +469,8 @@ vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, VALUE klass)
// OK. maybe target cc. // OK. maybe target cc.
} }
else { else {
if (ptr) {
rb_asan_poison_object((VALUE)cc);
}
continue; continue;
} }
if (ptr) {
rb_asan_poison_object((VALUE)cc);
}
} }
VM_ASSERT(!vm_cc_super_p(cc) && !vm_cc_refinement_p(cc)); VM_ASSERT(!vm_cc_super_p(cc) && !vm_cc_refinement_p(cc));