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>

1 files changed, 2 insertions, 2 deletions

diff --git a/vm.c b/vm.c
index a52d3efa7b..ed38192670 100644
--- a/vm.c
+++ b/vm.c
@@ -4054,11 +4054,11 @@ Init_vm_objects(void)
     }
 
     // Root shape
-    vm->root_shape = rb_shape_alloc(0, 0);
+    vm->root_shape = rb_shape_alloc_with_parent_id(0, INVALID_SHAPE_ID);
     RUBY_ASSERT(rb_shape_id(vm->root_shape) == ROOT_SHAPE_ID);
 
     // Frozen root shape
-    vm->frozen_root_shape = rb_shape_alloc(rb_make_internal_id(), vm->root_shape);
+    vm->frozen_root_shape = rb_shape_alloc_with_parent_id(rb_make_internal_id(), rb_shape_id(vm->root_shape));
     vm->frozen_root_shape->type = (uint8_t)SHAPE_FROZEN;
     RUBY_ASSERT(rb_shape_id(vm->frozen_root_shape) == FROZEN_ROOT_SHAPE_ID);