1 files changed, 9 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index 52b1c23e6b..aec9b5e756 100644
--- a/gc.c
+++ b/gc.c
@@ -1223,7 +1223,15 @@ gc_sweep()
     /* clear finalization list */
     if (final_list) {
 	deferred_final_list = final_list;
-	rb_thread_pending = 1;
+	if (!freelist && !rb_thread_critical) {
+	    rb_gc_finalize_deferred();
+	}
+	else {
+	    rb_thread_pending = 1;
+	}
+	if (!freelist) {
+	    add_heap();
+	}
 	return;
     }
     free_unused_heaps();