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

GC guard the iseq in eval for prism

Browse Source 
We need to GC guard the iseq because the code above it malloc memory which
could trigger a GC. Since we only use ISEQ_BODY, the compiler may optimize
out the iseq local variable so we need to GC guard it.

Fixes: http://ci.rvm.jp/results/trunk_asan@ruby-sp1/5484752
This commit is contained in:
Peter Zhu 2024-12-23 14:57:37 -05:00
parent f4476f0d07
commit 5b22f14e53
Notes: git 2024-12-23 21:44:47 +00:00 
Merged: https://github.com/ruby/ruby/pull/12443
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm_eval.c
View File

@ -1691,6 +1691,7 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
// leaf nodes. // leaf nodes.
iseq = parent; iseq = parent;
for (int scopes_index = 0; scopes_index < scopes_count; scopes_index++) { for (int scopes_index = 0; scopes_index < scopes_count; scopes_index++) {
VALUE iseq_value = (VALUE)iseq;
int locals_count = ISEQ_BODY(iseq)->local_table_size; int locals_count = ISEQ_BODY(iseq)->local_table_size;
pm_options_scope_t *options_scope = &result.options.scopes[scopes_count - scopes_index - 1]; pm_options_scope_t *options_scope = &result.options.scopes[scopes_count - scopes_index - 1];
pm_options_scope_init(options_scope, locals_count); pm_options_scope_init(options_scope, locals_count);
@ -1723,6 +1724,11 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
} }
iseq = ISEQ_BODY(iseq)->parent_iseq; iseq = ISEQ_BODY(iseq)->parent_iseq;
/* We need to GC guard the iseq because the code above malloc memory
* which could trigger a GC. Since we only use ISEQ_BODY, the compiler
* may optimize out the iseq local variable so we need to GC guard it. */
RB_GC_GUARD(iseq_value);
} }
// Add our empty local scope at the very end of the array for our eval // Add our empty local scope at the very end of the array for our eval