Hold all threads before finishing finalizers on halt.

brixen · brixen · commit aa7814191b3c · 2015-07-16T21:13:50.000-07:00
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);

Original file line number	Diff line number	Diff line change
`@@ -609,15 +609,15 @@ namespace rubinius {`
`609`	`609`	`root_vm->set_call_frame(0);`
`610`	`610`	`}`
`611`	`611`
`612`		`- shared->finalizer_handler()->finish(state, gct);`
`613`		`-`
`614`	`612`	`root_vm->set_call_frame(0);`
`615`	`613`
`616`	`614`	`// Hold everyone.`
`617`	`615`	`while(!state->stop_the_world()) {`
`618`	`616`	`state->checkpoint(gct, 0);`
`619`	`617`	`}`
`620`	`618`
	`619`	`+ shared->finalizer_handler()->finish(state, gct);`
	`620`	`+`
`621`	`621`	`NativeMethod::cleanup_thread(state);`
`622`	`622`
`623`	`623`	`state->shared().signals()->stop(state);`