- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/T26989] 42 commits: NCG: Implement constant folding for vector simd ops (Issue #25030)
by Simon Peyton Jones (＠simonpj) 29 Apr '26

29 Apr '26

Simon Peyton Jones pushed to branch wip/T26989 at Glasgow Haskell Compiler / GHC Commits: 72d6dc74 by aparker at 2026-04-20T20:15:44-04:00 NCG: Implement constant folding for vector simd ops (Issue #25030) - - - - - b9cab907 by sheaf at 2026-04-20T20:15:44-04:00 Mark some SIMD tests as broken on i386 optllvm As seen in #25498, several SIMD tests are broken on i386 in the optllvm way. This commit marks them as "expect_broken". - - - - - 76528cc3 by Wolfgang Jeltsch at 2026-04-20T20:16:25-04:00 Move most of the `System.IO` implementation into `base` This involves a rewrite of the `combine` helper function to avoid the use of `last`, which would now be flagged as an error. Metric Decrease: LinkableUsage01 T3294 Metric Increase: T12227 T12707 T5642 - - - - - 04d143c0 by Luite Stegeman at 2026-04-21T14:05:33-04:00 rts: add a few missing i386 relocations in the rts linker - - - - - 014087e7 by Luite Stegeman at 2026-04-21T14:05:34-04:00 CodeOutput: Fix finalizers on multiple platforms - ELF platforms: emit .fini_array section - wasm32/Darwin: emit initializer with __cxa_atexit call - Windows: use -Wl,--whole-archive to prevent dropping finalizer symbols - rts linker: fix crash/assertion failure unloading objects with finalizers fixes #27072 - - - - - 915bba6f by Simon Jakobi at 2026-04-21T14:06:16-04:00 Add regression test for #10531 Closes #10531. - - - - - 86a646a6 by Andreas Klebinger at 2026-04-22T13:00:05-04:00 Revert use of generic instances for compiler time perf reasons. Revert "Derive Semigroup/Monoid for instances believed could be derived in #25871" This reverts commit 11a04cbb221cc404fe00d65d7c951558ede4caa9. Revert "add Ghc.Data.Pair deriving" This reverts commit 15d9ce449e1be8c01b89fd39bdf1e700ea7d1dce. - - - - - bc9ee1cf by Wen Kokke at 2026-04-22T13:00:51-04:00 hadrian: Fix docs to remove static flavour In 638f6548, the static flavour was turned into into the fully_static flavour transformer. However, this commit did not update flavours.md. - - - - - cc9cc6d5 by Cheng Shao at 2026-04-23T09:40:46+00:00 configure: bump LlvmMaxVersion to 23 This patch bumps `LlvmMaxVersion` to 23 to support LLVM 22.x releases. - - - - - 2ea7ef8e by Cheng Shao at 2026-04-23T09:46:26+00:00 changelog: add llvm 22.x support - - - - - 5574ee10 by Cheng Shao at 2026-04-24T08:24:30-04:00 compiler: avoid unused temporary `appendFS` operands This patch fixes unused temporary `appendFS` operands in the codebase that are retained in the `FastString` table after concatenation. Rewrite rules are added so that if an operand is `fsLit`/`mkFastString`, the `appendFS` application is rewritten to append the `ShortByteString` operands first. The patch also fixes `sconcat` behavior to align with `mconcat` for the same reason. Fixes #27205. - - - - - 4ed78760 by mangoiv at 2026-04-24T08:25:13-04:00 contributing: adjust MR template to be less verbose - MR template only shows text that is relevant for submissiong - MR template was rewritten so it's readable from a user's and reviewer's perspective Resolves #27165 Co-Authored-By: @sheaf - - - - - 87db83e2 by Cheng Shao at 2026-04-24T14:37:21-04:00 ci: bump freebsd boot ghc to 9.10.3 This commit bumps freebsd boot ghc to 9.10.3 to align with other platforms and prevent outdated boot libs in boot ghc to block the freebsd job. - - - - - 17e3a0b7 by Cheng Shao at 2026-04-24T14:37:21-04:00 compiler: improve Binary instance of Array This patch improves the `Binary` instance of `Array`: - We no longer allocate intermediate lists. When serializing an `Array`, we iterate over the elements directly; when deserializing it, we allocate the result `Array` and fill it in a loop. - Now we only serialize the array bounds tuple; the length field is not needed. Closes #27109. - - - - - 2d30f7d3 by sheaf at 2026-04-24T14:38:23-04:00 Vendor mini-QuickCheck for testsuite This commit extracts the vendored QuickCheck implementation from the foundation testsuite to make it more broadly available in the GHC testsuite, and makes use of it in the simd006 test (which also used a vendored QuickCheck implementation). On the way, we update the linear congruential generator to avoid the shortcoming of only generating 31 bit large numbers. Fixes #25990 and #25969. - - - - - 1350271b by sheaf at 2026-04-27T09:32:53-04:00 Ensure TcM plugins are only initialised once This commit ensures we keep TcM plugins (typechecker plugins, defaulting plugins and hole fit plugins) running all the way through desugaring, instead of stopping them at the end of typechecking. To do this, the "stop" actions of TcPlugin and DefaultingPlugin are split into two: one for the "post-typecheck" action, and one for the final shutdown action (after desugaring). This allows the plugins to be invoked by the pattern match checker (during desugaring) without having to be repeatedly re-initialised and stopped, fixing #26839. In the process, this commit modifies 'initTc' and 'initTcInteractive', adding an extra argument that describes whether to start/stop the 'TcM' plugins. See Note [Stop TcM plugins after desugaring] for an overview. - - - - - 42549222 by sheaf at 2026-04-27T09:33:50-04:00 Hadrian: add --keep-response-files This commit adds a Hadrian flag that allows response files to be retained. This is useful for debugging a failing Hadrian command line. - - - - - 40564e8d by sheaf at 2026-04-27T09:34:46-04:00 hadrian/build-cabal.bat: fix build on Windows Commit 8cb99552f6 introduced a warning for a missing package index. However, the logic was faulty on Windows: the piping was broken, and "remote-repo-cache:" was being interpreted as a (malformed) drive letter, leading to the error: The filename, directory name, or volume label syntax is incorrect. This commit fixes that by using a temporary file instead of piping. - - - - - 14bc71e4 by Sven Tennie at 2026-04-28T13:22:47-04:00 ghc: Distinguish between having an interpreter and having an internal one Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter Splitting the logic solves compiler warnings and expresses the intent better. - - - - - df691563 by Vladislav Zavialov at 2026-04-28T13:23:29-04:00 Refactor HsWildCardTy to use HoleKind (#27111) The payload of this patch is that the extension fields of HsWildCardTy and HsHole now match: type instance XWildCardTy Ghc{Ps,Rn} = HoleKind type instance XHole Ghc{Ps,Rn} = HoleKind This is progress towards unification of HsExpr and HsType. Test case: T25121_status In addition to that, exact-printing of infix holes is fixed. Test case: PprInfixHole - - - - - f3485446 by fendor at 2026-04-28T13:24:12-04:00 Expose startupHpc as an rts symbol - - - - - 28f07d70 by fendor at 2026-04-28T13:24:12-04:00 Make HPC work with bytecode interpreter Add support to generate .tix files from bytecode objects and the bytecode interpreter. Conceptually, we insert HPC ticks into the bytecode similar to how we insert breakpoints. HPC and breakpoints do not share the same tick array but we use a separate tick-array for hpc/breakpoint ticks during bytecode generation. We teach the bytecode interpreter to handle hpc ticks. The implementation is quite trivial, simply increment the counter in the global hpc_ticks array for the respective module. This hpc_ticks array is generated as part of the `CStub`, so we can rely on it existing. A tricky bit is "registering" a bytecode object for HPC instrumentation. In the compiled case, this is achieved via CStub and initializer/finalizers `.init` sections which are called when the executable is run. After the initializers have been invoked, which is before `hs_init_ghc`, we then call `startup_hpc` in `hs_init_ghc` iff any modules were "registered" for hpc instrumentation via `hs_hpc_module`. Since bytecode objects are loaded after starting up GHCi, this workflow doesn't work for supporting `hpc` and the `hpc` run-time is never started, even if a module is added for instrumentation. We fix this issue by employing the same technique as is for `SptEntry`s: * We introduce a new field to `CompiledByteCode`, called `ByteCodeHpcInfo` which contains enough information to call `hs_hpc_module`, allowing us to register the module for `hpc` instrumentation`. * After registering the module, we unconditionally call `startupHpc`, to make sure the .tix file is written. Calling `startupHpc` multiple times is safe. Calling `hs_hpc_module` multiple times for the same module is also safe. If we didn't register the hpc module in this way, evaluating a bytecode object instrumented with `-fhpc` without registering it in the `hpc` run-time will simply not generate any `.tix` files for this bytecode object. However, this shouldn't happen if everything is set up correctly. Closes #27036 - - - - - 950879f0 by Vladislav Zavialov at 2026-04-28T13:24:55-04:00 Move NamespaceSpecifier from x-fields into the AST proper (#26678) This refactoring moves NamespaceSpecifier out of extension fields and into the AST proper, as it is part of the user-written source, and is not pass-specific. Summary of changes: * Move NamespaceSpecifier from GHC/Hs/Basic.hs to Language/Haskell/Syntax/ImpExp.hs and parameterise it by the compiler pass, creating the necessary extension points * Move NamespaceSpecifier out of XFixitySig into FixitySig * Move NamespaceSpecifier out of XIEThingAll (IEThingAllExt) into IEThingAll * Move NamespaceSpecifier out of XIEWholeNamespace (IEWholeNamespaceExt) into IEWholeNamespace This is a pure refactoring with no change in behaviour. - - - - - 9797052b by Simon Peyton Jones at 2026-04-28T13:25:37-04:00 Fix assertion check in checkResultTy As #27210 shows, the assertion was a little bit too eager. I refactored a bit by moving some code from GHC.Tc.Gen.App to GHC.Tc.Utils.Unify; see the new function tcSubTypeApp, which replaces tcSubTypeDS - - - - - d5bb0a03 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Improve knownCon Eliminate simplInVar Just a refactoring to simplify the code - - - - - cbcbdca0 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Wibbles [skip ci] - - - - - f9d74d99 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Getting there [skip ci] - - - - - 381a7f8d by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Wibbles [skip ci] - - - - - 6c8e22c7 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More wibbles This now works - - - - - 40ff4c18 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibble - - - - - 6cd07658 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles Better management of casts - - - - - 63512d20 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 25493b85 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More small wibbles The important change here is in preInlineUnconditionally - - - - - 86ab76e8 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibble [skip ci] - - - - - e0def67f by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 wibbles - - - - - fccbe00a by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Refactor the Simplifier's handling of DupFlag ...and how it deals with re-simplification of argumnets - - - - - 88c503fe by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Update stderr tests ...mainly as a result of printing names for dead lambda binders (A debug-output change only.) - - - - - c71e3891 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Add MOutCoercion to ApplyToVal Nicer... but lets see what CI says - - - - - 4429fa64 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 1625b330 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Do not use mkCast during typechecking This commit fixes #27219. The problem was that the typechecker was using `mkCast`, whose assertion checks legitimately fail when applied to types that contain unification variables. - - - - - 4832bba6 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More improvements * pushCoValArg and pushCoTyArg return tyL, which is helpful for the caller * Don't optimise coercions if the type-substitution is empty. See Note [Optimising coercions] - - - - - f95593f6 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 289 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/merge_request_templates/Default.md - + changelog.d/T19174.md - + changelog.d/binary-array-no-list - + changelog.d/bytecode-interpreter-hpc-support - + changelog.d/fix-finalizers-27072 - + changelog.d/ghc-api-holes-ast-27111 - + changelog.d/ghc-api-namespace-specifier-26678 - + changelog.d/hadrian-response-files.md - + changelog.d/llvm-22 - + changelog.d/simd_constant_folding - + changelog.d/tcplugin_init.md - + changelog.d/tcplugins-pmc.md - + changelog.d/typecheckModule-API.md - + changelog.d/withTcPlugins.md - compiler/GHC.hs - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Binary.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Cmm/Opt.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Data/FastString.hs - compiler/GHC/Data/Pair.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Config/Core/Lint.hs - compiler/GHC/Driver/Env/Types.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Pipeline/Monad.hs - compiler/GHC/Driver/Pipeline/Phases.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Basic.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Coverage.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/HsToCore/Types.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Linker/Executable.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Interpreter.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/Tc/Errors/Hole.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Rewrite.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Utils/Backpack.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/ForeignStubs.hs - compiler/GHC/Types/HpcInfo.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/Unique/DSet.hs - compiler/GHC/Unit/Module/ModGuts.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Misc.hs - compiler/GHC/Utils/Ppr/Colour.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - configure.ac - docs/users_guide/extending_ghc.rst - ghc/GHC/Driver/Session/Mode.hs - ghc/GHCi/UI.hs - ghc/GHCi/UI/Info.hs - ghc/Main.hs - ghc/ghc-bin.cabal.in - hadrian/build-cabal.bat - hadrian/doc/flavours.md - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Settings/Packages.hs - libraries/base/src/Control/Concurrent.hs - libraries/base/src/GHC/IO/Handle.hs - libraries/base/src/Prelude.hs - libraries/base/src/System/IO.hs - libraries/base/src/Text/Printf.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - + libraries/ghci/GHCi/Coverage.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/Run.hs - libraries/ghci/ghci.cabal.in - rts/Disassembler.c - rts/Hpc.c - rts/Interpreter.c - rts/Linker.c - rts/LinkerInternals.h - rts/RtsSymbols.c - rts/include/rts/Bytecodes.h - rts/linker/Elf.c - testsuite/driver/testlib.py - + testsuite/tests/MiniQuickCheck.hs - testsuite/tests/codeGen/should_compile/T25177.stderr - + testsuite/tests/codeGen/should_run/T27072d.hs - + testsuite/tests/codeGen/should_run/T27072d.stdout - + testsuite/tests/codeGen/should_run/T27072d_c.c - + testsuite/tests/codeGen/should_run/T27072d_check.c - + testsuite/tests/codeGen/should_run/T27072w.hs - + testsuite/tests/codeGen/should_run/T27072w.stdout - + testsuite/tests/codeGen/should_run/T27072w_c.c - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/deSugar/should_compile/T13208.stdout - + testsuite/tests/driver/T10531/A.hs - + testsuite/tests/driver/T10531/B.hs - + testsuite/tests/driver/T10531/C.hs - + testsuite/tests/driver/T10531/Makefile - + testsuite/tests/driver/T10531/all.T - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/ghc-api/T26910.hs - testsuite/tests/ghc-api/T6145.hs - testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/hpc/Makefile - testsuite/tests/hpc/T17073.stdout → testsuite/tests/hpc/T17073a.stdout - + testsuite/tests/hpc/T17073b.stdout - testsuite/tests/hpc/T20568.stdout → testsuite/tests/hpc/T20568a.stdout - + testsuite/tests/hpc/T20568b.stdout - testsuite/tests/hpc/all.T - testsuite/tests/hpc/fork/Makefile - testsuite/tests/hpc/function/Makefile - testsuite/tests/hpc/function/test.T - + testsuite/tests/hpc/function/tough1.stderr - + testsuite/tests/hpc/function/tough1.stdout - testsuite/tests/hpc/function2/test.T - + testsuite/tests/hpc/function2/tough3.script - + testsuite/tests/hpc/ghc_ghci/BytecodeMain.hs - testsuite/tests/hpc/ghc_ghci/Makefile - + testsuite/tests/hpc/ghc_ghci/hpc_ghc_ghci_bytecode.stdout - + testsuite/tests/hpc/ghc_ghci/hpc_ghci01.stdout - + testsuite/tests/hpc/ghc_ghci/hpc_ghci02.stdout - testsuite/tests/hpc/ghc_ghci/test.T - testsuite/tests/hpc/simple/Makefile - + testsuite/tests/hpc/simple/hpc002.hs - + testsuite/tests/hpc/simple/hpc002.stdout - + testsuite/tests/hpc/simple/hpc003.hs - + testsuite/tests/hpc/simple/hpc003.script - + testsuite/tests/hpc/simple/hpc003.stdout - testsuite/tests/hpc/simple/test.T - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/numeric/should_compile/T15547.stderr - testsuite/tests/numeric/should_compile/T20347.stderr - testsuite/tests/numeric/should_compile/T20374.stderr - testsuite/tests/numeric/should_compile/T20376.stderr - testsuite/tests/numeric/should_run/all.T - testsuite/tests/numeric/should_run/foundation.hs - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/plugins/defaulting-plugin/DefaultInterference.hs - testsuite/tests/plugins/defaulting-plugin/DefaultInvalid.hs - testsuite/tests/plugins/defaulting-plugin/DefaultLifted.hs - testsuite/tests/plugins/defaulting-plugin/DefaultMultiParam.hs - testsuite/tests/plugins/echo-plugin/Echo.hs - testsuite/tests/printer/Makefile - + testsuite/tests/printer/PprInfixHole.hs - testsuite/tests/printer/T18052a.stderr - testsuite/tests/printer/all.T - testsuite/tests/quasiquotation/T7918.hs - + testsuite/tests/rts/linker/T27072/Lib.c - + testsuite/tests/rts/linker/T27072/Makefile - + testsuite/tests/rts/linker/T27072/T27072.stdout - + testsuite/tests/rts/linker/T27072/all.T - + testsuite/tests/rts/linker/T27072/main.c - + testsuite/tests/simd/should_run/Makefile - + testsuite/tests/simd/should_run/T25030.hs - + testsuite/tests/simd/should_run/T25030.stdout - testsuite/tests/simd/should_run/all.T - testsuite/tests/simd/should_run/simd006.hs - testsuite/tests/simplCore/should_compile/DsSpecPragmas.stderr - testsuite/tests/simplCore/should_compile/RewriteHigherOrderPatterns.stderr - testsuite/tests/simplCore/should_compile/T18668.stderr - testsuite/tests/simplCore/should_compile/T19246.stderr - testsuite/tests/simplCore/should_compile/T19599.stderr - testsuite/tests/simplCore/should_compile/T19599a.stderr - testsuite/tests/simplCore/should_compile/T21917.stderr - testsuite/tests/simplCore/should_compile/T23074.stderr - testsuite/tests/simplCore/should_compile/T25160.stderr - testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-64 - testsuite/tests/simplCore/should_compile/T26051.stderr - testsuite/tests/simplCore/should_compile/T26116.stderr - testsuite/tests/simplCore/should_compile/T8331.stderr - testsuite/tests/simplCore/should_compile/T8848a.stderr - testsuite/tests/tcplugins/Common.hs - testsuite/tests/tcplugins/RewritePerfPlugin.hs - testsuite/tests/tcplugins/T11462_Plugin.hs - testsuite/tests/tcplugins/T11525_Plugin.hs - testsuite/tests/tcplugins/T26395_Plugin.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.script - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.stderr - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.stdout - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.hs-boot - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.stderr - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode_aux.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Warn.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Warn.stderr - testsuite/tests/tcplugins/all.T - + testsuite/tests/tcplugins/tc-plugin-initstop/Makefile - + testsuite/tests/tcplugins/tc-plugin-initstop/Setup.hs - + testsuite/tests/tcplugins/tc-plugin-initstop/TcPlugin_InitStop_Plugin.hs - + testsuite/tests/tcplugins/tc-plugin-initstop/tc-plugin-initstop.cabal - testsuite/tests/th/all.T - testsuite/tests/typecheck/should_compile/T13032.stderr - testsuite/tests/typecheck/should_compile/T9497a.stderr - testsuite/tests/typecheck/should_compile/holes.stderr - testsuite/tests/typecheck/should_compile/holes3.stderr - testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr - + testsuite/tests/typecheck/should_fail/T27210.hs - + testsuite/tests/typecheck/should_fail/T27210.stderr - testsuite/tests/typecheck/should_fail/T9497d.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_run/T9497a-run.stderr - testsuite/tests/typecheck/should_run/T9497b-run.stderr - testsuite/tests/typecheck/should_run/T9497c-run.stderr - testsuite/tests/wasm/should_run/control-flow/LoadCmmGroup.hs - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug973.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/DefaultSignatures.html - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/PatternSyns.html - utils/haddock/html-test/ref/PatternSyns2.html - utils/haddock/html-test/ref/QuasiExpr.html - utils/haddock/html-test/ref/Test.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bd1503ad5f3a70b0543be3c2ab9415… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bd1503ad5f3a70b0543be3c2ab9415… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] 2 commits: Polish the code for home module ranking
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 6ab43ba8 by Wolfgang Jeltsch at 2026-04-29T14:52:41+03:00 Polish the code for home module ranking - - - - - 46de7d57 by Wolfgang Jeltsch at 2026-04-29T14:52:52+03:00 Make the `mg_home_module_name_providers_map` field lazy - - - - - 2 changed files: - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Module/Graph.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -252,25 +252,37 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit hpt_deps :: Set.Set UnitId hpt_deps = homeUnitDepends units - sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps + sorted_deps = rankedHomeUnits home_module_name_providers_map mod_name hpt_deps other_fopts = [ (uid, initFinderOpts (homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue))) | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] +rankedHomeUnits :: HomeModuleNameProvidersMap + -> ModuleName + -> Set.Set UnitId + -> [UnitId] +rankedHomeUnits _ _ hpt_deps | Set.null hpt_deps + = [] +rankedHomeUnits home_module_name_providers_map mod_name hpt_deps + = Set.toList cached_deps ++ Set.toList uncached_deps + where + + cached_providers :: Set.Set UnitId + cached_providers = lookupWithDefaultUniqMap home_module_name_providers_map + Set.empty + mod_name + + cached_deps :: Set.Set UnitId + cached_deps = Set.intersection hpt_deps cached_providers + + uncached_deps :: Set.Set UnitId + uncached_deps = Set.difference hpt_deps cached_providers {- - With the above shortcut, evaluation of the module graph will not be - triggered. + The special handling of the case that the dependency set is empty does not + change the result, but it avoids triggering evaluation of the module graph. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = - let - cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) - uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as ===================================== compiler/GHC/Unit/Module/Graph.hs ===================================== @@ -206,7 +206,7 @@ data ModuleGraph = ModuleGraph -- Cached computation, whether any of the ModuleGraphNode are isHoleModule, -- This is only used for a hack in GHC.Iface.Load to do with backpack, please -- remove this at the earliest opportunity. - , mg_home_module_name_providers_map :: !HomeModuleNameProvidersMap + , mg_home_module_name_providers_map :: HomeModuleNameProvidersMap -- ^ For each module name, which home units provide it. } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54eb5564af32c490e9493d966c67be… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54eb5564af32c490e9493d966c67be… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/T27202
by Hannes Siebenhandl (＠fendor) 29 Apr '26

29 Apr '26

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

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Polish the code for home module ranking
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 54eb5564 by Wolfgang Jeltsch at 2026-04-29T13:56:48+03:00 Polish the code for home module ranking - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -259,18 +259,30 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] +rankedHomeUnits :: HomeModuleNameProvidersMap + -> ModuleName + -> Set.Set UnitId + -> [UnitId] +rankedHomeUnits _ _ hpt_deps | Set.null hpt_deps + = [] +rankedHomeUnits home_module_name_providers_map mod_name hpt_deps + = Set.toList cached_deps ++ Set.toList uncached_deps + where + + cached_providers :: Set.Set UnitID + cached_providers = lookupWithDefaultUniqMap home_module_name_providers_map + Set.empty + mod_name + + cached_deps :: Set.Set UnitID + cached_deps = Set.intersection hpt_deps cached_providers + + uncached_deps :: Set.Set UnitID + uncached_deps = Set.difference hpt_deps cached_providers {- - With the above shortcut, evaluation of the module graph will not be - triggered. + The special handling of the case that the dependency set is empty does not + change the result, but it avoids triggering evaluation of the module graph. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = - let - cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) - uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54eb5564af32c490e9493d966c67be0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54eb5564af32c490e9493d966c67be0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Remove the sorted-dependencies `assertPpr`
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 36e0da1f by Wolfgang Jeltsch at 2026-04-29T13:17:06+03:00 Remove the sorted-dependencies `assertPpr` After the recent code simplifications, the assertion is now obviously true. - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -270,16 +270,7 @@ sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - - all_deps = cached_providing_deps ++ uncached_providing_deps - in - assertPpr - (hpt_deps == Set.fromList all_deps) - ( text "Sorting must not remove HomeUnits" - $$ text "Module:" <+> ppr mod_name - $$ text "Original:" <+> ppr hpt_deps - $$ text "Sorted: " <+> ppr (Set.fromList all_deps)) - all_deps + in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/36e0da1fb67cae7f0902a8a35d19317… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/36e0da1fb67cae7f0902a8a35d19317… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Remove the sorted-dependencies `assertPpr`
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 47572cf0 by Wolfgang Jeltsch at 2026-04-29T13:14:14+03:00 Remove the sorted-dependencies `assertPpr` The assertion is now obviously true. - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -270,16 +270,7 @@ sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - - all_deps = cached_providing_deps ++ uncached_providing_deps - in - assertPpr - (hpt_deps == Set.fromList all_deps) - ( text "Sorting must not remove HomeUnits" - $$ text "Module:" <+> ppr mod_name - $$ text "Original:" <+> ppr hpt_deps - $$ text "Sorted: " <+> ppr (Set.fromList all_deps)) - all_deps + in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47572cf0fb890fc8d830342c442a1d0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47572cf0fb890fc8d830342c442a1d0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Drop the removal of any home unit from the dependencies
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 24433502 by Wolfgang Jeltsch at 2026-04-29T13:07:28+03:00 Drop the removal of any home unit from the dependencies - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -252,32 +252,26 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit hpt_deps :: Set.Set UnitId hpt_deps = homeUnitDepends units - sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mb_home_unit_id mod_name hpt_deps + sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps other_fopts = [ (uid, initFinderOpts (homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue))) | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> Maybe UnitId -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ _ hpt_deps | Set.null hpt_deps = [] +sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] +sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] {- With the above shortcut, evaluation of the module graph will not be triggered. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mb_home_unit_id mod_name hpt_deps = +sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = let cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.intersection cached_module_providers hpt_deps - other_cached_providing_deps = - Set.toList $ - maybe cached_providing_deps (\u -> Set.delete u cached_providing_deps) mb_home_unit_id - uncached_providing_deps = - let candidates = Set.difference hpt_deps cached_module_providers - excluded = maybe Set.empty Set.singleton mb_home_unit_id - in Set.toList (Set.difference candidates excluded) - - all_deps = other_cached_providing_deps ++ uncached_providing_deps + cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) + uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) + + all_deps = cached_providing_deps ++ uncached_providing_deps in assertPpr (hpt_deps == Set.fromList all_deps) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/244335024d8774223e57bb857567fb7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/244335024d8774223e57bb857567fb7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-dlls-experimental] Only build the ghc lib the dynamic way if supported
by Duncan Coutts (＠dcoutts) 29 Apr '26

29 Apr '26

Duncan Coutts pushed to branch wip/dcoutts/windows-dlls-experimental at Glasgow Haskell Compiler / GHC Commits: 276642f7 by Duncan Coutts at 2026-04-29T10:28:59+01:00 Only build the ghc lib the dynamic way if supported It is not supported on Windows, yet. The problem is that we hit the 64k limit on the number of exported symbols for a single dll. We delegate to the defaultDynamicGhcPrograms predicate to decide if it is supported. - - - - - 2 changed files: - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs Changes: ===================================== hadrian/src/Packages.hs ===================================== @@ -13,6 +13,7 @@ module Packages ( transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, + ghcApiPackages, isGhcApiPackage, -- * Package information crossPrefix, programName, nonHsMainPackage, programPath, timeoutPath, @@ -49,6 +50,16 @@ ghcPackages = isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) +-- | This package list contains the ghc api package (called 'compiler' here), +-- and all the libraries (not programs) that depend on the ghc api package. +-- This is used to special-case things for the ghc api package and its deps. +-- +ghcApiPackages :: [Package] +ghcApiPackages = [compiler, haddockApi] + +isGhcApiPackage :: Package -> Bool +isGhcApiPackage = (`elem` ghcApiPackages) + -- | Package definitions, see 'Package'. array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -226,6 +226,7 @@ defaultLibraryWays = do [ pure [vanilla] , notStage0 ? pure [profiling] , notStage0 ? platformSupportsSharedLibs + ? onlyDynGhcLibIfSupported ? pure [dynamic, profilingDynamic] ] @@ -233,6 +234,16 @@ defaultLibraryWays = do else do stage <- getStage Set.singleton <$> expr (programWay stage pkg) +-- | Only build the ghc library (and libs that depend on it) the dynamic way, +-- if the platform supports it. +-- +onlyDynGhcLibIfSupported :: Predicate +onlyDynGhcLibIfSupported = do + pkg <- getPackage + if isGhcApiPackage pkg + then expr defaultDynamicGhcPrograms + else pure True + -- | Default build ways for the RTS. defaultRtsWays :: Ways defaultRtsWays = Set.fromList <$> @@ -323,7 +334,7 @@ defaultDynamicGhcPrograms = do supportsShared <- platformSupportsSharedLibs winTarget <- isWinTarget -- For now, don't build dynamic ghc on windows because we hit dll - -- symbol limits for the ghc library. + -- symbol limits for the ghc library. See issue #27162. return (supportsShared && not winTarget) -- | All 'Builder'-dependent command line arguments. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/276642f7382f269346d8a22e6c21e59… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/276642f7382f269346d8a22e6c21e59… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Get rid of removal of already removed unit IDs
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 97bbca85 by Wolfgang Jeltsch at 2026-04-29T12:34:28+03:00 Get rid of removal of already removed unit IDs - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -274,7 +274,7 @@ sortHomeUnitsByLikelihoodFor home_module_name_providers_map mb_home_unit_id mod_ maybe cached_providing_deps (\u -> Set.delete u cached_providing_deps) mb_home_unit_id uncached_providing_deps = let candidates = Set.difference hpt_deps cached_module_providers - excluded = maybe cached_providing_deps (\u -> Set.insert u cached_providing_deps) mb_home_unit_id + excluded = maybe Set.empty Set.singleton mb_home_unit_id in Set.toList (Set.difference candidates excluded) all_deps = other_cached_providing_deps ++ uncached_providing_deps View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97bbca8581a35a3f76f9cd73fdcabf3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97bbca8581a35a3f76f9cd73fdcabf3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 13 commits: Make cmm 'import "package" name;' syntax use consistent label types
by Marge Bot (＠marge-bot) 29 Apr '26

29 Apr '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 5841121f by Duncan Coutts at 2026-04-29T05:20:59-04:00 Make cmm 'import "package" name;' syntax use consistent label types There is a little-used syntactic form in cmm imports: import "package" foo; Which means to import foo from the given package (unit id, specified as a string). This syntax is somewhat reminiscent of GHC's package import extension. This syntax form is not used in the rts cmm code, nor any of the boot libraries. It may not be used at all. Unclear. Change the kind of CLabel this syntax generates to be consistent with the others. The other cmm imports use ForeignLabel with ForeignLabelInExternalPackage. For some reason this form was using CmmLabel. Change that to also be ForeignLabel but with ForeignLabelInPackage. This specifies a specific package, rather than an unnamed external package. - - - - - 674bdb80 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Change default cmm import statements to be internal Previously a cmm statement like: import foo; meant to expect the symbol from a different shared library than the current one. Now it means to expect the symbol from the same shared library as the current one. We'll add explicit syntax to indicate that it's a foreign import. Most existing uses are in fact intenal (rts to rts), so few imports will need to be annotated foreign. Examples would include cmm code in libraries (other than the rts) that need to access RTS APIs. In practice, this makes no difference whatsoever at the moment on any platform other than windows (where building Haskell libs as shared libs does not fully work yet), since the 'labelDynamic' treats all such labels as foreign, irrespective of the foreign label source. - - - - - 86454771 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Add cmm import syntax 'import DATA foo;' as better name for CLOSURE The existing syntax is: import CLOSURE foo; The new syntax is import DATA foo; This means to interpret the symbol foo as refering to data (i.e. a global constant or variable) rather than to code (a function). The historical syntax for this uses CLOSURE, which is rather misleading. Presumably this was done to avoid introducing new reserved words. Be less squemish about new reserved words and add DATA and use that. Keep the existing CLOSURE syntax as an alias for compatibility. - - - - - 0f2a7fe5 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Add cmm 'import extern name;' syntax Since the default for cmm imports is now for symbols within the same shared object, we need a way to indicate we want a symbol from an external shared object: import extern foo; -- for a function import extern DATA foo; -- for data This adds a new reserved word 'extern'. We don't expect to have to use this much. Most cmm imports are intra-DSO. This makes no difference currently on ELF and MachO platforms, but does make a difference to the linking conventions on PE (Windows). In future it's plausible we could take make distinctions on ELF or MachO, so it's worth trying to get it right. Windows can be the guinea pig. - - - - - 2ea81ff9 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Add cmm syntax 'import "package" DATA foo;' for completeness We already have: import DATA foo; -- for data imports import "package" foo; -- for imports from a given unitid There's no reason not to have both at once: import "package" DATA foo; So add that. - - - - - 3912ff93 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Improve the commentary for the cmm import grammar. AFAIK, this is the only place where GHC-style Cmm syntax is documented. - - - - - d7e33df7 by Duncan Coutts at 2026-04-29T05:20:59-04:00 Add a changelog.d entry for the .cmm import syntax changes - - - - - bd6f2e08 by Rodrigo Mesquita at 2026-04-29T05:21:00-04:00 New rts Message to {set,unset} TSO flags This commit introduces stg_MSG_SET_TSO_FLAG_info and stg_MSG_UNSET_TSO_FLAG_info, which allows setting flags of a TSO other than yourself. This is especially useful/necessary to set breakpoints and toggle breakpoints of different threads, which is needed to safely implement features like pausing, toggling step-out, toggling step-in per thread, etc. Fixes #27131 ------------------------- Metric Decrease: T3294 ------------------------- - - - - - 87a67f26 by Rodrigo Mesquita at 2026-04-29T05:21:00-04:00 test: Add test setting another TSO's flags Introduces a test that runs on two capabilities. The main thread running on Capability 0 sets the flags on a TSO running on Capability 1. The TSO from Capability 1 itself checks whether its flags were set and reports that back. This validates that the RTS messages for setting TSO flags work, even if it doesn't test a harsher scenario with race conditions to exercise why the message passing is necessary for safely setting another TSO's flags. Part of #27131 - - - - - 1dff17dd by David Eichmann at 2026-04-29T05:21:01-04:00 Hadrian: withResponseFile outputs response file when verbodity is Verbose At the Verbose verbosity, shake will display full commandlines. With the use of response files, the full command is hidden. That makes it hard to run the command manually. This commit outputs the contents of the response file so that that full command can be recreated and also hints at the use of the --keep-response-files hadrian flag. - - - - - c1d2f1d0 by Duncan Coutts at 2026-04-29T05:21:01-04:00 Use response files for hadrian linking with ghc (support long command lines) In future support for windows dynamic linking, we expect long command lines for linking dll files with ghc. Experiments with dynamic linking the ghc-internal library yielded a link command well over 32kb. We did not encounter this before for static libs, since we already use ar's @file feature (if available, which it is for the llvm toolchain). Co-authored-by: David Eichmann <davide(a)well-typed.com> - - - - - 86285b49 by Cheng Shao at 2026-04-29T05:21:02-04:00 compiler: avoid unique OccNames for internal Names in bytecode objects This patch improves bytecode object serialization logic by avoiding the construction of unique `OccName`s when serializing/deserializing internal `Name`s. Closes #27213. ------------------------- Metric Decrease: LinkableUsage01 ------------------------- - - - - - 8ae2a885 by Vladislav Zavialov at 2026-04-29T05:21:03-04:00 Replace GHC 9.16 references with GHC 10.0 - - - - - 30 changed files: - + changelog.d/T27131 - + changelog.d/cmm-import-syntax-changes - compiler/GHC/ByteCode/Binary.hs - compiler/GHC/Cmm/Lexer.x - compiler/GHC/Cmm/Parser.y - compiler/GHC/Driver/Flags.hs - docs/users_guide/debug-info.rst - docs/users_guide/exts/explicit_namespaces.rst - docs/users_guide/exts/linear_types.rst - docs/users_guide/exts/modifiers.rst - docs/users_guide/exts/qualified_strings.rst - docs/users_guide/exts/required_type_arguments.rst - docs/users_guide/using-warnings.rst - docs/users_guide/using.rst - hadrian/src/Builder.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Settings/Builders/Ghc.hs - rts/Interpreter.c - rts/Messages.c - rts/StgMiscClosures.cmm - rts/Threads.c - rts/Threads.h - rts/include/rts/storage/Closures.h - rts/include/stg/MiscClosures.h - + testsuite/tests/rts/T27131.hs - + testsuite/tests/rts/T27131.stdout - + testsuite/tests/rts/T27131_c.c - testsuite/tests/rts/all.T - testsuite/tests/typecheck/should_fail/all.T Changes: ===================================== changelog.d/T27131 ===================================== @@ -0,0 +1,8 @@ +section: rts +synopsis: Add rts Message to set/unset TSO flags +issues: #27131 +mrs: !15831 +description: This enables e.g. toggling breakpoints from different threads, + which is necessary to safely implement features like pausing, per-thread + step-in, and more in the haskell debugger. + ===================================== changelog.d/cmm-import-syntax-changes ===================================== @@ -0,0 +1,34 @@ +section: cmm +synopsis: Changes to Cmm hand-written syntax for symbol imports. +issues: #27162 +mrs: !15135 + +description: { + In hand-written Cmm, there is syntax to declare symbol names from outside of + the current .cmm file (e.g. .c or .cmm files). + + The existing syntax is + + > import foo; -- for a function + > import CLOSURE foo; -- for data + + and this implicitly meant that the symbol (`foo`) could be found in an + external shared library, not the current one. There was no syntax to specify + that the symbol should be found in the current shared library, i.e. in a + .cmm file (or .hs file) in the current Haskell package. + + The new syntax assumes local by default and allows specifying external: + + > import foo; -- for a function in the current lib + > import DATA foo; -- for data in the current lib + > import extern foo; -- for a function in an external lib + > import extern DATA foo; -- for data in an external lib + > import "unitid" foo; -- for a function in the Haskell unit "unitid" + > import "unitid" DATA foo; -- for data in the Haskell unit "unitid" + + In practice, the only platform where this can be expected to make a + difference is on Windows, and only when compiling each Haskell package as a + separate .dll dynamic library. +} + + ===================================== compiler/GHC/ByteCode/Binary.hs ===================================== @@ -20,7 +20,7 @@ module GHC.ByteCode.Binary ( import GHC.Prelude import GHC.ByteCode.Types -import GHC.Data.FastString +import qualified GHC.Data.Word64Map.Strict as Word64Map import GHC.Types.Name import GHC.Types.Name.Cache import GHC.Types.Name.Env @@ -291,9 +291,8 @@ addBinNameWriter bh' = do | otherwise -> do putByte bh 1 key <- getBinNameKey env_ref nm - -- Delimit the OccName from the deterministic counter to keep the - -- encoding injective, avoiding collisions like "foo1" vs "foo#1". - put_ bh (occNameFS (occName nm) `appendFS` mkFastString ('#' : show key)) + put_ bh $ occNameFS $ occName nm + put_ bh key where -- Find a deterministic key for local names. This getBinNameKey ref name = do @@ -304,7 +303,7 @@ addBinNameWriter bh' = do addBinNameReader :: NameCache -> ReadBinHandle -> IO ReadBinHandle addBinNameReader nc bh' = do - env_ref <- newIORef emptyOccEnv + env_ref <- newIORef Word64Map.empty pure $ flip addReaderToUserData bh' $ BinaryReader $ \bh -> do t <- getByte bh case t of @@ -313,15 +312,16 @@ addBinNameReader nc bh' = do pure $ BinName nm 1 -> do occ <- mkVarOccFS <$> get bh + key <- get bh -- We don't want to get a new unique from the NameCache each time we -- see a name. nm' <- unsafeInterleaveIO $ do u <- takeUniqFromNameCache nc evaluate $ mkInternalName u occ noSrcSpan fmap BinName $ atomicModifyIORef' env_ref $ \env -> - case lookupOccEnv env occ of + case Word64Map.lookup key env of Just nm -> (env, nm) - _ -> nm' `seq` (extendOccEnv env occ nm', nm') + _ -> nm' `seq` (Word64Map.insert key nm' env, nm') _ -> panic "Binary BinName: invalid byte" -- Note [Serializing Names in bytecode] ===================================== compiler/GHC/Cmm/Lexer.x ===================================== @@ -174,6 +174,8 @@ data CmmToken | CmmT_return | CmmT_returns | CmmT_import + | CmmT_extern + | CmmT_DATA | CmmT_switch | CmmT_case | CmmT_default @@ -273,6 +275,8 @@ reservedWordsFM = listToUFM $ ( "return", CmmT_return ), ( "returns", CmmT_returns ), ( "import", CmmT_import ), + ( "extern", CmmT_extern ), + ( "DATA", CmmT_DATA ), ( "switch", CmmT_switch ), ( "case", CmmT_case ), ( "default", CmmT_default ), ===================================== compiler/GHC/Cmm/Parser.y ===================================== @@ -372,6 +372,8 @@ import qualified Data.ByteString.Char8 as BS8 'return' { L _ (CmmT_return) } 'returns' { L _ (CmmT_returns) } 'import' { L _ (CmmT_import) } + 'extern' { L _ (CmmT_extern) } + 'DATA' { L _ (CmmT_DATA) } 'switch' { L _ (CmmT_switch) } 'case' { L _ (CmmT_case) } 'default' { L _ (CmmT_default) } @@ -643,18 +645,42 @@ importNames importName :: { (FastString, CLabel) } - -- A label imported without an explicit packageId. - -- These are taken to come from some foreign, unnamed package. + -- A code label imported from within the same shared library. : NAME - { ($1, mkForeignLabel $1 ForeignLabelInExternalPackage IsFunction) } + { ($1, mkForeignLabel $1 ForeignLabelInThisPackage IsFunction) } - -- as previous 'NAME', but 'IsData' - | 'CLOSURE' NAME - { ($2, mkForeignLabel $2 ForeignLabelInExternalPackage IsData) } + -- A data label imported from within the same shared library. + | 'DATA' NAME + { ($2, mkForeignLabel $2 ForeignLabelInThisPackage IsData) } - -- A label imported with an explicit UnitId. + -- CLOSURE is a historical alias for DATA in this context. + | 'CLOSURE' NAME + { ($2, mkForeignLabel $2 ForeignLabelInThisPackage IsData) } + + -- A code label imported from another unamed shared library. These may + -- come from a foreign shared library, or from the shared library for + -- an unnamed Haskell package. This corresponds on Windows/PE to + -- __declspec(dllimport) in C. + | 'extern' NAME + { ($2, mkForeignLabel $2 ForeignLabelInExternalPackage IsFunction) } + + -- A data label imported from another unamed shared library. + -- This corresponds on Windows/PE to __declspec(dllimport) in C (but + -- cmm doesn't know about data vs function symbols so we have to say). + | 'extern' 'DATA' NAME + { ($3, mkForeignLabel $3 ForeignLabelInExternalPackage IsData) } + + -- A code label imported from the shared library for a Haskell package + -- with the given UnitId. Such labels behave as local when used within + -- the specified unit, or as extern otherwise. | STRING NAME - { ($2, mkCmmCodeLabel (UnitId (mkFastString $1)) $2) } + { ($2, mkForeignLabel $2 (ForeignLabelInPackage (UnitId (mkFastString $1))) IsFunction) } + + -- A data label imported from the shared library for a Haskell package + -- with the given UnitId. Such labels behave as local when used within + -- the specified unit, or as extern otherwise. + | STRING 'DATA' NAME + { ($3, mkForeignLabel $3 (ForeignLabelInPackage (UnitId (mkFastString $1))) IsData) } names :: { [FastString] } ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -1112,9 +1112,9 @@ data WarningFlag = -- ^ @since 9.14, scheduled to be removed in 9.18 -- -- See Note [Quantifying over equalities in RULES] in GHC.Tc.Gen.Sig - | Opt_WarnUnusableUnpackPragmas -- Since 9.14 - | Opt_WarnPatternNamespaceSpecifier -- Since 9.14 - | Opt_WarnUnrecognisedModifiers -- ^ @since 9.16 + | Opt_WarnUnusableUnpackPragmas -- ^ @since 9.14 + | Opt_WarnPatternNamespaceSpecifier -- ^ @since 9.14 + | Opt_WarnUnrecognisedModifiers -- ^ @since 10.0 deriving (Eq, Ord, Show, Enum, Bounded) -- | Return the names of a WarningFlag @@ -1377,7 +1377,7 @@ standardWarnings -- see Note [Documenting warning flags] Opt_WarnTypeEqualityRequiresOperators, Opt_WarnInconsistentFlags, Opt_WarnTypeEqualityOutOfScope, - Opt_WarnImplicitRhsQuantification, -- was in -Wcompat since 9.8, enabled by default since 9.14, to turn into a hard error in 9.16 + Opt_WarnImplicitRhsQuantification, -- was in -Wcompat since 9.8, enabled by default since 9.14, to turn into a hard error in 10.2 (#25911) Opt_WarnViewPatternSignatures, Opt_WarnUselessSpecialisations, Opt_WarnDeprecatedPragmas, ===================================== docs/users_guide/debug-info.rst ===================================== @@ -478,7 +478,7 @@ to a source location. This lookup table is generated by using the ``-finfo-table :type: dynamic :category: debugging - :since: 9.16 + :since: 10.0 Disable generation of distinct info tables for all constructors. @@ -488,7 +488,7 @@ to a source location. This lookup table is generated by using the ``-finfo-table :type: dynamic :category: debugging - :since: 9.16 + :since: 10.0 The entries in the info table map resulting from :ghc-flag:`-fdistinct-constructor-tables` flag may significantly ===================================== docs/users_guide/exts/explicit_namespaces.rst ===================================== @@ -121,7 +121,7 @@ there is a need to support older GHC versions. Wildcards in import/export lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -**Since:** GHC 9.16 +**Since:** GHC 10.0 Namespace-specified wildcards ``type ..`` and ``data ..`` may be used to import all names in the corresponding namespace from a module: :: ===================================== docs/users_guide/exts/linear_types.rst ===================================== @@ -318,7 +318,7 @@ hidden; it is an essential part of the exposed interface.) Interaction with Modifiers -------------------------- -Since GHC version 9.16, Linear types use :extension:`Modifiers` syntax, and by +Since GHC version 10.0, Linear types use :extension:`Modifiers` syntax, and by default enable that extension. In earlier versions, linear types used a more restricted variant of that syntax. ===================================== docs/users_guide/exts/modifiers.rst ===================================== @@ -6,7 +6,7 @@ Modifiers .. extension:: Modifiers :shortdesc: Allow experimental modifier syntax. - :since: 9.16 + :since: 10.0 :status: Experimental Enable modifier syntax in various places, such as arrows (``a %m -> b``) and @@ -138,10 +138,10 @@ and limitations. let %1 (Just x) = ... -- (2b) let %1 !(Just x) = ... -- (2c) - In 9.14, (1a) and (2a) parsed as (1b) and (2b) respectively. From 9.16, (1a) + In 9.14, (1a) and (2a) parsed as (1b) and (2b) respectively. From 10.0, (1a) parses as (1d), and (2a) fails to parse. - Note that linear bindings must be strict. (1c) and (2c) parse in 9.16 the same + Note that linear bindings must be strict. (1c) and (2c) parse in 10.0 the same as in 9.14. But with ``-XStrict`` enabled, (1a) and (2a) would previously have been accepted, and are now rejected, even with ``-XLinearTypes -XNoModifiers``. ===================================== docs/users_guide/exts/qualified_strings.rst ===================================== @@ -6,7 +6,7 @@ Qualified string literals .. extension:: QualifiedStrings :shortdesc: Enable qualified string literals. - :since: 9.16.1 + :since: 10.0.1 Enable qualified string literals. ===================================== docs/users_guide/exts/required_type_arguments.rst ===================================== @@ -303,7 +303,7 @@ A few limitations apply: * In term syntax, in positions where ``*`` is a direct argument to ``->``, e.g. in ``f (* -> * -> *)`` and ``f (* -> Constraint)``, the ``*``\s stand for ``Type``, provided the :extension:`StarIsType` extension is enabled. - This is supported from GHC 9.16 onwards; earlier versions will produce + This is supported from GHC 10.0 onwards; earlier versions will produce a parse error. What to do instead: use ``Type`` from the ``Data.Kind`` module. ===================================== docs/users_guide/using-warnings.rst ===================================== @@ -2711,7 +2711,7 @@ of ``-W(no-)*``. :type: dynamic :reverse: -Wno-unrecognised-modifiers - :since: 9.16 + :since: 10.0 :default: on ===================================== docs/users_guide/using.rst ===================================== @@ -1618,7 +1618,7 @@ Some flags only make sense for particular target platforms. :type: dynamic :category: platform-options - :since: 9.16.1 + :since: 10.0.1 :implies: :ghc-flag:`-mavx512f` (x86 only) This flag allows the code generator (whether the :ref:`native code generator <native-code-gen>` @@ -1639,7 +1639,7 @@ Some flags only make sense for particular target platforms. :type: dynamic :category: platform-options - :since: 9.16.1 + :since: 10.0.1 :implies: :ghc-flag:`-mavx512f` (x86 only) This flag allows the code generator (whether the :ref:`native code generator <native-code-gen>` @@ -1684,7 +1684,7 @@ Some flags only make sense for particular target platforms. :type: dynamic :category: platform-options - :since: 9.16.1 + :since: 10.0.1 :implies: :ghc-flag:`-mavx512f` (x86 only) This flag allows the code generator (whether the :ref:`native code generator <native-code-gen>` @@ -1823,7 +1823,7 @@ Some flags only make sense for particular target platforms. :type: dynamic :category: platform-options - :since: 9.16.1 + :since: 10.0.1 (x86 only) This flag allows the code generator (whether the :ref:`native code generator <native-code-gen>` or the :ref:`LLVM backend <llvm-code-gen>`) to emit x86 GFNI instructions. ===================================== hadrian/src/Builder.hs ===================================== @@ -345,11 +345,7 @@ instance H.Builder Builder where Haddock BuildPackage -> runHaddock path buildArgs buildInputs - Ghc FindHsDependencies _ -> do - -- Use a response file for ghc -M invocations, to - -- avoid issues with command line size limit on - -- Windows (#26637) - runGhcWithResponse path buildArgs buildInputs + Ghc _ _ -> runGhcWithResponse path buildArgs buildInputs buildOptions HsCpp -> captureStdout @@ -393,14 +389,19 @@ runHaddock haddockPath flagArgs fileInputs = withResponseFile $ \tmp -> do writeFile' tmp $ escapeArgs fileInputs cmd [haddockPath] flagArgs ('@' : tmp) -runGhcWithResponse :: FilePath -> [String] -> [FilePath] -> Action () -runGhcWithResponse ghcPath flagArgs fileInputs = withResponseFile $ \tmp -> do - writeFile' tmp $ escapeArgs fileInputs - -- We can't put the flags in a response file, because some flags - -- require empty arguments (such as the -dep-suffix flag), but - -- that isn't supported yet due to #26560. - cmd [ghcPath] flagArgs ('@' : tmp) - +-- | Use a response file for ghc invocations to avoid issues with command line +-- size limit on Windows (#26637). +runGhcWithResponse :: FilePath -- ^ Path to ghc + -> [String] -- ^ Arguments passed on the command line + -> [FilePath] -- ^ Input file paths (passed via response file) + -> [CmdOption] + -> Action () +runGhcWithResponse ghcPath buildArgs buildInputs buildOptions = withResponseFile $ \tmp -> do + -- We can't put the buildArgs in a response file, because some flags require + -- empty arguments (such as the -dep-suffix flag), but that isn't supported + -- yet due to #26560. + writeFile' tmp (escapeArgs buildInputs) + cmd [ghcPath] buildArgs ('@' : tmp) buildOptions -- TODO: Some builders are required only on certain platforms. For example, -- 'Objdump' is only required on OpenBSD and AIX. Add support for platform ===================================== hadrian/src/Hadrian/Builder.hs ===================================== @@ -29,7 +29,9 @@ import Hadrian.Utilities -- | This data structure captures all information relevant to invoking a builder. data BuildInfo = BuildInfo { - -- | Command line arguments. + -- | Command line arguments. Some builders (e.g. Ar, Ghc, Haddock) omit + -- buildInputs from buildArgs so that buildInputs can be passed separately + -- using a response file. buildArgs :: [String], -- | Input files. buildInputs :: [FilePath], ===================================== hadrian/src/Hadrian/Utilities.hs ===================================== @@ -334,13 +334,23 @@ keepResponseFiles = do withResponseFile :: (FilePath -> Action a) -> Action a withResponseFile action = do keep <- keepResponseFiles + let putVerboseResponseFile tmp = do + verbosity <- getVerbosity + when (verbosity >= Verbose) $ do + tmpContent <- liftIO (readFile tmp) + putVerbose (tmp <> " (use hadrian flag --keep-response-files to keep this file):\n" <> tmpContent) if keep then do (tmp, h) <- liftIO $ openTempFile "." "hadrian-rsp" liftIO $ hClose h putInfo $ "Keeping response file: " ++ tmp - action tmp - else withTempFile action + result <- action tmp + putVerboseResponseFile tmp + return result + else withTempFile $ \tmp -> do + result <- action tmp + putVerboseResponseFile tmp + return result -- | Link a file tracking the link target. Create the target directory if -- missing. ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -62,7 +62,6 @@ compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do [ arg "-fwrite-ide-info" , arg "-hiedir", arg hie_path ] - , getInputs , arg "-o", arg =<< getOutput ] compileC :: Args @@ -78,7 +77,6 @@ compileC = builder (Ghc CompileCWithGhc) ? do , mconcat (map (map ("-optc" ++) <$>) ccArgs) , defaultGhcWarningsArgs , arg "-c" - , getInputs , arg "-o" , arg =<< getOutput ] @@ -95,7 +93,6 @@ compileCxx = builder (Ghc CompileCppWithGhc) ? do , mconcat (map (map ("-optcxx" ++) <$>) ccArgs) , defaultGhcWarningsArgs , arg "-c" - , getInputs , arg "-o" , arg =<< getOutput ] ===================================== rts/Interpreter.c ===================================== @@ -416,12 +416,22 @@ void rts_disableStopNextBreakpointAll(void) void rts_enableStopNextBreakpoint(StgTSO* tso) { - tso->flags |= TSO_STOP_NEXT_BREAKPOINT; +#if defined(THREADED_RTS) + Capability* cap = rts_unsafeGetMyCapability(); + setThreadFlag(cap, tso, TSO_STOP_NEXT_BREAKPOINT); +#else + tso->flags |= TSO_STOP_NEXT_BREAKPOINT; +#endif } void rts_disableStopNextBreakpoint(StgTSO* tso) { - tso->flags &= ~TSO_STOP_NEXT_BREAKPOINT; +#if defined(THREADED_RTS) + Capability* cap = rts_unsafeGetMyCapability(); + unsetThreadFlag(cap, tso, TSO_STOP_NEXT_BREAKPOINT); +#else + tso->flags &= ~TSO_STOP_NEXT_BREAKPOINT; +#endif } /* --------------------------------------------------------------------------- @@ -430,12 +440,22 @@ void rts_disableStopNextBreakpoint(StgTSO* tso) void rts_enableStopAfterReturn(StgTSO* tso) { +#if defined(THREADED_RTS) + Capability* cap = rts_unsafeGetMyCapability(); + setThreadFlag(cap, tso, TSO_STOP_AFTER_RETURN); +#else tso->flags |= TSO_STOP_AFTER_RETURN; +#endif } void rts_disableStopAfterReturn(StgTSO* tso) { +#if defined(THREADED_RTS) + Capability* cap = rts_unsafeGetMyCapability(); + unsetThreadFlag(cap, tso, TSO_STOP_AFTER_RETURN); +#else tso->flags &= ~TSO_STOP_AFTER_RETURN; +#endif } /* ===================================== rts/Messages.c ===================================== @@ -35,7 +35,9 @@ void sendMessage(Capability *from_cap, Capability *to_cap, Message *msg) i != &stg_MSG_TRY_WAKEUP_info && i != &stg_IND_info && // can happen if a MSG_BLACKHOLE is revoked i != &stg_WHITEHOLE_info && - i != &stg_MSG_CLONE_STACK_info) { + i != &stg_MSG_CLONE_STACK_info && + i != &stg_MSG_SET_TSO_FLAG_info && + i != &stg_MSG_UNSET_TSO_FLAG_info) { barf("sendMessage: %p", i); } } @@ -137,6 +139,16 @@ loop: MessageCloneStack *cloneStackMessage = (MessageCloneStack*) m; handleCloneStackMessage(cap, cloneStackMessage); } + else if(i == &stg_MSG_SET_TSO_FLAG_info){ + MessageUpdTSOFlag *u = (MessageUpdTSOFlag*) m; + u->tso->flags |= u->flag; + return; + } + else if(i == &stg_MSG_UNSET_TSO_FLAG_info){ + MessageUpdTSOFlag *u = (MessageUpdTSOFlag*) m; + u->tso->flags &= ~u->flag; + return; + } else { barf("executeMessage: %p", i); ===================================== rts/StgMiscClosures.cmm ===================================== @@ -855,6 +855,12 @@ INFO_TABLE_CONSTR(stg_MSG_NULL,1,0,0,PRIM,"MSG_NULL","MSG_NULL") INFO_TABLE_CONSTR(stg_MSG_CLONE_STACK,3,0,0,PRIM,"MSG_CLONE_STACK","MSG_CLONE_STACK") { ccall pbarf("stg_MSG_CLONE_STACK object (%p) entered!", R1 "ptr") never returns; } +INFO_TABLE_CONSTR(stg_MSG_SET_TSO_FLAG,2,1,0,PRIM,"MSG_SET_TSO_FLAG","MSG_SET_TSO_FLAG") +{ foreign "C" barf("stg_MSG_SET_TSO_FLAG object (%p) entered!", R1) never returns; } + +INFO_TABLE_CONSTR(stg_MSG_UNSET_TSO_FLAG,2,1,0,PRIM,"MSG_UNSET_TSO_FLAG","MSG_UNSET_TSO_FLAG") +{ foreign "C" barf("stg_MSG_UNSET_TSO_FLAG object (%p) entered!", R1) never returns; } + /* ---------------------------------------------------------------------------- END_TSO_QUEUE ===================================== rts/Threads.c ===================================== @@ -376,6 +376,38 @@ migrateThread (Capability *from, StgTSO *tso, Capability *to) tryWakeupThread(from, tso); } +/* ---------------------------------------------------------------------------- + {set,unset}ThreadFlag + + sets or unsets a flag in a given TSO + ------------------------------------------------------------------------- */ + +#if defined(THREADED_RTS) +static void +updThreadFlag(Capability *from, StgTSO *tso, StgWord32 flag, const StgInfoTable* info); + +void setThreadFlag(Capability *from, StgTSO *tso, StgWord32 flag) +{ + updThreadFlag(from, tso, flag, &stg_MSG_SET_TSO_FLAG_info); +} + +void unsetThreadFlag(Capability *from, StgTSO *tso, StgWord32 flag) +{ + updThreadFlag(from, tso, flag, &stg_MSG_UNSET_TSO_FLAG_info); +} + +static void +updThreadFlag(Capability *from, StgTSO *tso, StgWord32 flag, const StgInfoTable* info) +{ + MessageUpdTSOFlag *msg; + msg = (MessageUpdTSOFlag *)allocate(from,sizeofW(MessageUpdTSOFlag)); + msg->tso = tso; + msg->flag = flag; + SET_HDR_RELEASE(msg, info, CCS_SYSTEM); + sendMessage(from, tso->cap, (Message*)msg); +} +#endif + /* ---------------------------------------------------------------------------- awakenBlockedQueue ===================================== rts/Threads.h ===================================== @@ -19,6 +19,11 @@ void checkBlockingQueues (Capability *cap, StgTSO *tso); void tryWakeupThread (Capability *cap, StgTSO *tso); void migrateThread (Capability *from, StgTSO *tso, Capability *to); +#if defined(THREADED_RTS) +void setThreadFlag (Capability *from, StgTSO *tso, StgWord32 flag); +void unsetThreadFlag (Capability *from, StgTSO *tso, StgWord32 flag); +#endif + // Wakes up a thread on a Capability (probably a different Capability // from the one held by the current Task). // ===================================== rts/include/rts/storage/Closures.h ===================================== @@ -620,6 +620,12 @@ typedef struct MessageCloneStack_ { StgTSO *tso; } MessageCloneStack; +typedef struct MessageUpdTSOFlag_ { + StgHeader header; + Message *link; + StgTSO *tso; + StgWord flag; +} MessageUpdTSOFlag; /* ---------------------------------------------------------------------------- Compact Regions ===================================== rts/include/stg/MiscClosures.h ===================================== @@ -152,6 +152,8 @@ RTS_ENTRY(stg_MSG_TRY_WAKEUP); RTS_ENTRY(stg_MSG_THROWTO); RTS_ENTRY(stg_MSG_BLACKHOLE); RTS_ENTRY(stg_MSG_CLONE_STACK); +RTS_ENTRY(stg_MSG_SET_TSO_FLAG); +RTS_ENTRY(stg_MSG_UNSET_TSO_FLAG); RTS_ENTRY(stg_MSG_NULL); RTS_ENTRY(stg_MVAR_TSO_QUEUE); RTS_ENTRY(stg_catch); ===================================== testsuite/tests/rts/T27131.hs ===================================== @@ -0,0 +1,81 @@ +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE UnliftedFFITypes #-} + +module Main where + +import Control.Concurrent +import Control.Monad +import Foreign.C.Types +import GHC.Conc.Sync (ThreadId(..), forkOn, myThreadId, setNumCapabilities) +import GHC.Exts (ThreadId#) + +foreign import ccall unsafe "rts_enableStopNextBreakpoint" + rts_enableStopNextBreakpoint :: ThreadId# -> IO () + +foreign import ccall unsafe "rts_disableStopNextBreakpoint" + rts_disableStopNextBreakpoint :: ThreadId# -> IO () + +foreign import ccall unsafe "rts_enableStopAfterReturn" + rts_enableStopAfterReturn :: ThreadId# -> IO () + +foreign import ccall unsafe "rts_disableStopAfterReturn" + rts_disableStopAfterReturn :: ThreadId# -> IO () + +foreign import ccall unsafe "has_local_stop_next_breakpoint" + c_hasLocalStopNextBreakpoint :: IO CInt + +foreign import ccall unsafe "has_local_stop_after_return" + c_hasLocalStopAfterReturn :: IO CInt + +main :: IO () +main = do + setNumCapabilities 2 + checkFlag + "TSO_STOP_NEXT_BREAKPOINT" + rts_enableStopNextBreakpoint + rts_disableStopNextBreakpoint + c_hasLocalStopNextBreakpoint + checkFlag + "TSO_STOP_AFTER_RETURN" + rts_enableStopAfterReturn + rts_disableStopAfterReturn + c_hasLocalStopAfterReturn + +checkFlag + :: String + -> (ThreadId# -> IO ()) + -> (ThreadId# -> IO ()) + -> IO CInt + -> IO () +checkFlag label enable disable isMyThreadFlagSet = do + -- Print the main thread's capability (should be 0) + print =<< threadCapability =<< myThreadId + + -- Target thread will write its own flag value here + targetCheckVar <- newEmptyMVar + + -- Run the new TSO runs on capability 1 + ThreadId tid# <- forkOn 1 $ do + replicateM_ 2 $ do + replyVar <- takeMVar targetCheckVar + isSet <- (/= 0) <$> isMyThreadFlagSet + putMVar replyVar isSet + + -- Enable the other TSO's flag + enable tid# + -- It will check whether it is set and reply here + renderCheck label "set" =<< checkTarget targetCheckVar + + -- Ditto. + disable tid# + renderCheck label "unset" . not =<< checkTarget targetCheckVar + +checkTarget :: MVar (MVar Bool) -> IO Bool +checkTarget targetCheckVar = do + replyVar <- newEmptyMVar + putMVar targetCheckVar replyVar + takeMVar replyVar + +renderCheck :: String -> String -> Bool -> IO () +renderCheck label state ok = putStrLn $ + label ++ " " ++ state ++ ": " ++ if ok then "ok" else "failed" ===================================== testsuite/tests/rts/T27131.stdout ===================================== @@ -0,0 +1,6 @@ +(0,False) +TSO_STOP_NEXT_BREAKPOINT set: ok +TSO_STOP_NEXT_BREAKPOINT unset: ok +(0,False) +TSO_STOP_AFTER_RETURN set: ok +TSO_STOP_AFTER_RETURN unset: ok ===================================== testsuite/tests/rts/T27131_c.c ===================================== @@ -0,0 +1,15 @@ +#include "Rts.h" + +int has_local_stop_next_breakpoint(void) +{ + CapabilityPublic *cap = (CapabilityPublic *) rts_unsafeGetMyCapability(); + StgTSO *tso = cap->r.rCurrentTSO; + return (tso->flags & TSO_STOP_NEXT_BREAKPOINT) != 0; +} + +int has_local_stop_after_return(void) +{ + CapabilityPublic *cap = (CapabilityPublic *) rts_unsafeGetMyCapability(); + StgTSO *tso = cap->r.rCurrentTSO; + return (tso->flags & TSO_STOP_AFTER_RETURN) != 0; +} ===================================== testsuite/tests/rts/all.T ===================================== @@ -623,6 +623,12 @@ test('T20201b', [js_skip, exit_code(1)], compile_and_run, ['-with-rtsopts -A64z' test('T22012', [js_skip, extra_ways(['ghci'])], compile_and_run, ['T22012_c.c']) +test('T27131', + [ only_ways(['threaded1', 'threaded2']) + , req_ghc_with_threaded_rts + ], + compile_and_run, ['T27131_c.c']) + # Skip for JS platform as the JS RTS is always single threaded test('T22795a', [only_ways(['normal']), js_skip, req_ghc_with_threaded_rts], compile_and_run, ['-threaded']) test('T22795b', [only_ways(['normal']), js_skip], compile_and_run, ['-single-threaded']) ===================================== testsuite/tests/typecheck/should_fail/all.T ===================================== @@ -720,7 +720,7 @@ test('T17940', normal, compile_fail, ['']) test('ErrorIndexLinks', normal, compile_fail, ['-fprint-error-index-links=always']) test('T24064', normal, compile_fail, ['']) test('T24090a', normal, compile_fail, ['']) -test('T24090b', normal, compile, ['']) # scheduled to become an actual error in GHC 9.16 +test('T24090b', normal, compile, ['']) # scheduled to become an actual error in GHC 10.2 (#25911) test('T24298', normal, compile_fail, ['']) test('T24279', normal, compile, ['']) # Now accepted (Nov 2025) test('T24318', normal, compile_fail, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/83413382382026efed1afcdd0b899d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/83413382382026efed1afcdd0b899d… You're receiving this email because of your account on gitlab.haskell.org.

1 0