Need to insert write barriers in struct updates; fix #3547

matz · matz · commit 74712c73ac94 · 2017-04-05T11:53:20.000+09:00
diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c
@@ -449,6 +449,7 @@ mrb_struct_aset_sym(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val)
   for (i=0; i<len; i++) {
     if (mrb_symbol(ptr_members[i]) == id) {
       ptr[i] = val;
+      mrb_write_barrier(mrb, (struct RBasic*)mrb_ptr(s));
       return val;
     }
   }
@@ -511,6 +512,7 @@ mrb_struct_aset(mrb_state *mrb, mrb_value s)
                "offset %S too large for struct(size:%S)",
                mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));
   }
+  mrb_write_barrier(mrb, (struct RBasic*)mrb_ptr(s));
   return RSTRUCT_PTR(s)[i] = val;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,7 @@ mrb_struct_aset_sym(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val)`
`449`	`449`	`for (i=0; i<len; i++) {`
`450`	`450`	`if (mrb_symbol(ptr_members[i]) == id) {`
`451`	`451`	`ptr[i] = val;`
	`452`	`+ mrb_write_barrier(mrb, (struct RBasic*)mrb_ptr(s));`
`452`	`453`	`return val;`
`453`	`454`	`}`
`454`	`455`	`}`
`@@ -511,6 +512,7 @@ mrb_struct_aset(mrb_state *mrb, mrb_value s)`
`511`	`512`	`"offset %S too large for struct(size:%S)",`
`512`	`513`	`mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));`
`513`	`514`	`}`
	`515`	`+ mrb_write_barrier(mrb, (struct RBasic*)mrb_ptr(s));`
`514`	`516`	`return RSTRUCT_PTR(s)[i] = val;`
`515`	`517`	`}`
`516`	`518`