ZJIT: Add PatchPoint for Ractor mode for ivar get and set

Author: st0012

test/ruby/test_zjit.rb

@@ -1904,6 +1904,55 @@ def write(hash, key)
     }
   end
 
+  def test_ivar_get_with_multi_ractor_mode
+    assert_compiles '42', %q{
+      class A
+        def self.set_bar
+          @bar = [] # needs to be a ractor unshareable object
+        end
+
+        def self.foo
+          begin
+            @bar
+          rescue Ractor::IsolationError
+            42
+          end
+        end
+      end
+
+      A.set_bar
+      A.foo
+      A.foo
+
+      Ractor.new { A.foo }.value
+    }
+  end
+
+  def test_ivar_set_with_multi_ractor_mode
+    assert_compiles '42', %q{
+      class Foo
+        def self.bar
+          _foo = 1
+          _bar = 2
+          begin
+            @bar = _foo + _bar
+          rescue Ractor::IsolationError
+            42
+          end
+        end
+      end
+
+      def test
+        Foo.bar
+      end
+
+      test
+      test
+
+      Ractor.new { test }.value
+    }
+  end
+
   private
 
   # Assert that every method call in `test_script` can be compiled by ZJIT

zjit/src/hir.rs

@@ -3323,15 +3323,20 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
                 }
                 YARVINSN_getinstancevariable => {
                     let id = ID(get_arg(pc, 0).as_u64());
+
                     // ic is in arg 1
                     let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    // TODO: We only really need this if self_val is a class/module
+                    fun.push_insn(block, Insn::PatchPoint { invariant: Invariant::SingleRactorMode, state: exit_id });
                     let result = fun.push_insn(block, Insn::GetIvar { self_val: self_param, id, state: exit_id });
                     state.stack_push(result);
                 }
                 YARVINSN_setinstancevariable => {
                     let id = ID(get_arg(pc, 0).as_u64());
                     // ic is in arg 1
                     let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    // TODO: We only really need this if self_val is a class/module
+                    fun.push_insn(block, Insn::PatchPoint { invariant: Invariant::SingleRactorMode, state: exit_id });
                     let val = state.stack_pop()?;
                     fun.push_insn(block, Insn::SetIvar { self_val: self_param, id, val, state: exit_id });
                 }
@@ -5044,9 +5049,10 @@ mod tests {
         assert_snapshot!(hir_string("test"), @r"
         fn test@<compiled>:2:
         bb0(v0:BasicObject):
-          v3:BasicObject = GetIvar v0, :@foo
+          PatchPoint SingleRactorMode
+          v4:BasicObject = GetIvar v0, :@foo
           CheckInterrupts
-          Return v3
+          Return v4
         ");
     }
 
@@ -5061,6 +5067,7 @@ mod tests {
         fn test@<compiled>:2:
         bb0(v0:BasicObject):
           v2:Fixnum[1] = Const Value(1)
+          PatchPoint SingleRactorMode
           SetIvar v0, :@foo, v2
           CheckInterrupts
           Return v2
@@ -5336,12 +5343,15 @@ mod tests {
           v1:NilClass = Const Value(nil)
           v2:NilClass = Const Value(nil)
           v3:NilClass = Const Value(nil)
-          v6:BasicObject = GetIvar v0, :@a
-          v8:BasicObject = GetIvar v0, :@b
-          v10:BasicObject = GetIvar v0, :@c
-          v12:ArrayExact = NewArray v6, v8, v10
+          PatchPoint SingleRactorMode
+          v7:BasicObject = GetIvar v0, :@a
+          PatchPoint SingleRactorMode
+          v10:BasicObject = GetIvar v0, :@b
+          PatchPoint SingleRactorMode
+          v13:BasicObject = GetIvar v0, :@c
+          v15:ArrayExact = NewArray v7, v10, v13
           CheckInterrupts
-          Return v12
+          Return v15
         ");
         assert_contains_opcode("reverse_even", YARVINSN_opt_reverse);
         assert_snapshot!(hir_string("reverse_even"), @r"
@@ -5351,13 +5361,17 @@ mod tests {
           v2:NilClass = Const Value(nil)
           v3:NilClass = Const Value(nil)
           v4:NilClass = Const Value(nil)
-          v7:BasicObject = GetIvar v0, :@a
-          v9:BasicObject = GetIvar v0, :@b
-          v11:BasicObject = GetIvar v0, :@c
-          v13:BasicObject = GetIvar v0, :@d
-          v15:ArrayExact = NewArray v7, v9, v11, v13
+          PatchPoint SingleRactorMode
+          v8:BasicObject = GetIvar v0, :@a
+          PatchPoint SingleRactorMode
+          v11:BasicObject = GetIvar v0, :@b
+          PatchPoint SingleRactorMode
+          v14:BasicObject = GetIvar v0, :@c
+          PatchPoint SingleRactorMode
+          v17:BasicObject = GetIvar v0, :@d
+          v19:ArrayExact = NewArray v8, v11, v14, v17
           CheckInterrupts
-          Return v15
+          Return v19
         ");
     }
 
@@ -7421,9 +7435,10 @@ mod opt_tests {
         assert_snapshot!(hir_string("test"), @r"
         fn test@<compiled>:2:
         bb0(v0:BasicObject):
-          v3:BasicObject = GetIvar v0, :@foo
+          PatchPoint SingleRactorMode
+          v4:BasicObject = GetIvar v0, :@foo
           CheckInterrupts
-          Return v3
+          Return v4
         ");
     }
 
@@ -7436,6 +7451,7 @@ mod opt_tests {
         fn test@<compiled>:2:
         bb0(v0:BasicObject):
           v2:Fixnum[1] = Const Value(1)
+          PatchPoint SingleRactorMode
           SetIvar v0, :@foo, v2
           CheckInterrupts
           Return v2