[project @ 2000-11-13 14:40:36 by simonmar]

[ghc-hetmet.git] / ghc / rts / ProfHeap.c

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index 39eaa90..6792a11 100644 (file)
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.13 2000/05/12 12:48:36 simonmar Exp $
+ * $Id: ProfHeap.c,v 1.18 2000/11/13 14:40:37 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -412,7 +412,7 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat components)
 
   } else {
     fprint_ccs(fp, ccs->prevStack,components-1);
-    fprintf(fp,"/%s (%d)",cc->label,ccs->ccsID);
+    fprintf(fp,"/%s",cc->label);
   }
 }
 
@@ -496,9 +496,10 @@ heapCensus(void)
        break;
        
       case CONSTR:
-       if (((StgClosure *)p)->header.info == &DEAD_WEAK_info) {
-         size = sizeofW(StgWeak);
-         break;
+       if (((StgClosure *)p)->header.info == &stg_DEAD_WEAK_info
+           && !(LOOKS_LIKE_GHC_INFO(*(p + sizeW_fromITBL(info))))) {
+           size = sizeofW(StgWeak);
+           break;
        }
        /* else, fall through... */