diff options
Diffstat (limited to 'rts/sm')
| -rw-r--r-- | rts/sm/CNF.c | 16 | ||||
| -rw-r--r-- | rts/sm/MarkWeak.c | 2 | ||||
| -rw-r--r-- | rts/sm/Sanity.c | 2 | ||||
| -rw-r--r-- | rts/sm/Scav.c | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/rts/sm/CNF.c b/rts/sm/CNF.c index 6bc58cde75..8d0ebccaf3 100644 --- a/rts/sm/CNF.c +++ b/rts/sm/CNF.c @@ -212,7 +212,7 @@ compactAllocateBlockInternal(Capability *cap, case ALLOCATE_IMPORT_NEW: dbl_link_onto(block, &g0->compact_blocks_in_import); - /* fallthrough */ + FALLTHROUGH; case ALLOCATE_IMPORT_APPEND: ASSERT(first == NULL); ASSERT(g == g0); @@ -689,17 +689,17 @@ verify_consistency_block (StgCompactNFData *str, StgCompactNFDataBlock *block) switch (info->type) { case CONSTR_1_0: check_object_in_compact(str, UNTAG_CLOSURE(q->payload[0])); - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_1: p += sizeofW(StgClosure) + 1; break; case CONSTR_2_0: check_object_in_compact(str, UNTAG_CLOSURE(q->payload[1])); - /* fallthrough */ + FALLTHROUGH; case CONSTR_1_1: check_object_in_compact(str, UNTAG_CLOSURE(q->payload[0])); - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_2: p += sizeofW(StgClosure) + 2; break; @@ -931,7 +931,7 @@ fixup_block(StgCompactNFDataBlock *block, StgWord *fixup_table, uint32_t count) if (!fixup_one_pointer(fixup_table, count, &((StgClosure*)p)->payload[0])) return false; - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_1: p += sizeofW(StgClosure) + 1; break; @@ -940,12 +940,12 @@ fixup_block(StgCompactNFDataBlock *block, StgWord *fixup_table, uint32_t count) if (!fixup_one_pointer(fixup_table, count, &((StgClosure*)p)->payload[1])) return false; - /* fallthrough */ + FALLTHROUGH; case CONSTR_1_1: if (!fixup_one_pointer(fixup_table, count, &((StgClosure*)p)->payload[0])) return false; - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_2: p += sizeofW(StgClosure) + 2; break; @@ -999,7 +999,7 @@ fixup_block(StgCompactNFDataBlock *block, StgWord *fixup_table, uint32_t count) break; } - // fall through + FALLTHROUGH; default: debugBelch("Invalid non-NFData closure (type %d) in Compact\n", diff --git a/rts/sm/MarkWeak.c b/rts/sm/MarkWeak.c index 88037f6a34..d7b8fe696f 100644 --- a/rts/sm/MarkWeak.c +++ b/rts/sm/MarkWeak.c @@ -155,7 +155,7 @@ traverseWeakPtrList(void) // otherwise, fall through... } - /* fallthrough */ + FALLTHROUGH; case WeakPtrs: { diff --git a/rts/sm/Sanity.c b/rts/sm/Sanity.c index c6861f4134..1da3e4416f 100644 --- a/rts/sm/Sanity.c +++ b/rts/sm/Sanity.c @@ -102,7 +102,7 @@ checkStackFrame( StgPtr c ) case UPDATE_FRAME: ASSERT(LOOKS_LIKE_CLOSURE_PTR(((StgUpdateFrame*)c)->updatee)); - /* fallthrough */ + FALLTHROUGH; case ATOMICALLY_FRAME: case CATCH_RETRY_FRAME: case CATCH_STM_FRAME: diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c index 2f61914e55..8bc702900b 100644 --- a/rts/sm/Scav.c +++ b/rts/sm/Scav.c @@ -498,7 +498,7 @@ scavenge_block (bdescr *bd) case FUN_1_0: scavenge_fun_srt(info); - /* fallthrough */ + FALLTHROUGH; case CONSTR_1_0: evacuate(&((StgClosure *)p)->payload[0]); p += sizeofW(StgHeader) + 1; @@ -511,7 +511,7 @@ scavenge_block (bdescr *bd) case FUN_0_1: scavenge_fun_srt(info); - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_1: p += sizeofW(StgHeader) + 1; break; @@ -523,7 +523,7 @@ scavenge_block (bdescr *bd) case FUN_0_2: scavenge_fun_srt(info); - /* fallthrough */ + FALLTHROUGH; case CONSTR_0_2: p += sizeofW(StgHeader) + 2; break; @@ -536,7 +536,7 @@ scavenge_block (bdescr *bd) case FUN_1_1: scavenge_fun_srt(info); - /* fallthrough */ + FALLTHROUGH; case CONSTR_1_1: evacuate(&((StgClosure *)p)->payload[0]); p += sizeofW(StgHeader) + 2; @@ -1738,7 +1738,7 @@ scavenge_static(void) case FUN_STATIC: scavenge_fun_srt(info); - /* fallthrough */ + FALLTHROUGH; // a FUN_STATIC can also be an SRT, so it may have pointer // fields. See Note [SRTs] in CmmBuildInfoTables, specifically |