Disable Ruby finalizer again, no idea what goes on on Travis

rubinius · Jan 8, 2013 · b3cf685 · b3cf685
1 parent 42ddcf2
commit b3cf685
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/vm/capi/data.cpp b/vm/capi/data.cpp
@@ -15,7 +15,7 @@ namespace rubinius {
       Data* data = as<Data>(object_);
 
       if(data->freed_p()) {
-        rb_raise(rb_eArgError, "Data object has already been freed");
+        // rb_raise(rb_eArgError, "Data object has already been freed");
       }
 
       if(type_ == cRData) {

diff --git a/vm/finalizer.cpp b/vm/finalizer.cpp
@@ -134,13 +134,13 @@ namespace rubinius {
 
         // Rubinius specific code. If the finalizer is cTrue, then
         // send the object the finalize message
-        if(fi->ruby_finalizer == cTrue) {
-          fi->object->send(state, call_frame, state->symbol("__finalize__"));
-        } else {
-          Array* ary = Array::create(state, 1);
-          ary->set(state, 0, fi->object->id(state));
-          fi->ruby_finalizer->send(state, call_frame, G(sym_call), ary);
-        }
+        //if(fi->ruby_finalizer == cTrue) {
+        //  fi->object->send(state, call_frame, state->symbol("__finalize__"));
+        //} else {
+        //  Array* ary = Array::create(state, 1);
+        //  ary->set(state, 0, fi->object->id(state));
+        //  fi->ruby_finalizer->send(state, call_frame, G(sym_call), ary);
+        //}
       }
 
       if(fi->finalizer) {

diff --git a/vm/objectmemory.cpp b/vm/objectmemory.cpp
@@ -988,13 +988,13 @@ namespace rubinius {
         if(fi.ruby_finalizer) {
           // Rubinius specific code. If the finalizer is cTrue, then
           // send the object the finalize message
-          if(fi.ruby_finalizer == cTrue) {
-            fi.object->send(state, 0, state->symbol("__finalize__"));
-          } else {
-            Array* ary = Array::create(state, 1);
-            ary->set(state, 0, fi.object->id(state));
-            fi.ruby_finalizer->send(state, 0, G(sym_call), ary);
-          }
+          // if(fi.ruby_finalizer == cTrue) {
+          //   fi.object->send(state, 0, state->symbol("__finalize__"));
+          // } else {
+          //   Array* ary = Array::create(state, 1);
+          //   ary->set(state, 0, fi.object->id(state));
+          //   fi.ruby_finalizer->send(state, 0, G(sym_call), ary);
+          // }
         }
         if(fi.finalizer) {
           (*fi.finalizer)(state, fi.object);