[project @ 2004-08-13 13:59:12 by simonmar]

Fixes to previous

diff --git a/ghc/includes/Updates.h b/ghc/includes/Updates.h
index 7345453..1f12030 100644 (file)
--- a/ghc/includes/Updates.h
+++ b/ghc/includes/Updates.h
@@ -86,12 +86,12 @@
                                  updclosure,   \
                                  heapptr)
 # else
-#  define UPD_IND_NOLOCK(updclosure, heapptr)          \
-       DECLARE_IPTR(info);                             \
-       info = GET_INFO(updclosure);                    \
-        AWAKEN_BQ_NOLOCK(info,updclosure);             \
-       updateWithIndirection(info, INFO_PTR(stg_IND_info), \
-                             updclosure,               \
+#  define UPD_IND_NOLOCK(updclosure, heapptr)                  \
+       DECLARE_IPTR(info);                                     \
+       info = GET_INFO(updclosure);                            \
+        AWAKEN_BQ_NOLOCK(info,updclosure);                     \
+       updateWithIndirection(info, INFO_PTR(stg_IND_info),     \
+                             updclosure,                       \
                              heapptr,); 
 # endif
 
@@ -303,11 +303,23 @@ DEBUG_FILL_SLOP(StgClosure *p)
     LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(p1);                             \
     bd = Bdescr((P_)p1);                                               \
     if (bd->gen_no == 0) {                                             \
+      ((StgInd *)p1)->indirectee = p2;                                 \
       SET_INFO(p1, ind_info);                                          \
       LDV_RECORD_CREATE(p1);                                           \
       TICK_UPD_NEW_IND();                                              \
       and_then;                                                                \
-    }}
+    } else {                                                           \
+      if (_info != &stg_BLACKHOLE_BQ_info) {                           \
+        DEBUG_FILL_SLOP(p1);                                           \
+        ((StgIndOldGen *)p1)->mut_link = generations[bd->gen_no].mut_once_list;        \
+        generations[bd->gen_no].mut_once_list = (StgMutClosure *)p1;    \
+      }                                                                        \
+      ((StgIndOldGen *)p1)->indirectee = p2;                           \
+      SET_INFO(p1, &stg_IND_OLDGEN_info);                              \
+      TICK_UPD_OLD_IND();                                              \
+      and_then;                                                                \
+    }                                                                  \
+  }
 #endif
 
 /* The permanent indirection version isn't performance critical.  We