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

Commits:

• 1194cb33
  by sheaf at 2026-07-02T06:11:10-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
  

• 3c602ab2
  by Alan Zimmerman at 2026-07-02T06:11:11-04:00

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

33 changed files:

• compiler/GHC/Hs/Dump.hs
• compiler/GHC/Hs/Expr.hs
• compiler/GHC/Hs/Utils.hs
• compiler/GHC/Iface/Ext/Ast.hs
• compiler/GHC/Parser.y
• compiler/GHC/Parser/Annotation.hs
• compiler/GHC/Parser/PostProcess.hs
• compiler/GHC/Parser/Types.hs
• compiler/GHC/Rename/Bind.hs
• compiler/GHC/Rename/Utils.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/TyCl/PatSyn.hs
• compiler/GHC/ThToHs.hs
• testsuite/driver/testlib.py
• testsuite/tests/ghc-api/exactprint/T22919.stderr
• testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.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/all.T
• testsuite/tests/printer/Test20297.stdout
• testsuite/tests/printer/Test24533.stdout
• utils/check-exact/ExactPrint.hs

The diff was not included because it is too large.