X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRetainerProfile.c;h=b5db15a7b6b346f1eeae58bfef176f7ba32131f3;hb=5d52d9b64c21dcf77849866584744722f8121389;hp=b7bc909f63017f5a24ab5d3a4b8bca407ace2ca0;hpb=7408b39235bccdcde48df2a73337ff976fbc09b7;p=ghc-hetmet.git

diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index b7bc909..b5db15a 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -453,8 +453,6 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
 	// no child, no SRT
     case CONSTR_0_1:
     case CONSTR_0_2:
-    case CAF_BLACKHOLE:
-    case BLACKHOLE:
     case ARR_WORDS:
 	*first_child = NULL;
 	return;
@@ -470,6 +468,7 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
     case IND_PERM:
     case IND_OLDGEN_PERM:
     case IND_OLDGEN:
+    case BLACKHOLE:
 	*first_child = ((StgInd *)c)->indirectee;
 	return;
     case CONSTR_1_0:
@@ -510,6 +509,7 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
 	// layout.payload.ptrs, no SRT
     case CONSTR:
     case PRIM:
+    case MUT_PRIM:
     case BCO:
     case CONSTR_STATIC:
 	init_ptrs(&se.info, get_itbl(c)->layout.payload.ptrs,
@@ -589,16 +589,6 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
 	    return;     // no child
 	break;
 	
-    case TVAR_WATCH_QUEUE:
-	*first_child = (StgClosure *)((StgTVarWatchQueue *)c)->closure;
-	se.info.next.step = 2;            // 2 = second
-	break;
-    case TVAR:
-	*first_child = (StgClosure *)((StgTVar *)c)->current_value;
-	break;
-    case TREC_HEADER:
-	*first_child = (StgClosure *)((StgTRecHeader *)c)->enclosing_trec;
-	break;
     case TREC_CHUNK:
 	*first_child = (StgClosure *)((StgTRecChunk *)c)->prev_chunk;
 	se.info.next.step = 0;  // entry no.
@@ -827,33 +817,6 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
 	    *r = se->c_child_r;
 	    return;
 
-	case TVAR_WATCH_QUEUE:
-	    if (se->info.next.step == 2) {
-		*c = (StgClosure *)((StgTVarWatchQueue *)se->c)->next_queue_entry;
-		se->info.next.step++;             // move to the next step
-		// no popOff
-	    } else {
-		*c = (StgClosure *)((StgTVarWatchQueue *)se->c)->prev_queue_entry;
-		popOff();
-	    }
-	    *cp = se->c;
-	    *r = se->c_child_r;
-	    return;
-
-	case TVAR:
-	    *c = (StgClosure *)((StgTVar *)se->c)->first_watch_queue_entry;
-	    *cp = se->c;
-	    *r = se->c_child_r;
-	    popOff();
-	    return;
-
-	case TREC_HEADER:
-	    *c = (StgClosure *)((StgTRecHeader *)se->c)->current_chunk;
-	    *cp = se->c;
-	    *r = se->c_child_r;
-	    popOff();
-	    return;
-
 	case TREC_CHUNK: {
 	    // These are pretty complicated: we have N entries, each
 	    // of which contains 3 fields that we want to follow.  So
@@ -884,6 +847,7 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
 
 	case CONSTR:
 	case PRIM:
+	case MUT_PRIM:
 	case BCO:
 	case CONSTR_STATIC:
 	    // StgMutArrPtr.ptrs, no SRT
@@ -951,8 +915,6 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
 	    // no child (fixed), no SRT
 	case CONSTR_0_1:
 	case CONSTR_0_2:
-	case CAF_BLACKHOLE:
-	case BLACKHOLE:
 	case ARR_WORDS:
 	    // one child (fixed), no SRT
 	case MUT_VAR_CLEAN:
@@ -1045,6 +1007,7 @@ isRetainer( StgClosure *c )
     case TSO:
 
 	// mutable objects
+    case MUT_PRIM:
     case MVAR_CLEAN:
     case MVAR_DIRTY:
     case MUT_VAR_CLEAN:
@@ -1071,10 +1034,6 @@ isRetainer( StgClosure *c )
 	// WEAK objects are roots; there is separate code in which traversing
 	// begins from WEAK objects.
     case WEAK:
-
-	// Since the other mutvar-type things are retainers, seems
-	// like the right thing to do:
-    case TVAR:
 	return rtsTrue;
 
 	//
@@ -1097,13 +1056,11 @@ isRetainer( StgClosure *c )
     case FUN_0_2:
 	// partial applications
     case PAP:
-	// blackholes
-    case CAF_BLACKHOLE:
-    case BLACKHOLE:
 	// indirection
     case IND_PERM:
     case IND_OLDGEN_PERM:
     case IND_OLDGEN:
+    case BLACKHOLE:
 	// static objects
     case CONSTR_STATIC:
     case FUN_STATIC:
@@ -1112,8 +1069,6 @@ isRetainer( StgClosure *c )
     case BCO:
     case ARR_WORDS:
 	// STM
-    case TVAR_WATCH_QUEUE:
-    case TREC_HEADER:
     case TREC_CHUNK:
 	return rtsFalse;