[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: Fix LLVM version detection

Sun Dec 29 19:24:02 UTC 2024

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

Commits:
a928c326 by ARATA Mizuki at 2024-12-28T03:06:14-05:00
Fix LLVM version detection

With a recent LLVM, `llc -version` emits the version on the first line
if the vendor is set.  It emits the version on the second line
otherwise.

Therefore, we need to check the both lines to detect the version.

GHC now emits a warning if it fails to detect the LLVM version,
so we can notice if the output of `llc -version` changes in the future.

Also, the warning for using LLVM < 10 on s390x is removed, because
we assume LLVM >= 13 now.

This fixes the definition of __GLASGOW_HASKELL_LLVM__ macro.

Fixes #25606

- - - - -
7f79257a by Zubin Duggal at 2024-12-29T13:04:35+00:00
Bump base, ghc-prim and template-haskell versions for 9.12

Also bump various submodules.

(cherry picked from commit 6fc1fa3bdc8f53acdb19e47145789274060e498f)

Bump base bound to 4.21 for GHC 9.12

(cherry picked from commit 473a201c6b55aea5bf9c9db0836a66ea1b657e04)

Bump binary submodule to 0.8.9.2

(cherry picked from commit 7199869a52ab45e8856658248bf807954d58cc20)
(cherry picked from commit ec2f40b45c1a3d82d17a2fc07e9ddb9218bc3940)

Bump exceptions submodule to 0.10.9

(cherry picked from commit f5b5d1dc2d326368e5b173d622630d77f019b629)

Bump file-io submodule to 0.1.4

(cherry picked from commit ba786681de6ac5fa49938e2cd71a5988f0f40d1f)

bump os-string submodule to 2.0.6

(cherry picked from commit 3a7ffdbb832c045a55fd1ef24f546abdd9d9e30f)

bump transformers submodule to 0.6.1.2

(cherry picked from commit 53b46fd437421b9e5a001edc6d1c427439d7714f)

Bump directory submodule to v1.3.9.0

(cherry picked from commit 27dc2664c5404bb462092bb216c2c37b418fd1f8)

Bump Win32 submodule to v2.14.1.0

(cherry picked from commit 80df88086180f5e39212b2feacf70a9d2b263c6c)

Bump filepath submodule to 1.5.3.0

(cherry picked from commit 29bfae2c58a7303a081a6e7956b9f55e5faf3eeb)

Bump file-io submodule to avoid usage of QuasiQuotes

(cherry picked from commit 97b0dff223a6c4cc003adec448104c277f214645)

Bump unix submodule to 2.8.6.0

(cherry picked from commit a1f56d6d6a99c100f88ef0a8b4d51298cf24a42d)

Bump os-string submodule to 2.0.8

(cherry picked from commit 0121b76fd52ea0c0ce5d07085bc195666b63c625)

Bump file-io submodule to avoid usage of QuasiQuotes

(cherry picked from commit 962ceb50c8a6fc370e1c0a267f5cd5562a8cf759)

Bump filepath submodule to 1.5.4.0

(cherry picked from commit 7bc6877fd5d41c6d5900678ad5e73ed30f366569)

Bump file-io submodule to 0.1.5

(cherry picked from commit 9478b5aefe2877d58baf527edcf936dddbb955b7)

Bump Cabal submodule to 3.14.1.0

(cherry picked from commit 5c9c3e3f79a79bb6d9a77a17c716dc3a0bcbd2aa)

Bump directory submodule to 0.12.2.0

(cherry picked from commit 897906265db37af34ae2aaa016cec417f263407b)

Bump array submodule for base bump

Bump stm submodule for base bump

Bump process submodule for base bump

- - - - -
f6079408 by Zubin Duggal at 2024-12-29T13:04:35+00:00
Fix ghc-e005 after HasCallstack changes

(cherry picked from commit 77f340a24561cea8a6f2ada296b3ea356ab1823c)

- - - - -
3e10fa75 by Zubin Duggal at 2024-12-29T13:04:35+00:00
Add haskeline to stage0Packages

Otherwise we link against boot inplace and boot unix as boot haskeline
depends on boot unix.

(cherry picked from commit 90b493769ebdf3cd7be404d18462dc20ac1044df)

- - - - -
4ad6aec4 by Zubin Duggal at 2024-12-29T13:04:35+00:00
Fix TH changelog

- - - - -
ea3f7fd5 by Zubin Duggal at 2024-12-29T13:04:35+00:00
release: copy index.html from correct directory

(cherry picked from commit cbfd0829cd61928976c9eb17ba4af18272466063)

- - - - -
fafb70db by Zubin Duggal at 2024-12-29T13:04:35+00:00
hadrian-multi: warn on unused imports

os-string has redundant imports

(cherry picked from commit dde3796be689ea57543936e22aa5ea4ef7ed995e)

- - - - -
41ab76f7 by Simon Peyton Jones at 2024-12-29T14:23:49-05:00
Fix in-scope set for CSE

Ticket #25468 showed an assertion failure in CSE because a top-level
Id was being used before it was defined.  Reason: Note [Glomming] in
GHC.Core.Opt.OccurAnal.

Solution (used in many places): just put all the top-level bindings in
scope at the beginning of CSE.

Compile-time allocation wobbles up and down a tiny bit; geo mean is
zero. But MultiLayerModulesTH_OneShot and hard_hole_fits increase (on
some architectures only) by a bit oever 2% .  I think these are just a
random fluctuations.

Metric Increase:
    MultiLayerModulesTH_OneShot
    hard_hole_fits

- - - - -

30 changed files:

- .gitlab-ci.yml
- .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
- compiler/GHC/CmmToLlvm.hs
- compiler/GHC/Core/Lint.hs
- compiler/GHC/Core/Opt/CSE.hs
- compiler/GHC/SysTools/Tasks.hs
- compiler/ghc.cabal.in
- docs/users_guide/phases.rst
- ghc/ghc-bin.cabal.in
- hadrian/src/Settings/Default.hs
- hadrian/src/Settings/Warnings.hs
- libraries/Cabal
- libraries/Win32
- libraries/array
- libraries/base/base.cabal.in
- libraries/binary
- libraries/bytestring
- libraries/deepseq
- libraries/directory
- libraries/exceptions
- libraries/file-io
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghc-experimental/ghc-experimental.cabal.in
- libraries/ghc-heap/ghc-heap.cabal.in
- libraries/ghc-internal/ghc-internal.cabal.in
- libraries/ghc-prim/ghc-prim.cabal
- libraries/ghci/ghci.cabal.in

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6a765ddceb015cbd0020e51083179bd3b4d1a889...41ab76f72efdb269fa3febea8cd2cb719c82b950

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6a765ddceb015cbd0020e51083179bd3b4d1a889...41ab76f72efdb269fa3febea8cd2cb719c82b950
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/20241229/17d8dae1/attachment.html>