Duncan Coutts pushed to branch wip/dcoutts/printf-warnings at Glasgow Haskell Compiler / GHC Commits: 2cb7c0a9 by Duncan Coutts at 2026-09-03T11:51:35+01:00 FIXUP: _yet more_ format fixes, found in CI - - - - - 3 changed files: - rts/Schedule.c - rts/Sparks.c - rts/posix/Poll.c Changes: ===================================== rts/Schedule.c ===================================== @@ -1157,8 +1157,9 @@ scheduleHandleHeapOverflow( Capability *cap, StgTSO *t ) #if defined(DEBUG) debugTrace(DEBUG_sched, - "--<< thread %ld (%s) stopped: requesting a large block (size %ld)\n", - (long)t->id, what_next_strs[t->what_next], blocks); + "--<< thread %" FMT_StgThreadID " (%s) stopped: " + "requesting a large block (size %" FMT_Word ")\n", + t->id, what_next_strs[t->what_next], blocks); #endif // don't do this if the nursery is (nearly) full, we'll GC first. ===================================== rts/Sparks.c ===================================== @@ -140,7 +140,8 @@ pruneSparkQueue (bool nonmovingMarkFinished, Capability *cap) pool->top &= pool->moduloSize; debugTrace(DEBUG_sparks, - "markSparkQueue: current spark queue len=%ld; (hd=%ld; tl=%ld)", + "markSparkQueue: current spark queue len=%ld; " + "(hd=%" FMT_Int "; tl=%" FMT_Int ")", sparkPoolSize(pool), pool->bottom, pool->top); ASSERT_WSDEQUE_INVARIANTS(pool); @@ -288,7 +289,7 @@ pruneSparkQueue (bool nonmovingMarkFinished, Capability *cap) debugTrace(DEBUG_sparks, "pruned %d sparks", pruned_sparks); debugTrace(DEBUG_sparks, - "new spark queue len=%ld; (hd=%ld; tl=%ld)", + "new spark queue len=%ld; (hd=%" FMT_Int "; tl=%" FMT_Int ")", sparkPoolSize(pool), pool->bottom, pool->top); ASSERT_WSDEQUE_INVARIANTS(pool); @@ -322,7 +323,8 @@ traverseSparkQueue (evac_fn evac, void *user, Capability *cap) } debugTrace(DEBUG_sparks, - "traversed spark queue, len=%ld; (hd=%ld; tl=%ld)", + "traversed spark queue, len=%ld; " + "(hd=%" FMT_Int "; tl=%" FMT_Int ")", sparkPoolSize(pool), pool->bottom, pool->top); } ===================================== rts/posix/Poll.c ===================================== @@ -512,10 +512,11 @@ bool awaitCompletedTimeoutsOrIOPoll(CapIOManager *iomgr) int res = ppoll(poll_table, nfds, timeout_ns, NULL); debugTrace(DEBUG_iomanager, - "ppoll(nfds = %lu, timeout.sec = %lu, timeout.nsec = %lu) = %d", + "ppoll(nfds = %lu, timeout.sec = %lld, timeout.nsec = %lld)" + " = %d", (unsigned long) nfds, - timeout_ns == NULL ? -1 : timeout_ns->tv_sec, - timeout_ns == NULL ? 0 : timeout_ns->tv_nsec, + (long long) timeout_ns == NULL ? -1 : timeout_ns->tv_sec, + (long long) timeout_ns == NULL ? 0 : timeout_ns->tv_nsec, res); #else int res = poll(poll_table, nfds, timeout_ms); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2cb7c0a9f718ad3518cb9ca58a5a45b7... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2cb7c0a9f718ad3518cb9ca58a5a45b7... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help