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

Commits:

• c6d53c16
  by sheaf at 2026-07-02T21:35:44-04:00

  Test driver: normalise line numbers into libraries
  
  When comparing the stdout of tests that print out callstacks, we can't
  rely on the stability of exact line:column spans pointing into libraries
  (e.g. ghc-internal), as any change (such as adding a comment) can change
  them.
  
  This commit addresses this by normalising away line:column in callstacks,
  but only when those point into internal libraries. We don't do this in
  general, as the exact span might be important to the test (e.g. for a
  span within the test module itself).
  
  Fixes #27387
  

• 81ee62e0
  by Alan Zimmerman at 2026-07-02T21:36:33-04:00

  EPA: Remove LocatedLW from MatchGroup
  
  This is the last usage of LocatedLW / SrcSpanAnnLW
  

• e83bfacf
  by Recursion Ninja at 2026-07-02T22:11:03-04:00

  Decoupling 'L.H.S' from 'GHC.Hs.Doc'
  
    * Migrated 'GHC.Hs.Doc' and 'GHC.Hs.DocString' AST defintions from 'GHC.*' namespace,
      to new 'Language.Haskell.Syntax.Doc' module in the 'L.H.S' "namespace."
    * Updated 'HsDocString to be TTG-parameterised as 'HsDocString pass'.
    * Added 'GHC.Hs.Extension.Pass': splits 'GhcPass'/'Pass' and all 'HsDocString'
      TTG instances out of 'GHC.Hs.Extension', which re-exports it unchanged
      (this is backwards compatible and prevents the introduction of a boot file).
    * Deleted 'GHC.Hs.Doc.hs-boot'; removed all 'L.H.S.*' imports of 'GHC.Hs.Doc'.
    * Updated 'GHC.Hs.DocString' to be TTG pass-parameterised throughout; moved
      'mkHsDocStringChunk'/'unpackHDSC' here (require 'GHC.Utils.Encoding').
    * Split 'GHC.Rename.Doc.rnHsDoc' from 'rnHsDocIdentifiersOnly'.
    * Updated parser, renamer, typechecker, HIE, and exact-print for new types.
    * Added 'HsDocString' TTG instances for 'DocNameI' to 'Haddock.Types'.
    * Killed the last module loop between GHC.* and LHS.*.
          - Only edges from LHS.* to GHC.Data.FastString now!
  
  Resolves #26971
  

• bfbc9047
  by mangoiv at 2026-07-02T22:11:04-04:00

  ci: retry fetching test metrics
  
  Retry fetching test metrics to make the CI not fail if the services is
  temporarily unavailable
  

• adc9fa86
  by sheaf at 2026-07-02T22:11:05-04:00

  Remove outdated comment in GHC.Data.ShortText
  
  There was a long comment in GHC.Data.ShortText about a workaround that
  was necessary when bootstrapping with GHC 9.2 and below. The actual
  logic has since been dropped, but the comment remained. This commit
  removes the vestigial comment.
  

78 changed files:

• .gitlab/test-metrics.sh
• compiler/GHC/Builtin/Utils.hs
• compiler/GHC/Hs.hs
• compiler/GHC/Hs/Doc.hs
• − compiler/GHC/Hs/Doc.hs-boot
• compiler/GHC/Hs/DocString.hs
• compiler/GHC/Hs/Dump.hs
• compiler/GHC/Hs/Expr.hs
• compiler/GHC/Hs/Extension.hs
• + compiler/GHC/Hs/Extension/Pass.hs
• compiler/GHC/Hs/ImpExp.hs
• compiler/GHC/Hs/Utils.hs
• compiler/GHC/HsToCore/Docs.hs
• compiler/GHC/Iface/Ext/Ast.hs
• compiler/GHC/Iface/Syntax.hs
• compiler/GHC/Parser.y
• compiler/GHC/Parser/Annotation.hs
• compiler/GHC/Parser/HaddockLex.x
• compiler/GHC/Parser/Lexer.x
• compiler/GHC/Parser/PostProcess.hs
• compiler/GHC/Parser/PostProcess/Haddock.hs
• compiler/GHC/Parser/Types.hs
• compiler/GHC/Rename/Bind.hs
• compiler/GHC/Rename/Doc.hs
• compiler/GHC/Rename/Module.hs
• compiler/GHC/Rename/Utils.hs
• compiler/GHC/Tc/Errors/Hole.hs
• compiler/GHC/Tc/Errors/Hole/FitTypes.hs
• compiler/GHC/Tc/Gen/Arrow.hs
• compiler/GHC/Tc/Gen/Do.hs
• compiler/GHC/Tc/Gen/Expr.hs
• compiler/GHC/Tc/Gen/Match.hs
• compiler/GHC/Tc/Gen/Splice.hs
• compiler/GHC/Tc/Module.hs
• compiler/GHC/Tc/TyCl/PatSyn.hs
• compiler/GHC/ThToHs.hs
• compiler/GHC/Types/Basic.hs
• compiler/Language/Haskell/Syntax.hs
• compiler/Language/Haskell/Syntax/Decls.hs
• + compiler/Language/Haskell/Syntax/Doc.hs
• compiler/Language/Haskell/Syntax/Expr.hs-boot
• compiler/Language/Haskell/Syntax/Extension.hs
• compiler/Language/Haskell/Syntax/ImpExp.hs
• compiler/Language/Haskell/Syntax/Type.hs
• − compiler/Language/Haskell/Syntax/Type.hs-boot
• compiler/ghc.cabal.in
• libraries/ghc-boot/GHC/Data/ShortText.hs
• testsuite/driver/testlib.py
• testsuite/tests/count-deps/CountDepsAst.stdout
• testsuite/tests/count-deps/CountDepsParser.stdout
• testsuite/tests/ghc-api/exactprint/T22919.stderr
• testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
• testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
• testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr
• testsuite/tests/module/mod185.stderr
• testsuite/tests/parser/should_compile/DumpParsedAst.stderr
• testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
• testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
• testsuite/tests/parser/should_compile/DumpSemis.stderr
• testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
• testsuite/tests/parser/should_compile/KindSigs.stderr
• testsuite/tests/parser/should_compile/T15279.stderr
• testsuite/tests/parser/should_compile/T20718.stderr
• testsuite/tests/parser/should_compile/T20846.stderr
• testsuite/tests/parser/should_compile/T23315/T23315.stderr
• testsuite/tests/parser/should_compile/all.T
• testsuite/tests/printer/Test20297.stdout
• testsuite/tests/printer/Test24533.stdout
• testsuite/tests/showIface/DocsInHiFile1.stdout
• testsuite/tests/showIface/HaddockSpanIssueT24378.stdout
• testsuite/tests/showIface/MagicHashInHaddocks.stdout
• testsuite/tests/showIface/NoExportList.stdout
• utils/check-exact/ExactPrint.hs
• utils/check-exact/Utils.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Create.hs
• utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.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.