X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRetainerProfile.c;h=9f29acae193b46467fdb44488e4760d29fe96fb4;hb=843211e0a54b051ecec5d5fbbf6afa27dfa5fd81;hp=17f5afb615d3cdd305334260437db429e2a88b54;hpb=37a3e47992bd46a3cf4f6a4c6fd5b9e187e88452;p=ghc-hetmet.git

diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index 17f5afb..9f29aca 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -20,9 +20,7 @@
 #include "RtsUtils.h"
 #include "RetainerProfile.h"
 #include "RetainerSet.h"
-#include "Storage.h"
 #include "Schedule.h"
-#include "Stable.h"
 #include "Printer.h"
 #include "RtsFlags.h"
 #include "Weak.h"
@@ -620,9 +618,7 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
     case RET_DYN:
     case RET_BCO:
     case RET_SMALL:
-    case RET_VEC_SMALL:
     case RET_BIG:
-    case RET_VEC_BIG:
 	// invalid objects
     case IND:
     case BLOCKED_FETCH:
@@ -986,9 +982,7 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
 	case STOP_FRAME:
 	case RET_BCO:
 	case RET_SMALL:
-	case RET_VEC_SMALL:
 	case RET_BIG:
-	case RET_VEC_BIG:
 	    // invalid objects
 	case IND:
 	case BLOCKED_FETCH:
@@ -1152,9 +1146,7 @@ isRetainer( StgClosure *c )
     case RET_DYN:
     case RET_BCO:
     case RET_SMALL:
-    case RET_VEC_SMALL:
     case RET_BIG:
-    case RET_VEC_BIG:
 	// other cases
     case IND:
     case BLOCKED_FETCH:
@@ -1389,7 +1381,6 @@ retainStack( StgClosure *c, retainer c_child_r,
 	case CATCH_RETRY_FRAME:
 	case ATOMICALLY_FRAME:
 	case RET_SMALL:
-	case RET_VEC_SMALL:
 	    bitmap = BITMAP_BITS(info->i.layout.bitmap);
 	    size   = BITMAP_SIZE(info->i.layout.bitmap);
 	    p++;
@@ -1414,7 +1405,6 @@ retainStack( StgClosure *c, retainer c_child_r,
 
 	    // large bitmap (> 32 entries, or > 64 on a 64-bit machine) 
 	case RET_BIG:
-	case RET_VEC_BIG:
 	    size = GET_LARGE_BITMAP(&info->i)->size;
 	    p++;
 	    retain_large_bitmap(p, GET_LARGE_BITMAP(&info->i),
@@ -2120,8 +2110,8 @@ sanityCheckHeapClosure( StgClosure *c )
 
     if ((((StgWord)RSET(c) & 1) ^ flip) != 0) {
 	if (get_itbl(c)->type == CONSTR &&
-	    !strcmp(get_itbl(c)->prof.closure_type, "DEAD_WEAK") &&
-	    !strcmp(get_itbl(c)->prof.closure_desc, "DEAD_WEAK")) {
+	    !strcmp(GET_PROF_TYPE(get_itbl(c)), "DEAD_WEAK") &&
+	    !strcmp(GET_PROF_DESC(get_itbl(c)), "DEAD_WEAK")) {
 	    debugBelch("\tUnvisited dead weak pointer object found: c = %p\n", c);
 	    costArray[get_itbl(c)->type] += cost(c);
 	    sumOfNewCost += cost(c);
@@ -2129,7 +2119,7 @@ sanityCheckHeapClosure( StgClosure *c )
 	    debugBelch(
 		    "Unvisited object: flip = %d, c = %p(%d, %s, %s), rs = %p\n",
 		    flip, c, get_itbl(c)->type,
-		    get_itbl(c)->prof.closure_type, get_itbl(c)->prof.closure_desc,
+		    get_itbl(c)->prof.closure_type, GET_PROF_DESC(get_itbl(c)),
 		    RSET(c));
     } else {
 	// debugBelch("sanityCheckHeapClosure) S: flip = %d, c = %p(%d), rs = %p\n", flip, c, get_itbl(c)->type, RSET(c));