March 2026 - ghc-commits

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T25450-print-cpu
by Simon Jakobi (＠sjakobi2) 07 Mar '26

07 Mar '26

Simon Jakobi pushed new branch wip/sjakobi/T25450-print-cpu at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sjakobi/T25450-print-cpu You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/regression-tests-3] Add regression perf test for #13820
by Simon Jakobi (＠sjakobi2) 07 Mar '26

07 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/regression-tests-3 at Glasgow Haskell Compiler / GHC Commits: 674dcf12 by Simon Jakobi at 2026-03-07T20:59:35+01:00 Add regression perf test for #13820 Closes #13820. - - - - - 1 changed file: - testsuite/tests/perf/compiler/all.T Changes: ===================================== testsuite/tests/perf/compiler/all.T ===================================== @@ -680,6 +680,12 @@ test ('T13253-spj', ], compile, ['-v0 -O']) +test ('T13820', + [ collect_compiler_stats('peak_megabytes_allocated', 5), + collect_compiler_stats('bytes allocated', 2), + ], + compile, + ['-v0']) test ('T14766', [ collect_compiler_stats('bytes allocated',2), pre_cmd('python3 genT14766.py > T14766.hs'), View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/674dcf129011e2c5cb6d9b60d34d255… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/674dcf129011e2c5cb6d9b60d34d255… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/rec-do-docs
by Simon Hengel (＠sol) 07 Mar '26

07 Mar '26

Simon Hengel pushed new branch wip/sol/rec-do-docs at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sol/rec-do-docs You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 7 commits: drop deb9/10 from CI, add deb13
by Marge Bot (＠marge-bot) 07 Mar '26

07 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: eca445e7 by mangoiv at 2026-03-07T05:02:36-05:00 drop deb9/10 from CI, add deb13 debian 9 and 10 are end of life, hence we drop them from our CI, but we do add debian 13. Jobs that were previously run on 9 and 10 run on 13, too, jobs that were run on 10, are run on 11 now. Jobs that were previously run on debian 12 are run on debian 13 now. This MR also updates hadrian's bootstrap plans for that reason. Metric Decrease: T9872d - - - - - 12f8b829 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Fix GHC.Internal.Prim haddock Haddock used to parse Haskell source to generate documentation, but switched to using interface files instead. This broke documentation of the GHC.Internal.Prim module, since it's a wired-in interface that didn't provide a document structure. This patch adds the missing document structure and updates genprimopcode to make the section headers and descriptions available. fixes #26954 - - - - - f87e5e57 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Remove obsolete --make-haskell-source from genprimopcode Now that haddock uses the wired-in interface for GHC.Internal.Prim, the generated Haskell source file is no longer needed. Remove the --make-haskell-source code generator from genprimopcode and replace the generated GHC/Internal/Prim.hs with a minimal static source file. - - - - - 4a7ddc7b by Sylvain Henry at 2026-03-07T05:04:59-05:00 JS: fix linking of exposed but non-preload units (#24886) Units exposed in the unit database but not explicitly passed on the command-line were not considered by the JS linker. This isn't an issue for cabal which passes every unit explicitly but it is an issue when using GHC directly (cf T24886 test). - - - - - 689aafcd by mangoiv at 2026-03-07T05:05:52-05:00 testsuite: double foundation timeout multiplier The runtime timeout in the foundation test was regularly hit by code generated by the wasm backend - we increase the timout since the high runtime is expected on the wasm backend for this rather complex test. Resolves #26938 - - - - - f69c3431 by Sylvain Henry at 2026-03-07T07:41:51-05:00 T18832: fix Windows CI failure by dropping removeDirectoryRecursive On Windows, open file handles prevent deletion. After killThread, the closer thread may not have called hClose yet, causing removeDirectoryRecursive to fail with "permission denied". The test harness cleans up the run directory anyway, so the call is redundant. - - - - - 881f34f3 by Cheng Shao at 2026-03-07T07:41:52-05:00 compiler: fix redundant import in GHC.StgToJS.Object This patch fixes a redundant import in GHC.StgToJS.Object that causes a build failure when compiling head from 9.14 with validate flavours. Fixes #26991. - - - - - 40 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/Driver/Main.hs - compiler/GHC/Runtime/Interpreter/JS.hs - compiler/GHC/StgToJS/Object.hs - hadrian/bootstrap/generate_bootstrap_plans - hadrian/bootstrap/plan-9_10_1.json - hadrian/bootstrap/plan-9_10_2.json - + hadrian/bootstrap/plan-9_10_3.json - hadrian/bootstrap/plan-bootstrap-9_10_1.json - hadrian/bootstrap/plan-bootstrap-9_10_2.json - + hadrian/bootstrap/plan-bootstrap-9_10_3.json - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Builders/GenPrimopCode.hs - libraries/base/tests/IO/T18832.hs - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/src/GHC/Internal/Prim.hs - testsuite/driver/perf_notes.py - testsuite/tests/ghci/should_run/all.T - + testsuite/tests/javascript/T24886.hs - + testsuite/tests/javascript/T24886.stderr - + testsuite/tests/javascript/T24886.stdout - testsuite/tests/javascript/all.T - testsuite/tests/numeric/should_run/all.T - testsuite/tests/overloadedrecflds/should_compile/all.T - testsuite/tests/overloadedrecflds/should_run/all.T - testsuite/tests/pmcheck/should_compile/T11303.hs - testsuite/tests/quasiquotation/qq005/test.T - testsuite/tests/quasiquotation/qq006/test.T - testsuite/tests/saks/should_compile/all.T - testsuite/tests/showIface/all.T - testsuite/tests/th/all.T - testsuite/tests/vdq-rta/should_compile/all.T - utils/genprimopcode/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8f0a2d29425144cc12aef00225007… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8f0a2d29425144cc12aef00225007… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/andreask/ghc_par
by Andreas Klebinger (＠AndreasK) 07 Mar '26

07 Mar '26

Andreas Klebinger pushed new branch wip/andreask/ghc_par at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/andreask/ghc_par You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 26 commits: drop deb9/10 from CI, add deb13
by Sven Tennie (＠supersven) 07 Mar '26

07 Mar '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: eca445e7 by mangoiv at 2026-03-07T05:02:36-05:00 drop deb9/10 from CI, add deb13 debian 9 and 10 are end of life, hence we drop them from our CI, but we do add debian 13. Jobs that were previously run on 9 and 10 run on 13, too, jobs that were run on 10, are run on 11 now. Jobs that were previously run on debian 12 are run on debian 13 now. This MR also updates hadrian's bootstrap plans for that reason. Metric Decrease: T9872d - - - - - 12f8b829 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Fix GHC.Internal.Prim haddock Haddock used to parse Haskell source to generate documentation, but switched to using interface files instead. This broke documentation of the GHC.Internal.Prim module, since it's a wired-in interface that didn't provide a document structure. This patch adds the missing document structure and updates genprimopcode to make the section headers and descriptions available. fixes #26954 - - - - - f87e5e57 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Remove obsolete --make-haskell-source from genprimopcode Now that haddock uses the wired-in interface for GHC.Internal.Prim, the generated Haskell source file is no longer needed. Remove the --make-haskell-source code generator from genprimopcode and replace the generated GHC/Internal/Prim.hs with a minimal static source file. - - - - - 4a7ddc7b by Sylvain Henry at 2026-03-07T05:04:59-05:00 JS: fix linking of exposed but non-preload units (#24886) Units exposed in the unit database but not explicitly passed on the command-line were not considered by the JS linker. This isn't an issue for cabal which passes every unit explicitly but it is an issue when using GHC directly (cf T24886 test). - - - - - 689aafcd by mangoiv at 2026-03-07T05:05:52-05:00 testsuite: double foundation timeout multiplier The runtime timeout in the foundation test was regularly hit by code generated by the wasm backend - we increase the timout since the high runtime is expected on the wasm backend for this rather complex test. Resolves #26938 - - - - - c01cb7ea by Matthew Pickering at 2026-03-07T10:11:05+00:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - fa0a0279 by Matthew Pickering at 2026-03-07T10:11:05+00:00 Use explicit syntax rather than pure - - - - - c6550ff4 by Matthew Pickering at 2026-03-07T10:11:05+00:00 packaging: correctly propagate build/host/target to bindist configure script At the moment the host and target which we will produce a compiler for is fixed at the initial configure time. Therefore we need to persist the choice made at this time into the installation bindist as well so we look for the right tools, with the right prefixes at install time. In the future, we want to provide a bit more control about what kind of bindist we produce so the logic about what the host/target will have to be written by hadrian rather than persisted by the configure script. In particular with cross compilers we want to either build a normal stage 2 cross bindist or a stage 3 bindist, which creates a bindist which has a native compiler for the target platform. Fixes #21970 - - - - - 06e6ca10 by Matthew Pickering at 2026-03-07T10:11:05+00:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 743c46f7 by Matthew Pickering at 2026-03-07T10:11:05+00:00 hadrian: Disable docs when cross compiling Before there were a variety of ad-hoc places where doc building was disabled when cross compiling. * Some CI jobs sets --docs=none in gen_ci.hs * Some CI jobs set --docs=none in .gitlab/ci.sh * There was some logic in hadrian to not need the ["docs"] target when making a bindist. Now the situation is simple: * If you are cross compiling then defaultDocsTargets is empty by default. In theory, there is no reason why we can't build documentation for cross compiler bindists, but this is left to future work to generalise the documentation building rules to allow this (#24289) - - - - - 760cbf8b by Matthew Pickering at 2026-03-07T10:11:05+00:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: ManyAlternatives MultiComponentModulesRecomp MultiLayerModulesRecomp T10421 T12425 T12707 T13035 T13379 T15703 T16577 T18698a T18698b T18923 T1969 T21839c T3294 T4801 T5030 T5321Fun T5642 T783 T9198 T9872d T9961 parsing001 T5321FD T6048 T12227 T18140 T18282 T9233 T5631 T9630 ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> Fix rebase: settings-use-distro-mingw is now staged - - - - - 1ffa2285 by Matthew Pickering at 2026-03-07T10:11:05+00:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 7564eb87 by Matthew Pickering at 2026-03-07T10:12:58+00:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - da2fd767 by Matthew Pickering at 2026-03-07T10:12:58+00:00 hadrian: Refactor system-cxx-std-lib rules0 I noticed a few things wrong with the hadrian rules for `system-cxx-std-lib` rules. * For `text` there is an ad-hoc check to depend on `system-cxx-std-lib` outside of `configurePackage`. * The `system-cxx-std-lib` dependency is not read from cabal files. * Recache is not called on the packge database after the `.conf` file is generated, a more natural place for this rule is `registerRules`. Treating this uniformly like other packages is complicated by it not having any source code or a cabal file. However we can do a bit better by reporting the dependency firstly in `PackageData` and then needing the `.conf` file in the same place as every other package in `configurePackage`. Fixes #25303 - - - - - 63acd7cd by Sven Tennie at 2026-03-07T10:14:54+00:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - df0e6773 by Sven Tennie at 2026-03-07T10:14:55+00:00 ghc: Distinguish between having an interpreter and having an internal one Otherwise, we fail with warnings when compiling tools. Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter - - - - - bf10fbe4 by Matthew Pickering at 2026-03-07T10:14:55+00:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> - - - - - 5d3a1e6a by Sven Tennie at 2026-03-07T10:14:55+00:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - 2a227dc9 by Sven Tennie at 2026-03-07T10:14:55+00:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - d4acb315 by Sven Tennie at 2026-03-07T10:14:55+00:00 Windows needs NM_STAGE0 as well The stage0 always needs nm. - - - - - 8611a26d by Sven Tennie at 2026-03-07T10:14:55+00:00 T17912 sometimes works for windows-validate This seems to be timing related. However, just simply increasing the timeout (sleep) statement of this test didn't help. Maybe, it has been flaky on CI before. - - - - - e62e2889 by Sven Tennie at 2026-03-07T10:14:55+00:00 stripping: Not for >= Stage2 cross-compiled Currently, we can only strip objects of the host target. - - - - - eb74274e by Sven Tennie at 2026-03-07T10:14:55+00:00 hadrian: Improve readability of inTreeCompilerArgs Refer to the stages of executables and libraries. This should express the intention better. - - - - - 0847a12b by Sven Tennie at 2026-03-07T10:14:55+00:00 hadrian: Fix difference between in-tree and out-of-tree GHC test args Done by canonicalizing the package database path. (The issue was a not fully reduced path.) - - - - - 1a44e57a by Sven Tennie at 2026-03-07T10:14:55+00:00 Add a config flag for LibDir and derived values For cross-compilers, we have to refer to the libs of the succeeding stage. This also affects other files previously relying on top_dir in GHC. - - - - - 0ccee36a by Sven Tennie at 2026-03-07T10:19:43+00:00 Rebase fixup - - - - - 114 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/Driver/Config/Interpreter.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Runtime/Interpreter/JS.hs - compiler/GHC/Settings.hs - compiler/GHC/Settings/IO.hs - configure.ac - distrib/configure.ac.in - ghc/GHC/Driver/Session/Mode.hs - ghc/GHCi/UI.hs - ghc/Main.hs - ghc/ghc-bin.cabal.in - hadrian/README.md - hadrian/bindist/Makefile - hadrian/bindist/config.mk.in - hadrian/bootstrap/generate_bootstrap_plans - hadrian/bootstrap/plan-9_10_1.json - hadrian/bootstrap/plan-9_10_2.json - + hadrian/bootstrap/plan-9_10_3.json - hadrian/bootstrap/plan-bootstrap-9_10_1.json - hadrian/bootstrap/plan-bootstrap-9_10_2.json - + hadrian/bootstrap/plan-bootstrap-9_10_3.json - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Cabal/Type.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/GenPrimopCode.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.hs - libraries/base/tests/IO/all.T - libraries/base/tests/all.T - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/src/GHC/Internal/Prim.hs - m4/fp_find_nm.m4 - m4/fptools_set_platform_vars.m4 - m4/prep_target_file.m4 - testsuite/driver/perf_notes.py - testsuite/ghc-config/ghc-config.hs - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/ghci/should_run/all.T - + testsuite/tests/javascript/T24886.hs - + testsuite/tests/javascript/T24886.stderr - + testsuite/tests/javascript/T24886.stdout - testsuite/tests/javascript/all.T - testsuite/tests/javascript/closure/all.T - testsuite/tests/numeric/should_run/all.T - testsuite/tests/overloadedrecflds/should_compile/all.T - testsuite/tests/overloadedrecflds/should_run/all.T - testsuite/tests/pmcheck/should_compile/T11303.hs - testsuite/tests/quasiquotation/qq005/test.T - testsuite/tests/quasiquotation/qq006/test.T - testsuite/tests/saks/should_compile/all.T - testsuite/tests/showIface/all.T - testsuite/tests/th/all.T - testsuite/tests/vdq-rta/should_compile/all.T - utils/genprimopcode/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74d7c70e3b357ea57ba51527544497… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74d7c70e3b357ea57ba51527544497… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: double foundation timeout multiplier
by Marge Bot (＠marge-bot) 07 Mar '26

07 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 689aafcd by mangoiv at 2026-03-07T05:05:52-05:00 testsuite: double foundation timeout multiplier The runtime timeout in the foundation test was regularly hit by code generated by the wasm backend - we increase the timout since the high runtime is expected on the wasm backend for this rather complex test. Resolves #26938 - - - - - 1 changed file: - testsuite/tests/numeric/should_run/all.T Changes: ===================================== testsuite/tests/numeric/should_run/all.T ===================================== @@ -88,7 +88,8 @@ test('IntegerToFloat', normal, compile_and_run, ['']) test('T20291', normal, compile_and_run, ['']) test('T22282', normal, compile_and_run, ['']) test('T22671', js_fragile(24259), compile_and_run, ['']) -test('foundation', [run_timeout_multiplier(2), js_fragile(24259), extra_ways(['optasm','ghci','ghci-opt']), extra_run_opts(str(random.getrandbits(64)))], compile_and_run, ['-fno-break-points']) +# the high run timeout multiplier exists because of timeouts with the wasm backend +test('foundation', [run_timeout_multiplier(4), js_fragile(24259), extra_ways(['optasm','ghci','ghci-opt']), extra_run_opts(str(random.getrandbits(64)))], compile_and_run, ['-fno-break-points']) test('T24066', normal, compile_and_run, ['']) test('div01', normal, compile_and_run, ['']) test('T24245', normal, compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/689aafcd2e76283b6eee6659d0533f7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/689aafcd2e76283b6eee6659d0533f7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] JS: fix linking of exposed but non-preload units (#24886)
by Marge Bot (＠marge-bot) 07 Mar '26

07 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 4a7ddc7b by Sylvain Henry at 2026-03-07T05:04:59-05:00 JS: fix linking of exposed but non-preload units (#24886) Units exposed in the unit database but not explicitly passed on the command-line were not considered by the JS linker. This isn't an issue for cabal which passes every unit explicitly but it is an issue when using GHC directly (cf T24886 test). - - - - - 15 changed files: - compiler/GHC/Driver/Main.hs - compiler/GHC/Runtime/Interpreter/JS.hs - testsuite/tests/ghci/should_run/all.T - + testsuite/tests/javascript/T24886.hs - + testsuite/tests/javascript/T24886.stderr - + testsuite/tests/javascript/T24886.stdout - testsuite/tests/javascript/all.T - testsuite/tests/overloadedrecflds/should_compile/all.T - testsuite/tests/overloadedrecflds/should_run/all.T - testsuite/tests/quasiquotation/qq005/test.T - testsuite/tests/quasiquotation/qq006/test.T - testsuite/tests/saks/should_compile/all.T - testsuite/tests/showIface/all.T - testsuite/tests/th/all.T - testsuite/tests/vdq-rta/should_compile/all.T Changes: ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -2910,7 +2910,7 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do initLoaderState interp hsc_env -- Take lock for the actual work. - (dep_linkables, dep_units) <- modifyLoaderState interp $ \pls -> do + (dep_linkables, needed_units) <- modifyLoaderState interp $ \pls -> do let link_opts = initLinkDepsOpts hsc_env -- Find what packages and linkables are required @@ -2924,13 +2924,8 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do -- FIXME: we should make the JS linker load new_objs here, instead of -- on-demand. - -- FIXME: we don't report needed units because we would have to find a way - -- to build a meaningful LoadedPkgInfo (see the mess in - -- GHC.Linker.Loader.{loadPackage,loadPackages'}). Detecting what to load - -- and actually loading (using the native interpreter) are intermingled, so - -- we can't directly reuse this code. let pls' = pls { objs_loaded = objs_loaded' } - pure (pls', (ldAllLinkables deps, emptyUDFM {- ldNeededUnits deps -}) ) + pure (pls', (ldAllLinkables deps, ldUnits deps)) let foreign_stubs = NoStubs @@ -2945,7 +2940,7 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do -- link code containing binding "id_sym = expr", using id_sym as root withJSInterp i $ \inst -> do let roots = mkExportedModFuns this_mod [id_sym] - jsLinkObject logger tmpfs tmp_dir js_config unit_env inst out_obj roots + jsLinkObject logger tmpfs tmp_dir js_config unit_env inst out_obj roots needed_units -- look up "id_sym" closure and create a StablePtr (HValue) from it href <- lookupClosure interp (IFaststringSymbol id_sym) >>= \case @@ -2955,7 +2950,11 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do binding_fref <- withJSInterp i $ \inst -> mkForeignRef href (freeReallyRemoteRef inst href) - return (castForeignRef binding_fref, dep_linkables, dep_units) + -- FIXME: we don't report needed units because we would have to find a way to + -- build a meaningful LoadedPkgInfo (see the mess in + -- GHC.Linker.Loader.{loadPackage,loadPackages'}). + let pkgs_loaded = emptyUDFM + return (castForeignRef binding_fref, dep_linkables, pkgs_loaded) {- ********************************************************************** ===================================== compiler/GHC/Runtime/Interpreter/JS.hs ===================================== @@ -287,8 +287,8 @@ jsLinkInterp logger tmpfs tmp_dir cfg unit_env inst = do -- | Link object files -jsLinkObjects :: Logger -> TmpFs -> TempDir -> StgToJSConfig -> UnitEnv -> ExtInterpInstance JSInterpExtra -> [FilePath] -> (ExportedFun -> Bool) -> IO () -jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root = do +jsLinkObjects :: Logger -> TmpFs -> TempDir -> StgToJSConfig -> UnitEnv -> ExtInterpInstance JSInterpExtra -> [FilePath] -> (ExportedFun -> Bool) -> [UnitId] -> IO () +jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root extra_units = do let link_cfg = JSLinkConfig { lcNoStats = True -- we don't need the stats , lcNoRts = True -- we don't need the RTS (already linked) @@ -300,7 +300,7 @@ jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root = do , lcLinkCsources = True -- enable C sources, if any } - let units = preloadUnits (ue_homeUnitState unit_env) + let units = preloadUnits (ue_homeUnitState unit_env) ++ extra_units -- compute dependencies let link_spec = LinkSpec @@ -322,11 +322,11 @@ jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root = do -- | Link an object file using the given functions as roots -jsLinkObject :: Logger -> TmpFs -> TempDir -> StgToJSConfig -> UnitEnv -> ExtInterpInstance JSInterpExtra -> FilePath -> [ExportedFun] -> IO () -jsLinkObject logger tmpfs tmp_dir cfg unit_env inst obj roots = do +jsLinkObject :: Logger -> TmpFs -> TempDir -> StgToJSConfig -> UnitEnv -> ExtInterpInstance JSInterpExtra -> FilePath -> [ExportedFun] -> [UnitId] -> IO () +jsLinkObject logger tmpfs tmp_dir cfg unit_env inst obj roots extra_units = do let is_root f = Set.member f (Set.fromList roots) let objs = [obj] - jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root + jsLinkObjects logger tmpfs tmp_dir cfg unit_env inst objs is_root extra_units -- | Link the given link plan ===================================== testsuite/tests/ghci/should_run/all.T ===================================== @@ -91,7 +91,7 @@ test('T22958a', just_ghci, compile_and_run, ['']) test('T22958b', just_ghci, compile_and_run, ['']) test('T22958c', just_ghci, compile_and_run, ['']) test('GhciMainIs', just_ghci, compile_and_run, ['-main-is otherMain']) -test('LargeBCO', [extra_files(['LargeBCO_A.hs']), req_interp, extra_hc_opts("-O -fbyte-code-and-object-code -fprefer-byte-code")], compile_and_run, ['']) +test('LargeBCO', [extra_files(['LargeBCO_A.hs']), req_th, extra_hc_opts("-O -fbyte-code-and-object-code -fprefer-byte-code")], compile_and_run, ['']) test('T24115', just_ghci + [extra_run_opts("-e ':add T24115.hs'")], ghci_script, ['T24115.script']) ===================================== testsuite/tests/javascript/T24886.hs ===================================== @@ -0,0 +1,12 @@ +{-# LANGUAGE TemplateHaskell #-} +module T24886 where + +import GHC.Exts.Heap +import Control.Monad.IO.Class + +-- this is a TH splice importing from ghc-heap, testing that the JS linker +-- can find the ghc-heap package during TH evaluation (see #24886) +do + let !_b = asBox "foo" + liftIO $ putStrLn "ok" + return [] ===================================== testsuite/tests/javascript/T24886.stderr ===================================== @@ -0,0 +1 @@ +ok ===================================== testsuite/tests/javascript/T24886.stdout ===================================== @@ -0,0 +1 @@ +ok ===================================== testsuite/tests/javascript/all.T ===================================== @@ -27,3 +27,4 @@ test('T23479', normal, makefile_test, ['T23479']) test('T24744', normal, makefile_test, ['T24744']) test('T25633', normal, compile_and_run, ['']) +test('T24886', normal, compile, ['']) ===================================== testsuite/tests/overloadedrecflds/should_compile/all.T ===================================== @@ -48,7 +48,7 @@ test('BootFldReexport' # the final module (BootFldReexport), but not fail earlier. , ['BootFldReexport', '-v0']) test('T23220' - , [req_th, extra_files(['T23220_aux.hs']), js_broken(24886)] + , [req_th, extra_files(['T23220_aux.hs'])] , multimod_compile, ['T23220_aux.hs T23220.hs', '-v0']) test('T22106_A', [extra_files(['T22106_aux.hs'])], multimod_compile, ['T22106_A', '-v0']) test('T22106_B', [extra_files(['T22106_aux.hs'])], multimod_compile, ['T22106_B', '-v0']) ===================================== testsuite/tests/overloadedrecflds/should_run/all.T ===================================== @@ -3,7 +3,7 @@ test('overloadedrecfldsrun01', [], multimod_compile_and_run, test('overloadedrecfldsrun02', [extra_files(['OverloadedRecFldsRun02_A.hs'])], multimod_compile_and_run, ['overloadedrecfldsrun02', '']) test('overloadedrecfldsrun03', normal, compile_and_run, ['']) -test('overloadedrecfldsrun04', [req_th,omit_ways(prof_ways), js_broken(24886)], compile_and_run, ['']) +test('overloadedrecfldsrun04', [req_th,omit_ways(prof_ways)], compile_and_run, ['']) test('overloadedrecfldsrun05', normal, compile_and_run, ['']) test('overloadedrecfldsrun07', normal, compile_and_run, ['']) test('overloadedrecflds_generics', normal, compile_and_run, ['']) ===================================== testsuite/tests/quasiquotation/qq005/test.T ===================================== @@ -5,6 +5,6 @@ test('qq005', # profiling ways, due to the TH use, so for now we just # omit the profiling ways omit_ways(prof_ways), - req_interp], + req_th], multimod_compile_and_run, ['Main', '']) ===================================== testsuite/tests/quasiquotation/qq006/test.T ===================================== @@ -1,4 +1,4 @@ test('qq006', [extra_files(['Expr.hs', 'Main.hs']), when(fast(), skip), - req_interp], multimod_compile_fail, + req_th], multimod_compile_fail, ['Main', '-v0']) ===================================== testsuite/tests/saks/should_compile/all.T ===================================== @@ -37,5 +37,5 @@ test('T16721', normal, ghci_script, ['T16721.script']) test('T16756a', normal, compile, ['']) test('saks027', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques']) -test('saks028', [req_th, js_broken(24886)], compile, ['']) +test('saks028', req_th, compile, ['']) test('T17164', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques']) ===================================== testsuite/tests/showIface/all.T ===================================== @@ -3,7 +3,7 @@ test('DocsInHiFile0', extra_files(['DocsInHiFile.hs']), makefile_test, []) test('DocsInHiFile1', extra_files(['DocsInHiFile.hs']), makefile_test, []) test('T17871', [extra_files(['T17871a.hs'])], multimod_compile, ['T17871', '-v0']) test('DocsInHiFileTH', - [extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), req_th, js_broken(24886)], + [extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), req_th], makefile_test, []) test('NoExportList', normal, makefile_test, []) test('PragmaDocs', normal, makefile_test, []) ===================================== testsuite/tests/th/all.T ===================================== @@ -321,7 +321,7 @@ test('T1476', normal, compile, ['-v0']) test('T1476b', normal, compile, ['-v0']) test('T8031', normal, compile, ['-v0']) test('T8624', only_ways(['normal']), makefile_test, ['T8624']) -test('TH_Lift', js_broken(24886), compile, ['-v0 -ddump-splices -dsuppress-uniques']) +test('TH_Lift', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques']) test('T10047', only_ways(['ghci']), ghci_script, ['T10047.script']) test('T10019', only_ways(['ghci']), ghci_script, ['T10019.script']) test('T10267', [], multimod_compile_fail, ===================================== testsuite/tests/vdq-rta/should_compile/all.T ===================================== @@ -30,8 +30,8 @@ test('T25127_infix', normal, compile, ['']) test('T22326_th_dump1', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques']) test('T23739_th_dump1', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques']) -test('T22326_th_pprint1', [req_th, js_broken(24886)], compile, ['']) -test('T23739_th_pprint1', [req_th, js_broken(24886)], compile, ['']) +test('T22326_th_pprint1', req_th, compile, ['']) +test('T23739_th_pprint1', req_th, compile, ['']) test('T23738_th', req_th, compile, ['']) test('T24159_viewpat', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a7ddc7b8ce8dae666fd511eddee12a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a7ddc7b8ce8dae666fd511eddee12a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: Fix GHC.Internal.Prim haddock
by Marge Bot (＠marge-bot) 07 Mar '26

07 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 12f8b829 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Fix GHC.Internal.Prim haddock Haddock used to parse Haskell source to generate documentation, but switched to using interface files instead. This broke documentation of the GHC.Internal.Prim module, since it's a wired-in interface that didn't provide a document structure. This patch adds the missing document structure and updates genprimopcode to make the section headers and descriptions available. fixes #26954 - - - - - f87e5e57 by Luite Stegeman at 2026-03-07T05:03:33-05:00 Remove obsolete --make-haskell-source from genprimopcode Now that haddock uses the wired-in interface for GHC.Internal.Prim, the generated Haskell source file is no longer needed. Remove the --make-haskell-source code generator from genprimopcode and replace the generated GHC/Internal/Prim.hs with a minimal static source file. - - - - - 9 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Builtin/primops.txt.pp - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Builders/GenPrimopCode.hs - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/src/GHC/Internal/Prim.hs - testsuite/tests/pmcheck/should_compile/T11303.hs - utils/genprimopcode/Main.hs Changes: ===================================== compiler/GHC/Builtin/PrimOps.hs ===================================== @@ -17,7 +17,7 @@ module GHC.Builtin.PrimOps ( primOpOutOfLine, primOpCodeSize, primOpOkForSpeculation, primOpOkToDiscard, - primOpIsWorkFree, primOpIsCheap, primOpFixity, primOpDocs, primOpDeprecations, + primOpIsWorkFree, primOpIsCheap, primOpFixity, primOpDocs, PrimOpDoc(..), primOpDeprecations, primOpIsDiv, primOpIsReallyInline, PrimOpEffect(..), primOpEffect, @@ -166,7 +166,13 @@ primOpFixity :: PrimOp -> Maybe Fixity See Note [GHC.Prim Docs] in GHC.Builtin.Utils -} -primOpDocs :: [(FastString, String)] +data PrimOpDoc + = -- | Section header with title and description + PrimOpSection String String + | -- | Documentation for a named declaration + PrimOpDecl FastString String + +primOpDocs :: [PrimOpDoc] #include "primop-docs.hs-incl" primOpDeprecations :: [(OccName, FastString)] ===================================== compiler/GHC/Builtin/Utils.hs ===================================== @@ -246,12 +246,39 @@ ghcPrimExports | tc <- exposedPrimTyCons, let n = tyConName tc ] ghcPrimDeclDocs :: Docs -ghcPrimDeclDocs = emptyDocs { docs_decls = listToUniqMap $ mapMaybe findName primOpDocs } +ghcPrimDeclDocs = emptyDocs + { docs_decls = listToUniqMap $ mapMaybe declDoc primOpDocs + , docs_structure = buildStructure primOpDocs + } where - findName (nameStr, doc) - | Just name <- lookupFsEnv ghcPrimNames nameStr - = Just (name, [WithHsDocIdentifiers (mkGeneratedHsDocString doc) []]) - | otherwise = Nothing + declDoc (PrimOpDecl fs doc) + | not (null doc) + , Just name <- lookupFsEnv ghcPrimNames fs + = Just (name, [mkHsDoc doc]) + declDoc _ = Nothing + + buildStructure [] = [] + buildStructure (PrimOpSection title desc : rest) = + DsiSectionHeading 1 (mkHsDoc title) + : [DsiDocChunk (mkHsDoc desc) | not (null desc)] + ++ buildStructure rest + buildStructure items = + let (decls, rest) = span isDecl items + avails = mapMaybe declAvail decls + in [DsiExports (DefinitelyDeterministicAvails avails) | not (null avails)] + ++ buildStructure rest + + isDecl (PrimOpDecl {}) = True + isDecl _ = False + + declAvail (PrimOpDecl fs _) + | Just name <- lookupFsEnv ghcPrimNames fs + = Just $ if isTyConName name + then AvailTC name [name] + else Avail name + declAvail _ = Nothing + + mkHsDoc s = WithHsDocIdentifiers (mkGeneratedHsDocString s) [] ghcPrimNames :: FastStringEnv Name ghcPrimNames @@ -287,18 +314,13 @@ ghcPrimFixities = fixities {- Note [GHC.Prim Docs] ~~~~~~~~~~~~~~~~~~~~ -For haddocks of GHC.Prim we generate a dummy haskell file (gen_hs_source) that -contains the type signatures and the comments (but no implementations) -specifically for consumption by haddock. - -GHCi's :doc command reads directly from ModIface's though, and GHC.Prim has a -wired-in iface that has nothing to do with the above haskell file. The code -below converts primops.txt into an intermediate form that would later be turned -into a proper DeclDocMap. - -We output the docs as a list of pairs (name, docs). We use stringy names here -because mapping names to "Name"s is difficult for things like primtypes and -pseudoops. +GHCi's :doc command and Haddock read from ModIface's. GHC.Prim has a wired-in +iface whose docs are populated from primops.txt. + +genprimopcode --wired-in-docs generates the primOpDocs list (included as +primop-docs.hs-incl), which contains section headers (PrimOpSection) and +per-declaration documentation (PrimOpDecl). We use stringy names because +mapping names to "Name"s is difficult for things like primtypes and pseudoops. Note [GHC.Prim Deprecations] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Builtin/primops.txt.pp ===================================== @@ -46,7 +46,7 @@ -- * The primitives are listed in this file, primops.txt.pp. -- It goes through CPP, which creates primops.txt. -- It is then consumed by the utility program genprimopcode, which produces --- the following three types of files. +-- the following types of files. -- -- 1. The files with extension .hs-incl. -- They can be found by grepping for hs-incl. @@ -71,12 +71,7 @@ -- Additionally, we pattern match on PrimOp when generating Cmm in -- GHC/StgToCmm/Prim.hs. -- --- 2. The dummy Prim.hs file, which is used for Haddock and --- contains descriptions taken from primops.txt.pp. --- All definitions are replaced by placeholders. --- See Note [GHC.Prim Docs] in GHC.Builtin.Utils. --- --- 3. The module PrimopWrappers.hs, which wraps every call for GHCi; +-- 2. The module PrimopWrappers.hs, which wraps every call for GHCi; -- see Note [Primop wrappers] in GHC.Builtin.Primops for details. -- -- * This file does not list internal-only equality types ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -49,7 +49,7 @@ ghcInternalDependencies :: Expr [FilePath] ghcInternalDependencies = do stage <- getStage path <- expr $ buildPath (vanillaContext stage ghcInternal) - return [path -/- "GHC/Internal/Prim.hs", path -/- "GHC/Internal/PrimopWrappers.hs"] + return [path -/- "GHC/Internal/PrimopWrappers.hs"] rtsDependencies :: Expr [FilePath] rtsDependencies = do @@ -141,7 +141,6 @@ generatePackageCode context@(Context stage pkg _ _) = do root -/- "**" -/- dir -/- "GHC/Settings/Config.hs" %> go generateConfigHs root -/- "**" -/- dir -/- "*.hs-incl" %> genPrimopCode context when (pkg == ghcInternal) $ do - root -/- "**" -/- dir -/- "GHC/Internal/Prim.hs" %> genPrimopCode context root -/- "**" -/- dir -/- "GHC/Internal/PrimopWrappers.hs" %> genPrimopCode context when (pkg == ghcBoot) $ do root -/- "**" -/- dir -/- "GHC/Version.hs" %> go generateVersionHs ===================================== hadrian/src/Settings/Builders/GenPrimopCode.hs ===================================== @@ -5,7 +5,6 @@ import Settings.Builders.Common genPrimopCodeBuilderArgs :: Args genPrimopCodeBuilderArgs = builder GenPrimopCode ? mconcat [ output "//PrimopWrappers.hs" ? arg "--make-haskell-wrappers" - , output "//Prim.hs" ? arg "--make-haskell-source" , output "//primop-data-decl.hs-incl" ? arg "--data-decl" , output "//primop-tag.hs-incl" ? arg "--primop-tag" , output "//primop-list.hs-incl" ? arg "--primop-list" ===================================== libraries/ghc-internal/ghc-internal.cabal.in ===================================== @@ -357,7 +357,6 @@ Library GHC.Internal.Types autogen-modules: - GHC.Internal.Prim GHC.Internal.PrimopWrappers other-modules: ===================================== libraries/ghc-internal/src/GHC/Internal/Prim.hs ===================================== @@ -0,0 +1,11 @@ +{-# LANGUAGE Unsafe #-} +{-# LANGUAGE NoImplicitPrelude #-} + +-- | GHC's primitive types and operations. +-- Use GHC.Exts from the base package instead of importing this +-- module directly. +-- +-- This module has no source-level definitions. All primitive types +-- and operations are wired-in to GHC. See Note [GHC.Prim] in +-- primops.txt.pp. +module GHC.Internal.Prim () where ===================================== testsuite/tests/pmcheck/should_compile/T11303.hs ===================================== @@ -24,6 +24,5 @@ main = do "--primop-vector-maps" -> "hmmm" "--primop-vector-paper" -> "hmmm" "--make-haskell-wrappers" -> "123512" - "--make-haskell-source" -> "as;dg" "--make-latex-doc" -> "adghiw" _ -> error "Should not happen, known_args out of sync?" ===================================== utils/genprimopcode/Main.hs ===================================== @@ -204,9 +204,6 @@ main = getArgs >>= \args -> "--make-haskell-wrappers" -> putStr (gen_wrappers p_o_specs) - "--make-haskell-source" - -> putStr (gen_hs_source p_o_specs) - "--wired-in-docs" -> putStr (gen_wired_in_docs p_o_specs) @@ -238,7 +235,6 @@ known_args "--primop-vector-tys-exports", "--primop-vector-tycons", "--make-haskell-wrappers", - "--make-haskell-source", "--make-latex-doc", "--wired-in-docs", "--wired-in-deprecations", @@ -249,149 +245,6 @@ known_args -- Code generators ----------------------------------------------- ------------------------------------------------------------------ -gen_hs_source :: Info -> String -gen_hs_source (Info defaults entries) = - "{-\n" - ++ "This is a generated file (generated by genprimopcode).\n" - ++ "It is not code to actually be used. Its only purpose is to be\n" - ++ "consumed by haddock.\n" - ++ "-}\n" - ++ "\n" - ++ (replicate 77 '-' ++ "\n") -- For 80-col cleanliness - ++ "-- |\n" - ++ "-- Module : GHC.Internal.Prim\n" - ++ "-- \n" - ++ "-- Maintainer : ghc-devs(a)haskell.org\n" - ++ "-- Stability : internal\n" - ++ "-- Portability : non-portable (GHC extensions)\n" - ++ "--\n" - ++ "-- GHC\'s primitive types and operations.\n" - ++ "-- Use GHC.Exts from the base package instead of importing this\n" - ++ "-- module directly.\n" - ++ "--\n" - ++ (replicate 77 '-' ++ "\n") -- For 80-col cleanliness - ++ "{-# LANGUAGE Unsafe #-}\n" - ++ "{-# LANGUAGE MagicHash #-}\n" - ++ "{-# LANGUAGE MultiParamTypeClasses #-}\n" - ++ "{-# LANGUAGE NoImplicitPrelude #-}\n" - ++ "{-# LANGUAGE UnboxedTuples #-}\n" - ++ "{-# LANGUAGE NegativeLiterals #-}\n" - - ++ "{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}\n" - -- We generate a binding for coerce, like - -- coerce :: Coercible a b => a -> b - -- coerce = let x = x in x - -- and we don't want a complaint that the constraint is redundant - -- Remember, this silly file is only for Haddock's consumption - - ++ "{-# OPTIONS_HADDOCK print-explicit-runtime-reps #-}\n" - ++ "module GHC.Internal.Prim (\n" - ++ unlines (map ((" " ++) . hdr) entries') - ++ ") where\n" - ++ "\n" - ++ "{-\n" - ++ unlines (map opt defaults) - ++ "-}\n" - -- this import introduces a loop between GHC.Internal.Types and - -- GHC.Internal.Prim. - -- ++ "import GHC.Internal.Types (Coercible)\n" - - ++ "default ()" -- If we don't say this then the default type include Integer - -- so that runs off and loads modules that are not part of - -- package ghc-prim at all. And that in turn somehow ends up - -- with Declaration for $fEqMaybe: - -- attempting to use module ‘GHC.Classes’ - -- (libraries/ghc-prim/./GHC/Classes.hs) which is not loaded - -- coming from GHC.Iface.Load.homeModError - -- I'm not sure precisely why; but I *am* sure that we don't need - -- any type-class defaulting; and it's clearly wrong to need - -- the base package when haddocking ghc-prim - - -- Now the main payload - ++ "\n" ++ unlines (concatMap ent entries') ++ "\n\n\n" - - where entries' = concatMap desugarVectorSpec entries - - opt (OptionFalse n) = n ++ " = False" - opt (OptionTrue n) = n ++ " = True" - opt (OptionString n v) = n ++ " = { " ++ v ++ "}" - opt (OptionInteger n v) = n ++ " = " ++ show v - opt (OptionVector _) = "" - opt (OptionFixity mf) = "fixity = " ++ show mf - opt (OptionEffect eff) = "effect = " ++ show eff - opt (OptionDefinedBits bc) = "defined_bits = " ++ show bc - opt (OptionCanFailWarnFlag wf) = "can_fail_warning = " ++ show wf - - hdr s@(Section {}) = sec s - hdr (PrimOpSpec { name = n }) = wrapOp n ++ "," - hdr (PrimVecOpSpec { name = n }) = wrapOp n ++ "," - hdr (PseudoOpSpec { name = n }) = wrapOp n ++ "," - hdr (PrimTypeSpec { ty = TyApp (TyCon n) _ }) = wrapOp n ++ "," - hdr (PrimTypeSpec {}) = error $ "Illegal type spec" - hdr (PrimVecTypeSpec { ty = TyApp (VecTyCon n _) _ }) = wrapOp n ++ "," - hdr (PrimVecTypeSpec {}) = error $ "Illegal type spec" - - sec s = "\n{- * " ++ title s ++ "-}\n{-|" ++ desc s ++ "-}" - - - ent (Section {}) = [] - ent o@(PrimOpSpec {}) = spec o - ent o@(PrimVecOpSpec {}) = spec o - ent o@(PrimTypeSpec {}) = spec o - ent o@(PrimVecTypeSpec {}) = spec o - ent o@(PseudoOpSpec {}) = spec o - - spec o = ([ "" ] ++) . concat $ - -- Doc comments - [ case desc o ++ extra (opts o) of - "" -> [] - cmmt -> lines ("{-|" ++ cmmt ++ "-}") - - -- Deprecations - , [ d | Just n <- [getName o], d <- prim_deprecated (opts o) n ] - - -- Fixity - , [ f | Just n <- [getName o], f <- prim_fixity (opts o) n ] - - -- Declarations (see Note [Placeholder declarations]) - , case o of - PrimOpSpec { name = n, ty = t } -> prim_func n t - PrimVecOpSpec { name = n, ty = t } -> prim_func n t - PseudoOpSpec { name = n, ty = t } -> prim_func n t - PrimTypeSpec { ty = t } -> prim_data t - PrimVecTypeSpec { ty = t } -> prim_data t - Section { } -> error "Section is not an entity" - ] - - extra options = case can_fail options of - [m] -> "\n\n__/Warning:/__ this " ++ m ++ "." - _ -> "" - - can_fail options - = [ "can fail with an unchecked exception" - | Just (OptionEffect eff) <- [lookup_attrib "effect" options] - , Just (OptionCanFailWarnFlag wflag) <- [lookup_attrib "can_fail_warning" options] - , wflag /= DoNotWarnCanFail - , wflag == YesWarnCanFail || eff == CanFail ] - - prim_deprecated options n - = [ "{-# DEPRECATED " ++ wrapOp n ++ " \"" ++ msg ++ "\" #-}" - | Just (OptionString _ msg) - <- [lookup_attrib "deprecated_msg" options] ] - - prim_fixity options n - = [ pprFixityDir d ++ " " ++ show i ++ " " ++ asInfix n - | OptionFixity (Just (Fixity i d)) <- options ] - - prim_func n t = [ wrapOp n ++ " :: " ++ pprTy t, - wrapOp n ++ " = " ++ funcRhs n ] - - funcRhs "tagToEnum#" = "let x = x in x" - funcRhs nm = wrapOp nm - -- Special case for tagToEnum#: see Note [Placeholder declarations] - - prim_data t = [ "data " ++ pprTy t ] - -- | Extract a string representation of the name getName :: Entry -> Maybe String getName PrimOpSpec{ name = n } = Just n @@ -401,25 +254,6 @@ getName PrimTypeSpec{ ty = TyApp tc _ } = Just (show tc) getName PrimVecTypeSpec{ ty = TyApp tc _ } = Just (show tc) getName _ = Nothing -{- Note [Placeholder declarations] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -We are generating fake declarations for things in GHC.Internal.Prim, just to -keep GHC's renamer and typechecker happy enough for what Haddock -needs. Our main plan is to say - foo :: <type> - foo = foo - -That works for all the primitive functions except tagToEnum#. -If we generate the binding - tagToEnum# = tagToEnum# -GHC will complain about "tagToEnum# must appear applied to one argument". -We could hack GHC to silence this complaint when compiling GHC.Internal.Prim, -but it seems easier to generate - tagToEnum# = let x = x in x -We don't do this for *all* bindings because for ones with an unboxed -RHS we would get other complaints (e.g.can't unify "*" with "#"). --} - -- | "Pretty"-print a type pprTy :: Ty -> String pprTy = pty @@ -442,11 +276,6 @@ wrapOp :: String -> String wrapOp nm | isAlpha (head nm) = nm | otherwise = "(" ++ nm ++ ")" --- | Turn an identifier or operator into its infix form -asInfix :: String -> String -asInfix nm | isAlpha (head nm) = "`" ++ nm ++ "`" - | otherwise = nm - {- Note [OPTIONS_GHC in GHC.PrimopWrappers] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -666,11 +495,30 @@ gen_switch_from_attribs attrib_name fn_name (Info defaults entries) -- See Note [GHC.Prim Docs] in GHC.Builtin.Utils gen_wired_in_docs :: Info -> String gen_wired_in_docs (Info _ entries) - = "primOpDocs =\n [ " ++ intercalate "\n , " (catMaybes $ map mkDoc $ concatMap desugarVectorSpec entries) ++ "\n ]\n" + = "primOpDocs =\n [ " + ++ intercalate "\n , " (concatMap mkEntry desugared) + ++ "\n ]\n" where - mkDoc po | Just poName <- getName po - , not $ null $ desc po = Just $ "(fsLit " ++ show poName ++ "," ++ show (desc po) ++ ")" - | otherwise = Nothing + desugared = concatMap desugarVectorSpec entries + + mkEntry :: Entry -> [String] + mkEntry (Section{title = t, desc = d}) = + ["PrimOpSection " ++ show t ++ " " ++ show d] + mkEntry po + | Just poName <- getName po + = ["PrimOpDecl (fsLit " ++ show poName ++ ") " ++ show (desc po ++ extra (opts po))] + | otherwise = [] + + extra options = case canFail options of + [m] -> "\n\n__/Warning:/__ this " ++ m ++ "." + _ -> "" + + canFail options + = [ "can fail with an unchecked exception" + | Just (OptionEffect eff) <- [lookup_attrib "effect" options] + , Just (OptionCanFailWarnFlag wflag) <- [lookup_attrib "can_fail_warning" options] + , wflag /= DoNotWarnCanFail + , wflag == YesWarnCanFail || eff == CanFail ] -- See Note [GHC.Prim Deprecations] in GHC.Builtin.Utils gen_wired_in_deprecations :: Info -> String View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eca445e7c002077afdb5bdd100daaa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eca445e7c002077afdb5bdd100daaa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] drop deb9/10 from CI, add deb13
by Marge Bot (＠marge-bot) 07 Mar '26

07 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: eca445e7 by mangoiv at 2026-03-07T05:02:36-05:00 drop deb9/10 from CI, add deb13 debian 9 and 10 are end of life, hence we drop them from our CI, but we do add debian 13. Jobs that were previously run on 9 and 10 run on 13, too, jobs that were run on 10, are run on 11 now. Jobs that were previously run on debian 12 are run on debian 13 now. This MR also updates hadrian's bootstrap plans for that reason. Metric Decrease: T9872d - - - - - 13 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - hadrian/bootstrap/generate_bootstrap_plans - hadrian/bootstrap/plan-9_10_1.json - hadrian/bootstrap/plan-9_10_2.json - + hadrian/bootstrap/plan-9_10_3.json - hadrian/bootstrap/plan-bootstrap-9_10_1.json - hadrian/bootstrap/plan-bootstrap-9_10_2.json - + hadrian/bootstrap/plan-bootstrap-9_10_3.json - testsuite/driver/perf_notes.py The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eca445e7c002077afdb5bdd100daaa1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eca445e7c002077afdb5bdd100daaa1… You're receiving this email because of your account on gitlab.haskell.org.

1 0