[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: compiler: Fix CPP guards around ghc_unique_counter64

[Marge Bot (@marge-bot)]

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


Commits:
5415f266 by Ben Gamari at 2025-01-21T00:29:06-05:00
compiler: Fix CPP guards around ghc_unique_counter64

The `ghc_unique_counter64` symbol was introduced in the RTS in the
64-bit unique refactor (!10568) which has been backported to %9.6.7 and
%9.8.4. Update the CPP to reflect this.

Fixes #25576.

- - - - -
ae64a859 by Ryan Scott at 2025-01-21T00:29:06-05:00
Fix :info pretty-printing of UNPACKed fields

This patch:

* Ensures that we do not pretty-print a field like `foo :: {-# UNPACK #-} !Int`
  as `foo :: ! {-# UNPACK -#} Int` (as we were doing before) when running the
  `:info` command.
* Prevents coercions that arise from `UNPACK`ed fields (e.g., such as when one
  unpacks a newtype) from being printed in `:info` output unless `-dppr-debug`
  is enabled.

Fixes #25651.

- - - - -


7 changed files:

- compiler/GHC/Iface/Syntax.hs
- compiler/cbits/genSym.c
- testsuite/tests/backpack/should_fail/T19244a.stderr
- testsuite/tests/ghci/scripts/T9881.stdout
- 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


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1f4187b56be79e3327e1c4562f66c8556b66ff9b...ae64a859a6a70b2b5e72d98ef601be5ff0f3d0d7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1f4187b56be79e3327e1c4562f66c8556b66ff9b...ae64a859a6a70b2b5e72d98ef601be5ff0f3d0d7
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/20250121/98cff9b7/attachment.html>