X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FRetainerProfile.c;h=9f29acae193b46467fdb44488e4760d29fe96fb4;hp=cd0001311d294596f5a1d6e148e569b58d9de802;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=ab0e778ccfde61aed4c22679b24d175fc6cc9bf3

diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index cd00013..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:
@@ -662,6 +658,12 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
     // following statement by either a memcpy() call or a switch statement
     // on the type of the element. Currently, the size of stackElement is
     // small enough (5 words) that this direct assignment seems to be enough.
+
+    // ToDo: The line below leads to the warning:
+    //    warning: 'se.info.type' may be used uninitialized in this function
+    // This is caused by the fact that there are execution paths through the
+    // large switch statement above where some cases do not initialize this
+    // field. Is this really harmless? Can we avoid the warning?
     *stackTop = se;
 
 #ifdef DEBUG_RETAINER
@@ -980,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:
@@ -1146,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:
@@ -1383,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++;
@@ -1408,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),
@@ -2114,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);
@@ -2123,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));