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

Commits:

• 8b2c72c0
  by L0neGamer at 2025-09-04T06:32:03-04:00

  Add Control.Monad.thenM and Control.Applicative.thenA
  

• 39e1b7cb
  by Teo Camarasu at 2025-09-04T06:32:46-04:00

  ghc-internal: invert dependency of GHC.Internal.TH.Syntax on Data.Data
  
  This means that Data.Data no longer blocks building TH.Syntax, which
  allows greater parallelism in our builds.
  
  We move the Data.Data.Data instances to Data.Data. Quasi depends on
  Data.Data for one of its methods, so,
  we split the Quasi/Q, etc definition out of GHC.Internal.TH.Syntax
  into its own module. This has the added benefit of splitting up this
  quite large module.
  
  Previously TH.Syntax was a bottleneck when compiling ghc-internal. Now
  it is less of a bottle-neck and is also slightly quicker to
  compile (since it no longer contains these instances) at the cost of
  making Data.Data slightly more expensive to compile.
  TH.Lift which depends on TH.Syntax can also compile quicker and no
  longer blocks ghc-internal finishing to compile.
  
  Resolves #26217
  
  -------------------------
  Metric Decrease:
      MultiLayerModulesTH_OneShot
      T13253
      T21839c
      T24471
  Metric Increase:
      T12227
  -------------------------
  

• bdf82fd2
  by Teo Camarasu at 2025-09-04T06:32:46-04:00

  compiler: delete unused names in Builtins.Names.TH
  
  returnQ and bindQ are no longer used in the compiler.
  There was also a very old comment that referred to them that I have modernized
  

• 12952b49
  by Ben Gamari at 2025-09-04T11:11:02-04:00

  hadrian: Pass lib & include directories to ghc `Setup configure`
  

• 65b20357
  by Ben Gamari at 2025-09-04T11:11:03-04:00

  rts/IPE: Fix compilation when zstd is enabled
  
  This was broken by the refactoring undertaken in
  c80dd91c0bf6ac034f0c592f16c548b9408a8481.
  
  Closes #26312.
  

• 0f35d855
  by sheaf at 2025-09-04T11:11:15-04:00

  Make mkCast assertion a bit clearer
  
  This commit changes the assertion message that gets printed when one
  calls mkCast with a coercion whose kind does not match the type of the
  inner expression. I always found the assertion message a bit confusing,
  as it didn't clearly state what exactly was the error.
  

• e07a72f7
  by sheaf at 2025-09-04T11:11:15-04:00

  Simplifier/rules: fix mistakes in Notes & comments
  

49 changed files:

• compiler/GHC/Builtin/Names/TH.hs
• compiler/GHC/Core/Opt/Simplify.hs
• compiler/GHC/Core/Opt/SpecConstr.hs
• compiler/GHC/Core/Rules.hs
• compiler/GHC/Core/Utils.hs
• compiler/GHC/Data/IOEnv.hs
• compiler/GHC/Hs/Expr.hs
• compiler/GHC/HsToCore/Quote.hs
• compiler/GHC/Rename/Splice.hs
• compiler/GHC/Tc/Gen/Splice.hs
• compiler/GHC/Tc/Gen/Splice.hs-boot
• compiler/GHC/Tc/Types/TH.hs
• hadrian/src/Settings/Packages.hs
• libraries/base/changelog.md
• libraries/base/src/Control/Applicative.hs
• libraries/base/src/Control/Monad.hs
• libraries/base/src/Data/Array/Byte.hs
• libraries/base/src/Data/Fixed.hs
• + libraries/ghc-boot-th/GHC/Boot/TH/Monad.hs
• libraries/ghc-boot-th/ghc-boot-th.cabal.in
• libraries/ghc-internal/ghc-internal.cabal.in
• libraries/ghc-internal/src/GHC/Internal/Base.hs
• libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs
• libraries/ghc-internal/src/GHC/Internal/Data/Data.hs
• libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs
• libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs
• + libraries/ghc-internal/src/GHC/Internal/TH/Monad.hs
• libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs
• libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs
• libraries/ghci/GHCi/Message.hs
• libraries/ghci/GHCi/TH.hs
• libraries/template-haskell/Language/Haskell/TH/Quote.hs
• libraries/template-haskell/Language/Haskell/TH/Syntax.hs
• rts/IPE.c
• testsuite/tests/deriving/should_compile/T14682.stderr
• testsuite/tests/deriving/should_compile/drv-empty-data.stderr
• testsuite/tests/interface-stability/base-exports.stdout
• testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
• testsuite/tests/interface-stability/base-exports.stdout-mingw32
• testsuite/tests/interface-stability/base-exports.stdout-ws-32
• testsuite/tests/interface-stability/template-haskell-exports.stdout
• testsuite/tests/plugins/plugins10.stdout
• testsuite/tests/profiling/should_run/callstack001.stdout
• testsuite/tests/splice-imports/SI29.stderr
• testsuite/tests/th/T11452.stderr
• testsuite/tests/th/T15321.stderr
• testsuite/tests/th/T7276.stderr
• testsuite/tests/th/TH_NestedSplicesFail3.stderr
• testsuite/tests/th/TH_NestedSplicesFail4.stderr

The diff was not included because it is too large.