Andreas Klebinger pushed to branch wip/andreask/9.10.4-batch1 at Glasgow Haskell Compiler / GHC
Commits:
-
7c378328
by Phil Hazelden at 2026-10-23T10:51:05+02:00
-
146fc9b7
by Sven Tennie at 2026-10-23T11:25:24+02:00
3 changed files:
- libraries/ghc-heap/tests/stack_misc_closures_c.c
- rts/include/rts/PosixSource.h
- testsuite/tests/rts/pause-resume/list_threads_and_misc_roots_c.c
Changes:
| ... | ... | @@ -193,7 +193,7 @@ void create_any_bco_frame(Capability *cap, StgStack *stack, StgWord w) { |
| 193 | 193 | StgWord bcoSizeWords =
|
| 194 | 194 | sizeofW(StgBCO) + sizeofW(StgLargeBitmap) + sizeofW(StgWord);
|
| 195 | 195 | StgBCO *bco = (StgBCO *)allocate(cap, bcoSizeWords);
|
| 196 | - SET_HDR(bco, &stg_BCO_info, CCS_MAIN);
|
|
| 196 | + SET_HDR(bco, (StgInfoTable*) &stg_BCO_info, CCS_MAIN);
|
|
| 197 | 197 | c->payload[0] = (StgClosure *)bco;
|
| 198 | 198 | |
| 199 | 199 | bco->size = bcoSizeWords;
|
| ... | ... | @@ -29,6 +29,8 @@ |
| 29 | 29 | Oracle's Solaris 11 supports only up to XPG6, hence the ifdef.
|
| 30 | 30 | */
|
| 31 | 31 | |
| 32 | +#undef _POSIX_C_SOURCE
|
|
| 33 | +#undef _XOPEN_SOURCE
|
|
| 32 | 34 | #if defined(solaris2_HOST_OS)
|
| 33 | 35 | #define _POSIX_C_SOURCE 200112L
|
| 34 | 36 | #define _XOPEN_SOURCE 600
|
| ... | ... | @@ -27,10 +27,10 @@ void checkGcRoots(void) |
| 27 | 27 | rts_listThreads(&collectTSOsCallback, NULL);
|
| 28 | 28 | for (int i = 0; i < tsoCount; i++)
|
| 29 | 29 | {
|
| 30 | - StgTSO *tso = UNTAG_CLOSURE(tsos[i]);
|
|
| 30 | + StgClosure *tso = UNTAG_CLOSURE((StgClosure*) tsos[i]);
|
|
| 31 | 31 | if (get_itbl(tso)->type != TSO)
|
| 32 | 32 | {
|
| 33 | - fprintf(stderr, "tso returned a non-TSO type %zu at index %i\n",
|
|
| 33 | + fprintf(stderr, "tso returned a non-TSO type %u at index %i\n",
|
|
| 34 | 34 | tso->header.info->type,
|
| 35 | 35 | i);
|
| 36 | 36 | exit(1);
|
| ... | ... | @@ -44,7 +44,7 @@ void checkGcRoots(void) |
| 44 | 44 | StgClosure *root = UNTAG_CLOSURE(miscRoots[i]);
|
| 45 | 45 | if (get_itbl(root)->type == TSO)
|
| 46 | 46 | {
|
| 47 | - fprintf(stderr, "rts_listThreads unexpectedly returned an TSO type at index %i (TSO=%zu)\n", i, TSO);
|
|
| 47 | + fprintf(stderr, "rts_listThreads unexpectedly returned an TSO type at index %i (TSO=%d)\n", i, TSO);
|
|
| 48 | 48 | exit(1);
|
| 49 | 49 | }
|
| 50 | 50 | }
|