A bit of write_barrier cleanup.

brixen · brixen · commit 089e9ebaeb9f · 2016-03-29T23:03:32.000-07:00
diff --git a/machine/builtin/tuple.hpp b/machine/builtin/tuple.hpp
@@ -56,9 +56,7 @@ namespace rubinius {
 
     Object* put(STATE, native_int idx, Object* val) {
       field[idx] = val;
-      if(mature_object_p()) {
-        Tuple::write_barrier(state, this, val);
-      }
+      Tuple::write_barrier(state, this, val);
       return val;
     }
 
diff --git a/machine/memory.hpp b/machine/memory.hpp
@@ -328,13 +328,9 @@ namespace rubinius {
       obj->set_obj_type(type);
 
     // set_klass:
-      obj->klass(klass);
+      obj->klass(state, klass);
       obj->ivars(cNil);
 
-      if(obj->mature_object_p()) {
-        write_barrier(obj, klass);
-      }
-
       obj->set_cycle(cycle_);
 
       return obj;
@@ -359,11 +355,9 @@ namespace rubinius {
       obj->set_pinned();
       obj->set_obj_type(type);
 
-      obj->klass(klass);
+      obj->klass(state, klass);
       obj->ivars(cNil);
 
-      write_barrier(obj, klass);
-
       return obj;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ namespace rubinius {`
`56`	`56`
`57`	`57`	`Object* put(STATE, native_int idx, Object* val) {`
`58`	`58`	`field[idx] = val;`
`59`		`- if(mature_object_p()) {`
`60`		`- Tuple::write_barrier(state, this, val);`
`61`		`- }`
	`59`	`+ Tuple::write_barrier(state, this, val);`
`62`	`60`	`return val;`
`63`	`61`	`}`
`64`	`62`