Commit 02ec05e6 authored by Simon Marlow's avatar Simon Marlow

remove the GUM closure types

parent 9b266fba
......@@ -76,21 +76,16 @@
#define WEAK 52
#define STABLE_NAME 53
#define TSO 54
#define BLOCKED_FETCH 55
#define FETCH_ME 56
#define FETCH_ME_BQ 57
#define RBH 58
#define REMOTE_REF 59
#define TVAR_WATCH_QUEUE 60
#define INVARIANT_CHECK_QUEUE 61
#define ATOMIC_INVARIANT 62
#define TVAR 63
#define TREC_CHUNK 64
#define TREC_HEADER 65
#define ATOMICALLY_FRAME 66
#define CATCH_RETRY_FRAME 67
#define CATCH_STM_FRAME 68
#define WHITEHOLE 69
#define N_CLOSURE_TYPES 70
#define TVAR_WATCH_QUEUE 55
#define INVARIANT_CHECK_QUEUE 56
#define ATOMIC_INVARIANT 57
#define TVAR 58
#define TREC_CHUNK 59
#define TREC_HEADER 60
#define ATOMICALLY_FRAME 61
#define CATCH_RETRY_FRAME 62
#define CATCH_STM_FRAME 63
#define WHITEHOLE 64
#define N_CLOSURE_TYPES 65
#endif /* RTS_STORAGE_CLOSURETYPES_H */
......@@ -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
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment