Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

• 99cb9c39
  by Luite Stegeman at 2026-05-28T03:10:49-04:00

  Fixes for black holes
  
   - suspend duplicate work for eager black holes
   - detect eager black holes in checkBlockingQueues
   - don't overwrite existing black holes even if they're not
       in an eager blackhole frame
   - don't deadlock on self when thunk is already blackholed
  
  Fixes #26936
  

• 80264eb1
  by Wolfgang Jeltsch at 2026-05-28T03:10:49-04:00

  Allow `downsweep` to use nodes of an existing module graph
  
  To this end, `downsweep` has not been able to use the nodes of a module
  graph obtained from a previous downsweeping round. In some GHC API
  applications, downsweeping is performed somewhat incrementally and
  therefore could profit from reusing such existing results. This
  contribution makes this possible.
  
  Resolves #27054.
  
  Co-authored-by: Matthew Pickering <matthewtpickering@gmail.com>
  

• bfea8114
  by Simon Jakobi at 2026-05-28T03:10:51-04:00

  compiler: use nubOrd from containers
  
  Address #27103 by replacing GHC.Utils.Misc.ordNub[On] with
  Data.Containers.ListUtils.nubOrd[On].
  
  Note that nubOrd suffers from a small inefficiency, a fix for which
  will be included in the next containers release:
  
    https://github.com/haskell/containers/issues/1202
  

• 179e22a9
  by Simon Jakobi at 2026-05-28T03:10:52-04:00

  Add regression test for T11226
  
  Closes #11226.
  

35 changed files:

• + changelog.d/fix-blackhole-handling
• + changelog.d/module-graph-reuse-in-downsweep
• compiler/GHC/CmmToAsm/BlockLayout.hs
• compiler/GHC/Driver/Backpack.hs
• compiler/GHC/Driver/Downsweep.hs
• compiler/GHC/Driver/Make.hs
• compiler/GHC/Driver/Session/Units.hs
• compiler/GHC/HsToCore/Usage.hs
• compiler/GHC/Linker/Unit.hs
• compiler/GHC/Rename/Pat.hs
• compiler/GHC/Unit/Info.hs
• compiler/GHC/Unit/State.hs
• compiler/GHC/Utils/Misc.hs
• ghc/GHCi/UI.hs
• rts/Messages.c
• rts/ThreadPaused.c
• rts/Threads.c
• rts/Updates.h
• rts/include/rts/storage/ClosureMacros.h
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/A.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/B.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/C.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/D.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/X.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/Y.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.modules/Z.hs
• + testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.stdout
• testsuite/tests/ghc-api/downsweep/OldModLocation.hs
• testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
• testsuite/tests/ghc-api/downsweep/all.T
• testsuite/tests/ghc-api/fixed-nodes/InterfaceModuleGraph.hs
• + testsuite/tests/perf/should_run/T11226.hs
• + testsuite/tests/perf/should_run/T11226.stdout
• testsuite/tests/perf/should_run/all.T

The diff was not included because it is too large.