>From 383bc095a5784954e4b98ea26cc904ec7460e665 Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sat, 30 Jun 2012 12:46:33 +0200
Subject: [PATCH] When resizing the heap ensure it grows enough to accommodate
 the nursery. This fixes out of memory errors in extreme
 cases like allocating finalizers on lots of objects in a
 tight loop

---
 runtime.c          |    7 +++++--
 tests/runtests.bat |    4 ++++
 tests/runtests.sh  |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/runtime.c b/runtime.c
index b0ccc85..04d476f 100644
--- a/runtime.c
+++ b/runtime.c
@@ -139,8 +139,8 @@ extern void _C_do_apply_hack(void *proc, C_word *args, int count) C_noret;
 #endif
 
 #define DEFAULT_SYMBOL_TABLE_SIZE      2999
-#define DEFAULT_HEAP_SIZE              500000
-#define MINIMAL_HEAP_SIZE              500000
+#define DEFAULT_HEAP_SIZE              DEFAULT_STACK_SIZE
+#define MINIMAL_HEAP_SIZE              DEFAULT_STACK_SIZE
 #define DEFAULT_MAXIMAL_HEAP_SIZE      0x7ffffff0
 #define DEFAULT_HEAP_GROWTH            200
 #define DEFAULT_HEAP_SHRINKAGE         50
@@ -3120,6 +3120,9 @@ C_regparm void C_fcall C_rereclaim2(C_uword size, int double_plus)
 
   if(size < MINIMAL_HEAP_SIZE) size = MINIMAL_HEAP_SIZE;
 
+  /* Heap must at least grow enough to accommodate first generation (nursery) */
+  if(size - heap_size < stack_size) size = heap_size + stack_size;
+	  
   if(size > C_maximal_heap_size) size = C_maximal_heap_size;
 
   if(size == heap_size) return;
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 93efb4d..753257a 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -400,6 +400,10 @@ echo ======================================== finalizer tests ...
 if errorlevel 1 exit /b 1
 
 echo ======================================== finalizer tests (2) ...
+%compile% finalizer-error-test.scm
+if errorlevel 1 exit /b 1
+a.out -:hg101
+if errorlevel 1 exit /b 1
 %compile% test-finalizers-2.scm
 if errorlevel 1 exit /b 1
 a.out
diff --git a/tests/runtests.sh b/tests/runtests.sh
index a87d750..093115c 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -348,7 +348,7 @@ $compile symbolgc-tests.scm
 echo "======================================== finalizer tests ..."
 $interpret -s test-finalizers.scm
 $compile finalizer-error-test.scm
-./a.out
+./a.out -:hg101
 $compile test-finalizers-2.scm
 ./a.out
 
-- 
1.7.9.1