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

Store the dup'd CDHASH in the object list during IBF load

Browse Source 
Since b2fc592c304 nothing was holding a reference to the dup'd CDHASH
during IBF loading.  If a GC happened to run during IBF load then the
copied hash wouldn't have anything to keep it alive.  We don't really
want to keep the originally loaded CDHASH hash, so this patch just
overwrites the original hash with the copied / modified hash.

[Bug #17984] [ruby-core:104259]
This commit is contained in:
Aaron Patterson 2021-07-06 15:11:49 -07:00 committed by Aaron Patterson
parent 91258ed449
commit 2599d1a8df
Notes: git 2021-07-07 09:49:11 +09:00 
Merged: https://github.com/ruby/ruby/pull/4630
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compile.c
View File

@ -10797,6 +10797,11 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
rb_hash_rehash(v); // hash function changed
freeze_hide_obj(v);
// Overwrite the existing hash in the object list. This
// is to keep the object alive during load time.
// [Bug #17984] [ruby-core:104259]
pinned_list_store(load->current_buffer->obj_list, (long)op, v);
code[code_index] = v;
RB_OBJ_WRITTEN(iseqv, Qundef, v);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);