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

Commits:

• 631fa5ae
  by Recursion Ninja at 2026-01-31T22:30:11+00:00

  Decouple `L.S.H.Decls` from importing `GHC.Types.Basic`
  
  Data-types within `GHC.Types.Basic` which describe components of
  the AST are migrated to `Language.Haskell.Syntax.Basic`. Related
  function definitions are also moved.
  
  Types moved to L.H.S. because they are part of the AST:
    * TopLevelFlag
    * RuleName
  
  Types moved from L.H.S. to GHC.Hs. because they are not needed in the AST:
    * TyConFlavour
    * TypeOrData
    * NewOrData
  
  Migrated instances:
    * `Outputable` instances moved to in `GHC.Utils.Outputable`
    * `Binary` instance of `Boxity` moved to to `GHC.Utils.Binary`
    * Other `Binary` instances are orphans to be migrated later.
  
  The `OverlapMode` data-type is given a TTG extension point.
  The `OverlapFlag` data-type, which depends on `OverlapMode`,
  is updated to support `OverlapMode` with a GHC "pass" type paramerter.
  In order to avoid module import cycles, `OverlapMode` and `OverlapFlag`
  are migrated to new modules (no way around this).
  
    * Migrated `OverlapMode` to new module `Language.Haskell.Syntax.Overlap`
    * Migrated `OverlapFlag` to new module `GHC.Hs.Decls.Overlap`
  

• 892896d7
  by Simon Hengel at 2026-02-01T00:19:46-05:00

  Update the documentation for MultiWayIf (fixes #25376)
  
  (so that it matches the implementation)
  

• da4121c1
  by Peter Trommler at 2026-02-01T00:19:46-05:00

  hadrian: Fix dependency generation for assembler
  
  Assembler files allow # for comments unless in column 1. A modern
  cpp for C treats those a preprocessor directives. We tell gcc that
  a .S file is assembler with cpp and not C.
  
  Fixes #26819
  

44 changed files:

• compiler/GHC/Core/InstEnv.hs
• compiler/GHC/Hs/Decls.hs
• + compiler/GHC/Hs/Decls/Overlap.hs
• compiler/GHC/Hs/Instances.hs
• compiler/GHC/Hs/Utils.hs
• compiler/GHC/HsToCore/Errors/Types.hs
• compiler/GHC/HsToCore/Quote.hs
• compiler/GHC/Iface/Ext/Ast.hs
• compiler/GHC/Iface/Syntax.hs
• compiler/GHC/Parser.y
• compiler/GHC/Rename/Env.hs
• compiler/GHC/Rename/Module.hs
• compiler/GHC/Rename/Names.hs
• compiler/GHC/Rename/Splice.hs
• compiler/GHC/Tc/Deriv.hs
• compiler/GHC/Tc/Deriv/Utils.hs
• compiler/GHC/Tc/Errors/Ppr.hs
• compiler/GHC/Tc/Gen/Head.hs
• compiler/GHC/Tc/Utils/Env.hs
• compiler/GHC/Tc/Utils/Instantiate.hs
• compiler/GHC/Tc/Utils/Monad.hs
• compiler/GHC/ThToHs.hs
• compiler/GHC/Types/Basic.hs
• compiler/GHC/Types/Name.hs
• compiler/GHC/Unit/Types.hs
• compiler/GHC/Utils/Binary.hs
• compiler/GHC/Utils/Outputable.hs
• compiler/Language/Haskell/Syntax/Basic.hs
• compiler/Language/Haskell/Syntax/Decls.hs
• + compiler/Language/Haskell/Syntax/Decls/Overlap.hs
• compiler/Language/Haskell/Syntax/Extension.hs
• compiler/ghc.cabal.in
• docs/users_guide/exts/multiway_if.rst
• hadrian/src/Builder.hs
• hadrian/src/Rules/Compile.hs
• hadrian/src/Settings/Builders/Cc.hs
• hadrian/src/Settings/Packages.hs
• testsuite/tests/count-deps/CountDepsAst.stdout
• testsuite/tests/count-deps/CountDepsParser.stdout
• utils/check-exact/ExactPrint.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs
• utils/haddock/haddock-api/src/Haddock/Convert.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
• utils/haddock/haddock-api/src/Haddock/Types.hs

The diff was not included because it is too large.