X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=d0ead3fc7d8574d5b92d3b5460c595d5afb1b344;hb=44886baea4f683939c15cf2d16f1387f4c9df048;hp=8352d0718d92d1e2171b0d7892309a3d27dc2574;hpb=cf6845428c2bd19c6e52d3a7577e2d2bfe55f95c;p=ghc-hetmet.git

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index 8352d07..d0ead3f 100644
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.49 2003/09/23 17:07:39 sof Exp $
+ * $Id: MBlock.c,v 1.50 2003/10/31 16:21:27 sof Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -271,7 +271,13 @@ getMBlocks(nat n)
   
   if ( (base_non_committed == 0) || (next_request + size > end_non_committed) ) {
     if (base_non_committed) {
-      barf("RTS exhausted max heap size (%d bytes)\n", size_reserved_pool);
+	/* Tacky, but if no user-provided -M option is in effect,
+	 * set it to the default (==256M) in time for the heap overflow PSA.
+	 */
+	if (RtsFlags.GcFlags.maxHeapSize == 0) {
+	    RtsFlags.GcFlags.maxHeapSize = size_reserved_pool / BLOCK_SIZE;
+	}
+	heapOverflow();
     }
     if (RtsFlags.GcFlags.maxHeapSize != 0) {
       size_reserved_pool = BLOCK_SIZE * RtsFlags.GcFlags.maxHeapSize;