[Git][ghc/ghc][wip/backports] 15 commits: Limit upper version of Happy for ghc-9.0 and earlier (#18620)

[Ben Gamari]

Ben Gamari pushed to branch wip/backports at Glasgow Haskell Compiler / GHC


Commits:
8a8796b9 by Takenobu Tani at 2020-09-17T15:35:22-04:00
Limit upper version of Happy for ghc-9.0 and earlier (#18620)

This patch adds the upper bound of a happy version for ghc-9.0
and earlier.

Currently, we can't use happy-1.20.0 for ghc-9.0.

See #18620.

(cherry picked from commit 84ec8daa016d07ae42f0f0f48575dd7d907d5f9d)

- - - - -
92a45b51 by Ben Gamari at 2020-09-17T15:35:22-04:00
configure: Fix whitespace

(cherry picked from commit 1213fd87564ab092aa914d8633df4de07fe04905)

- - - - -
3b708111 by Ben Gamari at 2020-09-17T15:35:22-04:00
gitlab-ci: Bump Windows toolchain version

This should have been done when we bumped the bootstrap compiler to
8.8.4.

(cherry picked from commit 566ac68de70e5b580c96e8ab8b3b02ad0f1acd42)

- - - - -
2ab52f12 by Ben Gamari at 2020-09-17T15:35:22-04:00
gitlab-ci: Drop Windows make job

These are a significant burden on our CI resources and end up failing
quite often due to #18274. Here I drop the make jobs during
validaion; it is now run only during the nightly builds.

(cherry picked from commit 72036e1c03385aa4f5ed70179ab4b154beed81cb)

- - - - -
3e7c5c7e by Ben Gamari at 2020-09-17T15:35:22-04:00
testsuite: Drop Windows-specific output for parseTree

The normalise_slashes normaliser should handle this.

(cherry picked from commit 4597752ad3c031e17fe3cceb20c61e4d5b58c52f)

- - - - -
d02d59af by Ben Gamari at 2020-09-17T15:35:22-04:00
testsuite: Mark T5975[ab] as broken on Windows

Due to #7305.

(cherry picked from commit 5b12bb7c98529374ff8e932d0c36104d1a0fe509)

- - - - -
863ccedd by Ben Gamari at 2020-09-17T15:35:22-04:00
gitlab-ci: Fix typo

A small typo in a rule regular expression.

(cherry picked from commit c4fd8947f4104e7b6d6bf3d320a63a361191bde1)

- - - - -
e8a31cbb by Ben Gamari at 2020-09-17T15:35:22-04:00
rts: Add stg_copyArray_barrier to RtsSymbols list

It's incredible that this wasn't noticed until now.

(cherry picked from commit c2fefaf37ae134aefc4136bae7e5976f991d76f4)

- - - - -
c2dbcacb by Ryan Scott at 2020-09-17T15:35:22-04:00
Postpone associated tyfam default checks until after typechecking

Previously, associated type family defaults were validity-checked
during typechecking. Unfortunately, the error messages that these
checks produce run the risk of printing knot-tied type constructors,
which will cause GHC to diverge. In order to preserve the current
error message's descriptiveness, this patch postpones these validity
checks until after typechecking, which are now located in the new
function `GHC.Tc.Validity.checkValidAssocTyFamDeflt`.

Fixes #18648.

(cherry picked from commit 5e883375409efc2336da6295c7d81bd10b542210)

- - - - -
8048568d by Ryan Scott at 2020-09-17T15:35:22-04:00
Don't quote argument to Hadrian's test-env flag (#18656)

Doing so causes the name of the test environment to gain an extra
set of double quotes, which changes the name entirely.

Fixes #18656.

(cherry picked from commit bc487caf830ce6cd2c03845b29416c6706185fbc)

- - - - -
c6215eb1 by Krzysztof Gogolewski at 2020-09-17T15:35:22-04:00
Make sure we can read past perf notes

See #18656.

(cherry picked from commit b8a9cff2ce651c085c84980d3e709db2ecda8c3f)

- - - - -
24120575 by Ben Gamari at 2020-09-17T15:35:22-04:00
rts: Fix erroneous usage of vsnprintf

As pointed out in #18685, this should be snprintf not vsnprintf. This
appears to be due to a cut-and-paste error.

Fixes #18658.

(cherry picked from commit 35ea92708e17c90e476167163ae24747a3f5508e)

- - - - -
7fcac7c7 by HaskellMouse at 2020-09-17T15:35:22-04:00
Added explicit fixity to (~).

Solves #18252

(cherry picked from commit 3c94c81629ac9159775b8b70baf2c635f0331708)

- - - - -
b8a5b416 by Ben Gamari at 2020-09-17T15:35:22-04:00
rts/nonmoving: Add missing STM write barrier

When updating a TRec for a TVar already part of a transaction we
previously neglected to add the old value to the update remembered set.
I suspect this was the cause of #18587.

(cherry picked from commit a64e94f98ca18e53ecc13f736d50b9cb2d156b05)

- - - - -
379921d6 by Ben Gamari at 2020-09-17T15:35:22-04:00
gitlab-ci: Use hadrian builds for Windows release artifacts

(cherry picked from commit d4bc9f0de7992f60bce403731019829f6248cc2c)

- - - - -


30 changed files:

- .gitlab-ci.yml
- aclocal.m4
- compiler/GHC/Core/Class.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/IfaceToCore.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/Validity.hs
- hadrian/hadrian.cabal
- hadrian/src/Settings/Builders/RunTest.hs
- libraries/ghc-prim/GHC/Types.hs
- libraries/ghc-prim/changelog.md
- rts/RtsMessages.c
- rts/RtsSymbols.c
- rts/STM.c
- testsuite/driver/perf_notes.py
- − testsuite/tests/ghc-api/annotations/parseTree.stdout-mingw32
- testsuite/tests/ghci/T18060/T18060.stdout
- testsuite/tests/ghci/scripts/T10059.stdout
- testsuite/tests/ghci/scripts/all.T
- testsuite/tests/indexed-types/should_compile/T11361a.stderr
- testsuite/tests/indexed-types/should_fail/SimpleFail4.stderr
- testsuite/tests/indexed-types/should_fail/T13971.stderr
- testsuite/tests/indexed-types/should_fail/T13971b.stderr
- testsuite/tests/indexed-types/should_fail/T16110_Fail2.stderr
- testsuite/tests/indexed-types/should_fail/T16110_Fail3.stderr
- testsuite/tests/indexed-types/should_fail/T16356_Fail1.stderr
- testsuite/tests/indexed-types/should_fail/T16356_Fail2.stderr
- + testsuite/tests/indexed-types/should_fail/T18648.hs
- + testsuite/tests/indexed-types/should_fail/T18648.stderr
- testsuite/tests/indexed-types/should_fail/all.T


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/71fa1a167ab0fe7ec8a4ec6d0e16b37d63719198...379921d61f4cbd78d00bb885714715b5c43d7fe8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/71fa1a167ab0fe7ec8a4ec6d0e16b37d63719198...379921d61f4cbd78d00bb885714715b5c43d7fe8
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/20200917/a089e69f/attachment.html>