From 0accf1fbeced2530d2428b750a3c37e797c1745a Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Oct 2011 10:26:50 +0000
Subject: merge revision(s) 33368:

	* gc.c (add_heap_slots, init_heap): reset heaps_inc zero when
	  heap slots are expanded by environment variable RUBY_HEAP_MIN_SLOTS.
	  [ruby-core:39777] [Bug #5380]

	* test/ruby/test_gc.rb (test_gc_parameter): add test for it.

	* test/ruby/envutil.rb (assert_normal_exit): add :child_env option to
	  enable pass environemnt variables to child process.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gc.c')

diff --git a/gc.c b/gc.c
index 3fc465b482..844e104ecc 100644
--- a/gc.c
+++ b/gc.c
@@ -1079,6 +1079,7 @@ add_heap_slots(rb_objspace_t *objspace, size_t add)
     for (i = 0; i < add; i++) {
         assign_heap_slot(objspace);
     }
+    heaps_inc = 0;
 }
 
 static void
@@ -1095,7 +1096,6 @@ init_heap(rb_objspace_t *objspace)
     }
 #endif
 
-    heaps_inc = 0;
     objspace->profile.invoke_time = getrusage_time();
     finalizer_table = st_init_numtable();
 }
-- 
cgit v1.2.3