Hold all threads before finishing finalizers on halt.

rubinius · Jul 17, 2015 · aa78141 · aa78141
1 parent bef51ae
commit aa78141
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vm/environment.cpp b/vm/environment.cpp
@@ -609,15 +609,15 @@ namespace rubinius {
       root_vm->set_call_frame(0);
     }
 
-    shared->finalizer_handler()->finish(state, gct);
-
     root_vm->set_call_frame(0);
 
     // Hold everyone.
     while(!state->stop_the_world()) {
       state->checkpoint(gct, 0);
     }
 
+    shared->finalizer_handler()->finish(state, gct);
+
     NativeMethod::cleanup_thread(state);
 
     state->shared().signals()->stop(state);