[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Fix the platform string for GNU/Hurd

[Marge Bot (@marge-bot)]

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


Commits:
2fd78f9f by Samuel Thibault at 2023-11-22T11:49:13-05:00
Fix the platform string for GNU/Hurd

As commited in Cargo
https://github.com/haskell/cabal/pull/9434
there is confusion between "gnu" and "hurd". This got fixed in Cargo, we
need the converse in Hadrian.

Fixes #24180

- - - - -
a79960fe by Alan Zimmerman at 2023-11-22T11:49:48-05:00
EPA: Tuple Present no longer has annotation

The Present constructor for a Tuple argument will never have an exact
print annotation. So make this impossible.

- - - - -
91150a3a by David Binder at 2023-11-22T17:52:22-05:00
Unify the hpc testsuites

The hpc testsuite was split between testsuite/tests/hpc
and the submodule libraries/hpc/test. This commit unifies
the two testsuites in the GHC repository in the directory
testsuite/tests/hpc.

- - - - -
d4e26b60 by Alan Zimmerman at 2023-11-22T17:52:23-05:00
EPA: empty tup_tail has noAnn

In Parser.y, the tup_tail rule had the following option
          | {- empty -} %shift   { return [Left noAnn] }

Once this works through PostProcess.hs, it means we add an extra
Missing constructor if the last item was a comma.

Change the annotation type to a Bool to indicate this, and use the
EpAnn Anchor for the print location for the others.

- - - - -


30 changed files:

- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Parser/Types.hs
- compiler/GHC/Tc/TyCl/PatSyn.hs
- compiler/GHC/ThToHs.hs
- hadrian/src/Hadrian/Haskell/Cabal.hs
- libraries/hpc
- + testsuite/tests/hpc/.gitignore
- + testsuite/tests/hpc/fork/Makefile
- + testsuite/tests/hpc/fork/hpc_fork.hs
- + testsuite/tests/hpc/fork/hpc_fork.stdout
- + testsuite/tests/hpc/fork/test.T
- + testsuite/tests/hpc/function/Makefile
- + testsuite/tests/hpc/function/test.T
- + testsuite/tests/hpc/function/tough.hs
- + testsuite/tests/hpc/function/tough.stdout
- + testsuite/tests/hpc/function2/Makefile
- + testsuite/tests/hpc/function2/subdir/tough2.lhs
- + testsuite/tests/hpc/function2/test.T
- + testsuite/tests/hpc/function2/tough2.stdout
- + testsuite/tests/hpc/ghc_ghci/A.hs
- + testsuite/tests/hpc/ghc_ghci/B.hs
- + testsuite/tests/hpc/ghc_ghci/Makefile
- + testsuite/tests/hpc/ghc_ghci/hpc_ghc_ghci.stdout
- + testsuite/tests/hpc/ghc_ghci/test.T
- + testsuite/tests/hpc/hpc.ovr
- + testsuite/tests/hpc/hpcrun.pl


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ff21810cf3e509587cbdb78718e44eaee285b854...d4e26b605af4f74e7e3980e20139430c20083c99

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ff21810cf3e509587cbdb78718e44eaee285b854...d4e26b605af4f74e7e3980e20139430c20083c99
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231122/5a5782ea/attachment.html>