X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FCmm.h;h=ea760a860fbf34b0de2414324de51eb35cfe5c02;hb=beb5737b7ee42c4e9373a505e7d957206d69a30e;hp=d0dedb8a73a76f42e14e8098087c455f5778c4f8;hpb=03a9ff01812afc81eb5236fd3063cbec44cf469e;p=ghc-hetmet.git

diff --git a/ghc/includes/Cmm.h b/ghc/includes/Cmm.h
index d0dedb8..ea760a8 100644
--- a/ghc/includes/Cmm.h
+++ b/ghc/includes/Cmm.h
@@ -323,7 +323,7 @@
 // whether the nursery is nearly empty in any function that uses
 // allocateLocal() - this includes many of the primops.
 #define MAYBE_GC(liveness,reentry)			\
-   if (bdescr_link(CurrentNursery) == NULL) {		\
+  if (bdescr_link(CurrentNursery) == NULL || CInt[alloc_blocks] >= CInt[alloc_blocks_lim]) {		\
 	R9  = liveness;					\
         R10 = reentry;					\
         jump stg_gc_gen_hp;				\
@@ -340,11 +340,7 @@
  * the value from GHC, but it seems like too much trouble to do that
  * for StgThunkHeader.
  */
-#ifdef SMP
 #define SIZEOF_StgThunkHeader SIZEOF_StgHeader+SIZEOF_StgSMPThunkHeader
-#else
-#define SIZEOF_StgThunkHeader SIZEOF_StgHeader
-#endif
 
 #define StgThunk_payload(__ptr__,__ix__) \
     W_[__ptr__+SIZEOF_StgThunkHeader+ WDS(__ix__)]