diff options
| author | Jemma Issroff <jemmaissroff@gmail.com> | 2022-10-03 13:52:40 -0400 |
|---|---|---|
| committer | Aaron Patterson <tenderlove@ruby-lang.org> | 2022-10-11 08:40:56 -0700 |
| commit | 913979bede2a1b79109fa2072352882560d55fe0 (patch) | |
| tree | b039ef9760ff7b1bf397fd9cac648cc219032cd6 /variable.c | |
| parent | ad63b668e22e21c352b852f3119ae98a7acf99f1 (diff) | |
Make inline cache reads / writes atomic with object shapes
Prior to this commit, we were reading and writing ivar index and
shape ID in inline caches in two separate instructions when
getting and setting ivars. This meant there was a race condition
with ractors and these caches where one ractor could change
a value in the cache while another was still reading from it.
This commit instead reads and writes shape ID and ivar index to
inline caches atomically so there is no longer a race condition.
Co-Authored-By: Aaron Patterson <tenderlove@ruby-lang.org>
Co-Authored-By: John Hawthorn <john@hawthorn.email>
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/variable.c b/variable.c index b5e95b7f1c..1f532f2154 100644 --- a/variable.c +++ b/variable.c @@ -1627,7 +1627,7 @@ iterate_over_shapes_with_callback(rb_shape_t *shape, VALUE* iv_list, rb_ivar_for case SHAPE_ROOT: return; case SHAPE_IVAR: - iterate_over_shapes_with_callback(shape->parent, iv_list, callback, arg); + iterate_over_shapes_with_callback(rb_shape_get_shape_by_id(shape->parent_id), iv_list, callback, arg); VALUE val = iv_list[shape->iv_count - 1]; if (val != Qundef) { callback(shape->edge_name, val, arg); @@ -1635,7 +1635,7 @@ iterate_over_shapes_with_callback(rb_shape_t *shape, VALUE* iv_list, rb_ivar_for return; case SHAPE_IVAR_UNDEF: case SHAPE_FROZEN: - iterate_over_shapes_with_callback(shape->parent, iv_list, callback, arg); + iterate_over_shapes_with_callback(rb_shape_get_shape_by_id(shape->parent_id), iv_list, callback, arg); return; } } @@ -1694,7 +1694,7 @@ rb_copy_generic_ivar(VALUE clone, VALUE obj) rb_shape_t * obj_shape = rb_shape_get_shape(obj); if (rb_shape_frozen_shape_p(obj_shape)) { - rb_shape_set_shape(clone, obj_shape->parent); + rb_shape_set_shape_id(clone, obj_shape->parent_id); } else { rb_shape_set_shape(clone, obj_shape); |