[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 7 commits: driver: Always link against "base" package when one shot linking

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Mon Nov 25 14:30:42 UTC 2024



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


Commits:
87694d2d by Matthew Pickering at 2024-11-25T09:29:45-05:00
driver: Always link against "base" package when one shot linking

The default value for base-unit-id is stored in the settings file.

At install time, this can be set by using the BASE_UNIT_ID environment
variable.

At runtime, the value can be set by `-base-unit-id` flag.

For whether all this is a good idea, see #25382

Fixes #25382

- - - - -
7ee162d7 by Andreas Klebinger at 2024-11-25T09:29:46-05:00
Compacting GC: Handle black holes in large objects.

As #14497 showed black holes can appear inside large objects when
we capture a computation and later blackhole it like we do for AP_STACK
closures.

Fixes #24791

- - - - -
4bdfa851 by Cheng Shao at 2024-11-25T09:29:46-05:00
ci: minor nix-in-docker improvements

This patch makes some minor improvements re nix-in-docker logic in the
ci configuration:

- Update `nixos/nix` to the latest version
- Apply $CPUS to `cores`/`max-jobs` to avoid oversubscribing while
  allowing a reasonable degree of parallelism
- Remove redundant `--extra-experimental-features nix-command` in
  later `nix shell` invocations, it's already configured in
  `/etc/nix/nix.conf`

- - - - -
d1569c23 by Cheng Shao at 2024-11-25T09:29:49-05:00
ci: avoid depending on stack job for test-bootstrap jobs

This patch makes test-bootstrap related ci jobs only depend on
hadrian-ghc-in-ghci job to finish, consistent with other jobs in the
full-build stage generated by gen_ci.hs. This allows the jobs to be
spawned earlier and improve overall pipeline parallelism.

- - - - -
705e917a by Simon Hengel at 2024-11-25T09:29:55-05:00
Refactoring: Remove `pSupportedExts` from `ParserOpts`

This is never used for lexing / parsing.  It is only used by
`GHC.Parser.Header.getOptions`.

- - - - -
d0b2a851 by Arnaud Spiwack at 2024-11-25T09:29:59-05:00
Add test for #25515

- - - - -
127aa5b3 by Arnaud Spiwack at 2024-11-25T09:29:59-05:00
Desugar record notation with correct multiplicities

Simply uses the multiplicity as stored in the field. As I'm writing
this commit, the only possible multiplicity is 1, but !13525 is
changing this. It's actually easier to take !13525 into account.

Fixes #25515.

- - - - -


30 changed files:

- .gitlab-ci.yml
- .gitlab/hello.hs
- compiler/GHC/Driver/Backpack.hs
- compiler/GHC/Driver/Config/Parser.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Parser/HaddockLex.x
- compiler/GHC/Parser/Header.hs
- compiler/GHC/Parser/Lexer.x
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- compiler/GHC/Tc/Gen/Expr.hs
- compiler/GHC/Unit/State.hs
- distrib/configure.ac.in
- docs/users_guide/packages.rst
- ghc/GHCi/UI.hs
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- hadrian/src/Rules/Generate.hs
- rts/sm/Compact.c
- rts/sm/Evac.c
- testsuite/tests/driver/Makefile
- + testsuite/tests/driver/T25382.hs
- testsuite/tests/driver/all.T
- testsuite/tests/ghc-api/T10942.hs
- + testsuite/tests/linear/should_compile/T25515.hs
- testsuite/tests/linear/should_compile/all.T
- + testsuite/tests/rts/T14497-compact.hs
- + testsuite/tests/rts/T14497-compact.stdout


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48541640867ffc3fd23ae91cc3949be6a0f3cf81...127aa5b39ca6c858a26942bbd75321da04651e95

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48541640867ffc3fd23ae91cc3949be6a0f3cf81...127aa5b39ca6c858a26942bbd75321da04651e95
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/20241125/8fb14a81/attachment.html>


More information about the ghc-commits mailing list