Permalink
Browse files

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

  • Loading branch information...
1 parent 42ddcf2 commit b3cf685ee40b35d75c5761dd265d61f6fcfef8c3 @dbussink dbussink committed Jan 8, 2013
Showing with 15 additions and 15 deletions.
  1. +1 −1 vm/capi/data.cpp
  2. +7 −7 vm/finalizer.cpp
  3. +7 −7 vm/objectmemory.cpp
View
@@ -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) {
View
@@ -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) {
View
@@ -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);

0 comments on commit b3cf685

Please sign in to comment.