GitLab

Ben Gamari pushed to branch wip/T26053 at Glasgow Haskell Compiler / GHC

Commits:

18790528

by Ben Gamari at 2025-07-16T13:33:20-04:00

nonmoving: Use get_itbl instead of explicit loads

This is cleaner and also fixes unnecessary (and unsound) use of
`volatile`.

5cc0060c

by Ben Gamari at 2025-07-16T13:39:31-04:00

rts/Scav: Handle WHITEHOLEs in scavenge_one

`scavenge_one`, used to scavenge mutable list entries, may encounter
`WHITEHOLE`s when the non-moving GC is in use via two paths:

  1. when an MVAR is being marked concurrently
  2. when the object belongs to a chain of selectors being short-cutted.

Fixes #26204.

2 changed files:

rts/sm/NonMovingMark.c
rts/sm/Scav.c

Changes:

rts/sm/NonMovingMark.c

@@ -619,7 +619,7 @@ inline void updateRemembSetPushThunk(Capability *cap, StgThunk *thunk)
+ {
      const StgInfoTable *info;
      do {
 -        info = *(StgInfoTable* volatile*) &thunk->header.info;
 +        info = get_itbl((StgClosure*) thunk);
      } while (info == &stg_WHITEHOLE_info);
      const StgThunkInfoTable *thunk_info = THUNK_INFO_PTR_TO_STRUCT(info);
@@ -1343,7 +1343,7 @@ mark_closure (MarkQueue *queue, const StgClosure *p0, StgClosure **origin)
              goto done;
          case WHITEHOLE:
 -            while (*(StgInfoTable* volatile*) &p->header.info == &stg_WHITEHOLE_info)
 +            while (get_itbl(p) == &stg_WHITEHOLE_info)
  #if defined(PARALLEL_GC)
                  busy_wait_nop()
  #endif
@@ -1714,7 +1714,7 @@ mark_closure (MarkQueue *queue, const StgClosure *p0, StgClosure **origin)
          break;
      case WHITEHOLE:
 -        while (*(StgInfoTable* volatile*) &p->header.info == &stg_WHITEHOLE_info);
 +        while (get_itbl(p) == &stg_WHITEHOLE_info);
          goto try_again;
      case COMPACT_NFDATA:

rts/sm/Scav.c

@@ -1276,6 +1276,7 @@ scavenge_one(StgPtr p)
      bool no_luck;
      bool saved_eager_promotion;
 +try_again:
      saved_eager_promotion = gct->eager_promotion;
      ASSERT(LOOKS_LIKE_CLOSURE_PTR(p));
@@ -1617,6 +1618,13 @@ scavenge_one(StgPtr p)
          scavenge_continuation((StgContinuation *)p);
          break;
 +    case WHITEHOLE:
 +        // This may happen when the nonmoving GC is in use via two paths:
 +        //   1. when an MVAR is being marked concurrently
 +        //   2. when the object belongs to a chain of selectors being short-cutted.
 +        while (get_itbl((StgClosure*) p) == &stg_WHITEHOLE_info);
 +        goto try_again;
++
      default:
          barf("scavenge_one: strange object %d", (int)(info->type));
+     }