ZJIT: Pass the result of GuardNotFrozen to StoreField and WriteBarrier

Author: eregon

zjit/src/hir.rs

@@ -2503,6 +2503,10 @@ impl Function {
                                     // true of the converse.
                                     //
                                     // No need for a GuardShape.
+                                    if let OptimizedMethodType::StructAset = opt_type {
+                                        recv = self.push_insn(block, Insn::GuardNotFrozen { recv, state });
+                                    }
+
                                     let (target, offset) = if is_embedded {
                                         let offset = RUBY_OFFSET_RSTRUCT_AS_ARY + (SIZEOF_VALUE_I32 * index);
                                         (recv, offset)
@@ -2513,7 +2517,6 @@ impl Function {
                                     };
 
                                     let replacement = if let (OptimizedMethodType::StructAset, &[val]) = (opt_type, args.as_slice()) {
-                                        self.push_insn(block, Insn::GuardNotFrozen { recv, state });
                                         self.push_insn(block, Insn::StoreField { recv: target, id: mid, offset, val });
                                         self.push_insn(block, Insn::WriteBarrier { recv, val });
                                         val

zjit/src/hir/opt_tests.rs

@@ -5360,8 +5360,8 @@ mod hir_opt_tests {
           PatchPoint NoSingletonClass(C@0x1000)
           v29:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C]
           v30:HeapObject[class_exact:C] = GuardNotFrozen v29
-          StoreField v29, :foo=@0x1038, v12
-          WriteBarrier v29, v12
+          StoreField v30, :foo=@0x1038, v12
+          WriteBarrier v30, v12
           CheckInterrupts
           Return v12
         ");
@@ -5391,10 +5391,10 @@ mod hir_opt_tests {
           PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010)
           PatchPoint NoSingletonClass(C@0x1000)
           v29:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C]
-          v30:CPtr = LoadField v29, :_as_heap@0x1038
-          v31:HeapObject[class_exact:C] = GuardNotFrozen v29
-          StoreField v30, :foo=@0x1039, v12
-          WriteBarrier v29, v12
+          v30:HeapObject[class_exact:C] = GuardNotFrozen v29
+          v31:CPtr = LoadField v30, :_as_heap@0x1038
+          StoreField v31, :foo=@0x1039, v12
+          WriteBarrier v30, v12
           CheckInterrupts
           Return v12
         ");