[Git][ghc/ghc][wip/9.4.7-backports] 13 commits: Bump bytestring submodule to 0.11.5.1

Mon Aug 21 02:06:22 UTC 2023

Zubin pushed to branch wip/9.4.7-backports at Glasgow Haskell Compiler / GHC

Commits:
8487685c by Matthew Craven at 2023-08-05T14:45:34+05:30
Bump bytestring submodule to 0.11.5.1

(cherry picked from commit 43578d60bfc478e7277dcd892463cec305400025)

- - - - -
5f992947 by Zubin Duggal at 2023-08-05T14:46:19+05:30
Prepare release 9.4.6

- - - - -
a98ae4ec by Zubin Duggal at 2023-08-21T07:36:07+05:30
Bump bytestring submodule to 0.11.5.2 (#23789)

- - - - -
d57244ef by Zubin Duggal at 2023-08-21T07:36:07+05:30
Specialise: Cherry-pick fix for #21332 from

commit 4d2ee313f23a4454d12c9f94ff132f078dd64d31
Author: Sebastian Graf <sebastian.graf at kit.edu>
Date:   Thu Apr 7 17:21:08 2022 +0200

    Specialising through specialised method calls (#19644)

- - - - -
2726f5f9 by Simon Peyton Jones at 2023-08-21T07:36:07+05:30
Fix substitution in bindAuxiliaryDict

In GHC.Core.Opt.Specialise.bindAuxiliaryDict we were unnecessarily
calling `extendInScope` to bring into scope variables that were
/already/ in scope.  Worse, GHC.Core.Subst.extendInScope strangely
deleted the newly-in-scope variables from the substitution -- and that
was fatal in #21391.

I removed the redundant calls to extendInScope.

More ambitiously, I changed GHC.Core.Subst.extendInScope (and cousins)
to stop deleting variables from the substitution.  I even changed the
names of the function to extendSubstInScope (and cousins) and audited
all the calls to check that deleting from the substitution was wrong.
In fact there are very few such calls, and they are all about
introducing a fresh non-in-scope variable.  These are "OutIds"; it is
utterly wrong to mess with the "InId" substitution.

I have not added a Note, because I'm deleting wrong code, and it'd be
distracting to document a bug.

(cherry picked from commit 000b7d3d2f9211c3243d34a47ce93eb985d0cc88)

- - - - -
ca2cd38a by Simon Peyton Jones at 2023-08-21T07:36:07+05:30
Improve floated dicts in Specialise

Second fix to #21391.  It turned out that we missed calling
bringFloatedDictsIntoScope when specialising imports, which
led to the same bug as before.

I refactored to move that call to a single place, in specCalls,
so we can't forget it.

This meant making `FloatedDictBinds` into its own type, pairing
the dictionary bindings themselves with the set of their binders.
Nicer this way.

(cherry picked from commit 2c541f99f5a83cee873b76b3bd46e4d617f5bcd7)

- - - - -
15c1f32f by Simon Peyton Jones at 2023-08-21T07:36:07+05:30
Ensure floated dictionaries are in scope (again)

In the Specialiser, we missed one more call to
bringFloatedDictsIntoScope (see #21391).

This omission led to #21689. The problem is that the call
to `rewriteClassOps` needs to have in scope any dictionaries
floated out of the arguments we have just specialised.

Easy fix.

(cherry picked from commit 04209f2a6a49f6cdc116b5cb73ccd1749c90f88b)

- - - - -
067db92e by Simon Peyton Jones at 2023-08-21T07:36:07+05:30
Fix a scoping bug in the Specialiser

In the call to `specLookupRule` in `already_covered`, in `specCalls`,
we need an in-scope set that includes the free vars of the arguments.
But we simply were not guaranteeing that: did not include the
`rule_bndrs`.

Easily fixed.  I'm not sure how how this bug has lain for quite
so long without biting us.

Fixes #21828.

(cherry picked from commit 460505345e500eb902da9737c75c077d5fc5ef66)

- - - - -
39f728a6 by Jens Petersen at 2023-08-21T07:36:07+05:30
make hadrian buildable with Cabal-3.8

(cherry picked from commit 5042fb142daa7275e8bb16ff7575cd8de0e017d6)

- - - - -
d8b5ea0f by Matthew Pickering at 2023-08-21T07:36:07+05:30
Build vanilla alpine bindists

We currently attempt to build and distribute fully static alpine
bindists (ones which could be used on any linux platform) but most
people who use the alpine bindists want to use alpine to build their own
static applications (for which a fully static bindist is not necessary).
We should build and distribute these bindists for these users whilst the
fully-static bindist is still unusable.

Fixes #23349

(cherry picked from commit 29be39ba3f187279b19cf451f2d8f58822edab4f)

- - - - -
6d938a62 by Ben Gamari at 2023-08-21T07:36:07+05:30
users-guide: Support both distutils and packaging

As noted in #23818, some old distributions (e.g. Debian 9) only include
`distutils` while newer distributions only include `packaging`.

Fixes #23818.

(cherry picked from commit d814bda97994df01139c2a9bcde915dc86ef2927)

- - - - -
e6e11bb3 by Ben Gamari at 2023-08-21T07:36:07+05:30
users-guide: Ensure extlinks is compatible with Sphinx <4

The semantics of the `extlinks` attribute annoyingly changed in Sphinx
4. Reflect this in our configuration. See #22690.

Fixes #23807.

(cherry picked from commit 1726db3f39f1c41b92b1bdf45e9dc054b401e782)

- - - - -
00920f17 by Zubin Duggal at 2023-08-21T07:36:11+05:30
Prepare release 9.4.7

- - - - -

30 changed files:

- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml
- compiler/GHC/Core/Opt/SpecConstr.hs
- compiler/GHC/Core/Opt/Specialise.hs
- compiler/GHC/Core/Ppr.hs
- compiler/GHC/Core/Rules.hs
- compiler/GHC/Core/Subst.hs
- compiler/GHC/Plugins.hs
- compiler/GHC/Utils/Binary.hs
- configure.ac
- + docs/users_guide/9.4.6-notes.rst
- + docs/users_guide/9.4.7-notes.rst
- docs/users_guide/flags.py
- docs/users_guide/ghc_config.py.in
- docs/users_guide/release-notes.rst
- docs/users_guide/utils.py
- hadrian/hadrian.cabal
- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
- hadrian/src/Settings/Warnings.hs
- libraries/base/base.cabal
- libraries/base/changelog.md
- libraries/bytestring
- libraries/ghc-prim/changelog.md
- libraries/ghc-prim/ghc-prim.cabal
- testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
- testsuite/tests/backpack/should_compile/bkp16.stderr
- testsuite/tests/cabal/t18567/T18567.stderr
- testsuite/tests/dependent/should_compile/T14729.stderr
- testsuite/tests/dependent/should_compile/T15743.stderr
- testsuite/tests/dependent/should_compile/T15743e.stderr

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fcce2a20d544b516bc2184bdca4755bcd1904a83...00920f176b0235d5bb52a8e054d89a664f8938fe

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fcce2a20d544b516bc2184bdca4755bcd1904a83...00920f176b0235d5bb52a8e054d89a664f8938fe
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/20230820/687861bc/attachment-0001.html>