1 files changed, 11 insertions, 9 deletions

diff --git a/gc.c b/gc.c
index 244c86686f..5a2146b24c 100644
--- a/gc.c
+++ b/gc.c
@@ -1059,8 +1059,6 @@ gc_sweep()
         st_foreach(source_filenames, sweep_source_filename, 0);
     }
 
-    rb_gc_abort_threads();
-
     freelist = 0;
     final_list = deferred_final_list;
     deferred_final_list = 0;
@@ -1404,14 +1402,18 @@ garbage_collect()
     rb_gc_mark_parser();
 
     /* gc_mark objects whose marking are not completed*/
-    while (!MARK_STACK_EMPTY){
-	if (mark_stack_overflow){
-	    gc_mark_all();
-	}
-	else {
-	    gc_mark_rest();
+    do {
+	while (!MARK_STACK_EMPTY) {
+	    if (mark_stack_overflow){
+		gc_mark_all();
+	    }
+	    else {
+		gc_mark_rest();
+	    }
 	}
-    }
+	rb_gc_abort_threads();
+    } while (!MARK_STACK_EMPTY);
+
     gc_sweep();
 }