2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d5b48d54e..8b64f76169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Oct 26 11:30:07 2013  Koichi Sasada  <[email protected]>
+
+	* gc.c (vm_malloc_increase): do gc_rest_sweep() before GC.
+	  gc_rest_sweep() can reduce malloc_increase, so try it before GC.
+	  Otherwise, malloc_increase can be less than malloc_limit at
+	  gc_before_sweep(). This means that re-calculation of malloc_limit
+	  may be wrong value.
+
 Sat Oct 26 06:35:41 2013  Masaya Tarui  <[email protected]>
 
 	* gc.c (gc_before_heap_sweep): Restructure code to mean clearly.
diff --git a/gc.c b/gc.c
index 89875253e3..320a5de093 100644
--- a/gc.c
+++ b/gc.c
@@ -5033,9 +5033,19 @@ vm_malloc_increase(rb_objspace_t *objspace, size_t new_size, size_t old_size, in
     }
 
     if (do_gc) {
-	if ((ruby_gc_stress && !ruby_disable_gc_stress) || (malloc_increase > malloc_limit)) {
+	if (ruby_gc_stress && !ruby_disable_gc_stress) {
 	    garbage_collect_with_gvl(objspace, 0, 0, GPR_FLAG_MALLOC);
 	}
+	else {
+	  retry:
+	    if (malloc_increase > malloc_limit) {
+		if (is_lazy_sweeping(heap_eden)) {
+		    gc_rest_sweep(objspace); /* rest_sweep can reduce malloc_increase */
+		    goto retry;
+		}
+		garbage_collect_with_gvl(objspace, 0, 0, GPR_FLAG_MALLOC);
+	    }
+	}
     }
 }