summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-08-03 20:21:51 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-08-03 20:21:51 +0000
commit02ec05e6564d9bbb536c5c0f3cd3c1b5503e3aea (patch)
treeeb837b91f992ab7a7da4ec255528049c1e5895c5 /rts
parent9b266fba8f18f9f8a469bbe0b51b80a91217f1ab (diff)
downloadhaskell-02ec05e6564d9bbb536c5c0f3cd3c1b5503e3aea.tar.gz
remove the GUM closure types
Diffstat (limited to 'rts')
-rw-r--r--rts/ClosureFlags.c7
-rw-r--r--rts/LdvProfile.c5
-rw-r--r--rts/RetainerProfile.c15
3 files changed, 1 insertions, 26 deletions
diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c
index bbe0e8ffed..477a892594 100644
--- a/rts/ClosureFlags.c
+++ b/rts/ClosureFlags.c
@@ -76,11 +76,6 @@ StgWord16 closure_flags[] = {
[WEAK] = (_HNF| _NS| _UPT ),
[STABLE_NAME] = (_HNF| _NS| _UPT ),
[TSO] = (_HNF| _NS| _MUT|_UPT ),
- [BLOCKED_FETCH] = (_HNF| _NS| _MUT|_UPT ),
- [FETCH_ME] = (_HNF| _NS| _MUT|_UPT ),
- [FETCH_ME_BQ] = ( _NS| _MUT|_UPT ),
- [RBH] = ( _NS| _MUT|_UPT ),
- [REMOTE_REF] = (_HNF| _NS| _UPT ),
[TVAR_WATCH_QUEUE] = ( _NS| _MUT|_UPT ),
[INVARIANT_CHECK_QUEUE]= ( _NS| _MUT|_UPT ),
[ATOMIC_INVARIANT] = ( _NS| _MUT|_UPT ),
@@ -93,6 +88,6 @@ StgWord16 closure_flags[] = {
[WHITEHOLE] = ( 0 )
};
-#if N_CLOSURE_TYPES != 70
+#if N_CLOSURE_TYPES != 65
#error Closure types changed: update ClosureFlags.c!
#endif
diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c
index c97187a9a9..3a160de6ac 100644
--- a/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
@@ -179,11 +179,6 @@ processHeapClosureForDead( StgClosure *c )
case RET_SMALL:
case RET_BIG:
// others
- case BLOCKED_FETCH:
- case FETCH_ME:
- case FETCH_ME_BQ:
- case RBH:
- case REMOTE_REF:
case INVALID_OBJECT:
default:
barf("Invalid object in processHeapClosureForDead(): %d", info->type);
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index fa12637ef6..4441749200 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -620,11 +620,6 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
case RET_BIG:
// invalid objects
case IND:
- case BLOCKED_FETCH:
- case FETCH_ME:
- case FETCH_ME_BQ:
- case RBH:
- case REMOTE_REF:
case INVALID_OBJECT:
default:
barf("Invalid object *c in push()");
@@ -983,11 +978,6 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
case RET_BIG:
// invalid objects
case IND:
- case BLOCKED_FETCH:
- case FETCH_ME:
- case FETCH_ME_BQ:
- case RBH:
- case REMOTE_REF:
case INVALID_OBJECT:
default:
barf("Invalid object *c in pop()");
@@ -1145,11 +1135,6 @@ isRetainer( StgClosure *c )
case RET_BIG:
// other cases
case IND:
- case BLOCKED_FETCH:
- case FETCH_ME:
- case FETCH_ME_BQ:
- case RBH:
- case REMOTE_REF:
case INVALID_OBJECT:
default:
barf("Invalid object in isRetainer(): %d", get_itbl(c)->type);