Andrei Borzenkov authored 11 months ago and Ben Gamari committed 10 months ago

Move tuple renaming short cutter from `isBuiltInOcc_maybe` to `isPunOcc_maybe`, so we consider incoming module.

I also fixed some hidden bugs that raised after the change was done.

(cherry picked from commit 94da9365)

Unboxed sum constructors are now defined in the `GHC.Types` module, so if you
manually quote an unboxed sum (e.g., `''Sum2#`), you will get a `Name` like:

```hs
GHC.Types.Sum2#
```

The `unboxedSumTypeName` function in `template-haskell`, however, mistakenly
believes that unboxed sum constructors are defined in `GHC.Prim`, so
`unboxedSumTypeName 2` would return an entirely different `Name`:

```hs
GHC.Prim.(#|#)
```

This is a problem for Template Haskell users, as it means that they can't be
sure which `Name` is the correct one. (Similarly for `unboxedSumDataName`.)

This patch fixes the implementations of `unboxedSum{Type,Data}Name` to use
`GHC.Types` as the module. For consistency with `unboxedTupleTypeName`, the
`unboxedSumTypeName` function now uses the non-punned syntax for unboxed sums
(`Sum<N>#`) as the `OccName`.

Fixes #24750.

This is entirely redundant to the filename of the URL. There is no
compelling reason to name the downloaded file differently from its
source.

This reverts commit 250c5df7.

The comments now live in the surrounding location, not inside the
Match. Make sure we keep them.

Closes #24707

(cherry picked from commit e916fc92)

Closes #24754

(cherry picked from commit 7eab4e01)

Closes #24749

(cherry picked from commit bf3d4db0)

Closes #24714

(cherry picked from commit d5bea4d6)

Cheng Shao authored 11 months ago and Matthew Pickering committed 10 months ago

This patch makes the driver always merge objects with `ld -r` when
possible, and only fall back to calling `ar -L` when merge objects
command is unavailable. This completely reverts !8887 and !12313,
given more fixes in Cabal seems to be needed to avoid breaking certain
configurations and the maintainence cost is exceeding the behefits in
this case :/

(cherry picked from commit 631cefec)

Teo Camarasu authored 10 months ago and Ben Gamari committed 10 months ago

(cherry picked from commit 06f7db40)

Hécate Moonlight authored 11 months ago and Ben Gamari committed 10 months ago

It was introduced in base-4.20, not 4.22.
Fix #24721

(cherry picked from commit 92134789)

Matthew Pickering authored 11 months ago and Ben Gamari committed 10 months ago

More recent versions of Cabal modify the behaviour of libAbiHash which
breaks our usage of registerPackage.

It is simpler to inline the part of registerPackage that we need and
avoid any additional dependency and complication using the higher-level
function introduces.

(cherry picked from commit 3fff0977)

(cherry picked from commit a8616747)

Simon Peyton Jones authored 11 months ago and Ben Gamari committed 10 months ago

This small patch fixes #24726, by tracking in-scope variables
properly in -drule-check.  Not hard to do!

(cherry picked from commit be1e60ee)

Alan Zimmerman authored 10 months ago and Ben Gamari committed 10 months ago

Closes #24771

(cherry picked from commit 46328a49)

Alan Zimmerman authored 11 months ago and Ben Gamari committed 10 months ago

Closes #24753

(cherry picked from commit 18f4ff84)

Alan Zimmerman authored 10 months ago and Ben Gamari committed 10 months ago

Fix checkTyClHdr which was discarding comments.

Closes #24755

(cherry picked from commit 35d34fde)

Alan Zimmerman authored 11 months ago and Ben Gamari committed 10 months ago

In
    instance SDecide Nat where
      SZero %~ (SSucc _) = Disproved (\case)

Ensure the span for the HsLam covers the full construct.

Closes #24748

(cherry picked from commit 167a56a0)

Alan Zimmerman authored 11 months ago and Ben Gamari committed 10 months ago

Preserve comments in

    fun (Con {- c1 -} a b)
        = undefined

Closes #24736

(cherry picked from commit 40026ac3)

Alan Zimmerman authored 11 months ago and Ben Gamari committed 10 months ago

Closes #24708
Closes #24715
Closes #24734

(cherry picked from commit 1c2fd963)

Alan Zimmerman authored 11 months ago and Ben Gamari committed 10 months ago

Closes #24670

(cherry picked from commit 981c2c2c)

This is entirely redundant to the filename of the URL. There is no
compelling reason to name the downloaded file differently from its
source.

Rodrigo Mesquita authored 11 months ago and Ben Gamari committed 10 months ago

The original fix (725343aa) was incorrect because it used the shell
bracket syntax which is the quoting syntax in autoconf, making the test
for existence be incorrect and therefore `xattr` was never run.

Fixes #24554

(cherry picked from commit e03760db)

`str.isascii` is only supported in Python 3.7 and later.

(cherry picked from commit daeda834)

Cheng Shao authored 11 months ago and Ben Gamari committed 11 months ago

This commit removes obsolete deletection logic of the patch command
from autoconf scripts, given we no longer need to patch anything in
the GHC build process.

(cherry picked from commit 71f28958)

Cheng Shao authored 11 months ago and Ben Gamari committed 11 months ago

This commit removes obsolete Patch logic from hadrian, given we no
longer need to patch the gmp tarball when building in-tree GMP.

(cherry picked from commit 65b4b92f)

Cheng Shao authored 11 months ago and Ben Gamari committed 11 months ago

This patch bumps the gmp-tarballs submodule and updates gmp to 6.3.0.
The tarball format is now xz, and gmpsrc.patch has been patched into
the tarball so hadrian no longer needs to deal with patching logic
when building in-tree GMP.

(cherry picked from commit 6399d52b)

Cheng Shao authored 11 months ago and Ben Gamari committed 11 months ago

This commit removes an obsolete ln script in ghc-bignum/gmp. See
060251c2 for its original intention,
but it's been obsolete for a long time, especially since the removal
of the make build system. Hence the house cleaning.

(cherry picked from commit c62dc317)

Jade authored 11 months ago and Ben Gamari committed 11 months ago

This mainly has consequences for GHCi but also slightly alters how the
output of GHC on the commandline looks.

Fixes: #22499
(cherry picked from commit 275e41a9)

Simon Peyton Jones authored 1 year ago and Ben Gamari committed 11 months ago

This MR addresses #24463.  It's all explained in the new

   Note [Cloning CoVars and TyVars]

(cherry picked from commit 9d38bfa0)

Teo Camarasu authored 11 months ago and Ben Gamari committed 11 months ago

This was missing part of the unit ID meaning it would 404.

Resolves #24674

(cherry picked from commit f30e4984)

Rather than `hide`.

Closes #24659.

(cherry picked from commit d7a3d6b5)

The implementation of `checkHomeUnitsClosed` was traversing every single path
in the unit dependency graph - this grows exponentially and quickly grows to be
infeasible on larger unit dependency graphs.

Instead we replace this with a faster implementation which follows from the
specificiation of the closure property - there is a closure error if there are
units which are both are both (transitively) depended upon by home units and
(transitively) depend on home units, but are not themselves home units.

To compute the set of units required for closure, we first compute the closure
of the unit dependency graph, then the transpose of this closure, and find all
units that are reachable from the home units in the transpose of the closure.

(cherry picked from commit a933aff3)