A bit of write_barrier cleanup.

rubinius · Mar 30, 2016 · 089e9eb · 089e9eb
1 parent 40f0f30
commit 089e9eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
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;
     }