January 2026 - ghc-commits

[Git][ghc/ghc] Pushed new branch wip/fix-tylit-determ
by Matthew Pickering (＠mpickering) 28 Jan '26

28 Jan '26

Matthew Pickering pushed new branch wip/fix-tylit-determ at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-tylit-determ You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/ticked_joins] Allow join point Ids to occur below ticks & casts
by sheaf (＠sheaf) 28 Jan '26

28 Jan '26

sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC Commits: 35aff052 by sheaf at 2026-01-28T18:19:32+01:00 Allow join point Ids to occur below ticks & casts This commit classifies all join points into two categories: - true join points - quasi join points A quasi join point is a join point for which a jump is enclosed within a profiling tick or a cast. The only operational difference is that, for quasi join points, we cannot perform the case-of-case transformation described in Note [Join points and case-of-case] in GHC.Core.Opt.Simplify.Iteration. All of this is explained in detail in Note [Quasi join points]. Fixes #26693 and #26642 Improves on #14610, #26157 and #26422, as it means casts/profiling ticks don't prevent join points, but it doesn't entirely fix these issues because we are still inhibiting optimisations (lack of case-of-case). - - - - - 31 changed files: - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Id.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - testsuite/tests/profiling/should_run/T2552.prof.sample - testsuite/tests/profiling/should_run/ioprof.prof.sample - testsuite/tests/profiling/should_run/scc001.prof.sample The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/35aff0528e1fd7a8e338b0bd3698bf2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/35aff0528e1fd7a8e338b0bd3698bf2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26831] Revert the no-evidence specialiser changes
by Simon Peyton Jones (＠simonpj) 28 Jan '26

28 Jan '26

Simon Peyton Jones pushed to branch wip/T26831 at Glasgow Haskell Compiler / GHC Commits: 4aafc520 by Simon Peyton Jones at 2026-01-28T17:11:29+00:00 Revert the no-evidence specialiser changes - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -17,9 +17,9 @@ import GHC.Driver.Config.Core.Rules ( initRuleOpts ) import GHC.Core.Type hiding( substTy, substCo, extendTvSubst, zapSubst ) import GHC.Core.SimpleOpt( defaultSimpleOpts, simpleOptExprWith, exprIsConApp_maybe ) import GHC.Core.Predicate --- import GHC.Core.Class( classMethods ) +import GHC.Core.Class( classMethods ) import GHC.Core.Coercion( Coercion ) --- import GHC.Core.DataCon (dataConTyCon) +import GHC.Core.DataCon (dataConTyCon) import qualified GHC.Core.Subst as Core import GHC.Core.Unfold.Make @@ -28,7 +28,7 @@ import GHC.Core.Make ( mkLitRubbish ) import GHC.Core.Unify ( tcMatchTy ) import GHC.Core.Rules import GHC.Core.Subst (substTickish) --- import GHC.Core.TyCon (tyConClass_maybe) +import GHC.Core.TyCon (tyConClass_maybe) import GHC.Core.Utils ( exprIsTrivial, exprIsTopLevelBindable , mkCast, exprType, exprIsHNF , stripTicksTop, mkInScopeSetBndrs ) @@ -3128,13 +3128,12 @@ interestingDict env arg -- Main Plan: use exprIsConApp_maybe | otherwise -> exprIsHNF arg -- See (ID7) - | Just (_, _, _data_con, _tys, _args) <- exprIsConApp_maybe in_scope_env arg --- , Just cls <- tyConClass_maybe (dataConTyCon data_con) + | Just (_, _, data_con, _tys, args) <- exprIsConApp_maybe in_scope_env arg + , Just cls <- tyConClass_maybe (dataConTyCon data_con) , definitely_not_ip_like -- See (ID4) - = True --- = if null (classMethods cls) -- See (ID6) --- then any (interestingDict env) args --- else True + = if null (classMethods cls) -- See (ID6) + then any (interestingDict env) args + else True | otherwise = not (exprIsTrivial arg) && definitely_not_ip_like -- See (ID8) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4aafc520ae989baba38b7ec3e2b37bb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4aafc520ae989baba38b7ec3e2b37bb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mp/ghc-9.10.1-determinism
by Matthew Pickering (＠mpickering) 28 Jan '26

28 Jan '26

Matthew Pickering pushed new branch wip/mp/ghc-9.10.1-determinism at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/mp/ghc-9.10.1-determinism You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/ticked_joins] 13 commits: PPC NCG: Generate clear right insn at arch width
by sheaf (＠sheaf) 28 Jan '26

28 Jan '26

sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC Commits: 56db94f7 by Peter Trommler at 2026-01-26T11:26:18+01:00 PPC NCG: Generate clear right insn at arch width The clear right immediate (clrrxi) is only available in word and doubleword width. Generate clrrxi instructions at architecture width for all MachOp widths. Fixes #24145 - - - - - 5957a8ad by Wolfgang Jeltsch at 2026-01-27T06:11:40-05:00 Add operations for obtaining operating-system handles This contribution implements CLC proposal #369. It adds operations for obtaining POSIX file descriptors and Windows handles that underlie Haskell handles. Those operating system handles can also be obtained without such additional operations, but this is more involved and, more importantly, requires using internals. - - - - - 86a0510c by Greg Steuck at 2026-01-27T06:12:34-05:00 Move flags to precede patterns for grep and read files directly This makes the tests pass with non-GNU (i.e. POSIX-complicant) tools. There's no reason to use cat and pipe where direct file argument works. - - - - - 50761451 by Cheng Shao at 2026-01-27T21:51:23-05:00 ci: update darwin boot ghc to 9.10.3 This patch updates darwin boot ghc to 9.10.3, along with other related updates, and pays off some technical debt here: - Update `nixpkgs` and use the `nixpkgs-25.05-darwin` channel. - Update the `niv` template. - Update LLVM to 21 and update `llvm-targets` to reflect LLVM 21 layout changes for arm64/x86_64 darwin targets. - Use `stdenvNoCC` to prevent nix packaged apple sdk from being used by boot ghc, and manually set `DEVELOPER_DIR`/`SDKROOT` to enforce the usage of system-wide command line sdk for macos. - When building nix derivation for boot ghc, run `configure` via the `arch` command so that `configure` and its subprocesses pick up the manually specified architecture. - Remove the previous horrible hack that obliterates `configure` to make autoconf test result in true. `configure` now properly does its job. - Remove the now obsolete configure args and post install settings file patching logic. - Use `scheme-small` for texlive to avoid build failures in certain unused texlive packages, especially on x86_64-darwin. - - - - - 94dcd15e by Matthew Pickering at 2026-01-27T21:52:05-05:00 Evaluate backtraces for "error" exceptions at the moment they are thrown See Note [Capturing the backtrace in throw] and Note [Hiding precise exception signature in throw] which explain the implementation. This commit makes `error` and `throw` behave the same with regard to backtraces. Previously, exceptions raised by `error` would not contain useful IPE backtraces. I did try and implement `error` in terms of `throw` but it started to involve putting diverging functions into hs-boot files, which seemed to risky if the compiler wouldn't be able to see if applying a function would diverge. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/383 Fixes #26751 - - - - - ef35e3ea by Teo Camarasu at 2026-01-27T21:52:46-05:00 ghc-internal: move all Data instances to Data.Data Most instances of Data are defined in GHC.Internal.Data.Data. Let's move all remaining instance there. This moves other modules down in the dependency hierarchy allowing for more parallelism, and it decreases the likelihood that we would need to load this heavy .hi file if we don't actually need it. Resolves #26830 Metric Decrease: T12227 T16875 - - - - - 5e0ec555 by sheaf at 2026-01-28T06:56:38-05:00 Add test case for #25679 This commit adds the T25679 test case. The test now passes, thanks to commit 1e53277af36d3f0b6ad5491f70ffc5593a49dcfd. Fixes #25679 - - - - - f1cd1611 by sheaf at 2026-01-28T06:56:38-05:00 Improve defaulting of representational equalities This commit makes the defaulting of representational equalities, introduced in 1e53277a, a little bit more robust. Now, instead of calling the eager unifier, it calls the full-blown constraint solver, which means that it can handle some subtle situations, e.g. involving functional dependencies and type-family injectivity annotations, such as: type family F a = r | r -> a type instance F Int = Bool [W] F beta ~R Bool - - - - - 25edf516 by sheaf at 2026-01-28T06:56:38-05:00 Improve errors for unsolved representational equalities This commit adds a new field of CtLoc, CtExplanations, which allows the typechecker to leave some information about what it has done. For the moment, it is only used to improve error messages for unsolved representational equalities. The typechecker will now accumulate, when unifying at representational role: - out-of-scope newtype constructors, - type constructors that have nominal role in a certain argument, - over-saturated type constructors, - AppTys, e.g. `c a ~R# c b`, to report that we must assume that 'c' has nominal role in its parameters, - data family applications that do not reduce, potentially preventing newtype unwrapping. Now, instead of having to re-construct the possible errors after the fact, we simply consult the CtExplanations field. Additionally, this commit modifies the typechecker error messages that concern out-of-scope newtype constructors. The error message now depends on whether we have an import suggestion to provide to the user: - If we have an import suggestion for the newtype constructor, the message will be of the form: The data constructor MkN of the newtype N is out of scope Suggested fix: add 'MkN' to the import list in the import of 'M' - If we don't have any import suggestions, the message will be of the form: NB: The type 'N' is an opaque newtype, whose constructor is hidden Fixes #15850, #20289, #20468, #23731, #25949, #26137 - - - - - 4d0e6da1 by Simon Peyton Jones at 2026-01-28T06:57:19-05:00 Fix two bugs in short-cut constraint solving There are two main changes here: * Use `isSolvedWC` rather than `isEmptyWC` in `tryShortCutSolver` The residual constraint may have some fully-solved, but still-there implications, and we don't want them to abort short cut solving! That bug caused #26805. * In the short-cut solver, we abandon the fully-solved residual constraint; but we may thereby lose track of Givens that are needed, and either report them as redundant or prune evidence bindings that are in fact needed. This bug stopped the `constraints` package from compiling; see the trail in !15389. The second bug led me to (another) significant refactoring of the mechanism for tracking needed EvIds. See the new Note [Tracking needed EvIds] in GHC.Tc.Solver.Solve It's simpler and much less head-scratchy now. Some particulars: * An EvBindsVar now tracks NeededEvIds * We deal with NeededEvIds for an implication only when it is fully solved. Much simpler! * `tryShortCutTcS` now takes a `TcM WantedConstraints` rather than `TcM Bool`, so that is can plumb the needed EvIds correctly. * Remove `ic_need` and `ic_need_implic` from Implication (hooray), and add `ics_dm` and `ics_non_dm` to `IC_Solved`. Pure refactor * Shorten data constructor `CoercionHole` to `CH`, following general practice in GHC. * Rename `EvBindMap` to `EvBindsMap` for consistency - - - - - 662480b7 by Cheng Shao at 2026-01-28T06:58:00-05:00 ci: use debian validate bindists instead of fedora release bindists in testing stage This patch changes the `abi-test`, `hadrian-multi` and `perf` jobs in the full-ci pipeline testing stage to use debian validate bindists instead of fedora release bindists, to increase pipeline level parallelism and allow full-ci pipelines to complete earlier. Closes #26818. - - - - - 39581ec6 by Cheng Shao at 2026-01-28T06:58:40-05:00 ci: run perf test with -j$cores This patch makes the perf ci job compile Cabal with -j$cores to speed up the job. - - - - - c8b82eaf by sheaf at 2026-01-28T17:06:39+01:00 Allow join point Ids to occur below ticks & casts This commit classifies all join points into two categories: - true join points - quasi join points A quasi join point is a join point in which one of the binders occurs under more profiling ticks or casts than its binding site. The only operational difference is that, for quasi join points, we cannot perform the case-of-case transformation described in Note [Join points and case-of-case] in GHC.Core.Opt.Simplify.Iteration. All of this is explained in detail in Note [Quasi join points]. Fixes #26693 and #26642 Improves on #26157 and #26422, but doesn't entirely fix them because in an ideal world casts & profiling ticks should not inhibit optimisations. - - - - - 162 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/darwin/nix/sources.json - .gitlab/darwin/toolchain.nix - compiler/GHC/CmmToAsm/PPC/CodeGen.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/FamInstEnv.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Core/TyCon/RecWalk.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Data/Maybe.hs - compiler/GHC/HsToCore/Pmc/Solver.hs - compiler/GHC/Rename/Unbound.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Default.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Instance/Family.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/CtLoc.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Tc/Zonk/TcType.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Id.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/RepType.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Types/Var.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Monad.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Trace.hs - libraries/base/base.cabal.in - libraries/base/changelog.md - + libraries/base/src/System/IO/OS.hs - libraries/base/tests/IO/all.T - + libraries/base/tests/IO/osHandles001FileDescriptors.hs - + libraries/base/tests/IO/osHandles001FileDescriptors.stdout - + libraries/base/tests/IO/osHandles001WindowsHandles.hs - + libraries/base/tests/IO/osHandles001WindowsHandles.stdout - + libraries/base/tests/IO/osHandles002FileDescriptors.hs - + libraries/base/tests/IO/osHandles002FileDescriptors.stderr - + libraries/base/tests/IO/osHandles002FileDescriptors.stdin - + libraries/base/tests/IO/osHandles002FileDescriptors.stdout - + libraries/base/tests/IO/osHandles002WindowsHandles.hs - + libraries/base/tests/IO/osHandles002WindowsHandles.stderr - + libraries/base/tests/IO/osHandles002WindowsHandles.stdin - + libraries/base/tests/IO/osHandles002WindowsHandles.stdout - libraries/base/tests/T23454.stderr - libraries/base/tests/perf/Makefile - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/Data/Data.hs - libraries/ghc-internal/src/GHC/Internal/Err.hs - libraries/ghc-internal/src/GHC/Internal/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - + libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/tests/stack-annotation/all.T - + libraries/ghc-internal/tests/stack-annotation/ann_frame005.hs - + libraries/ghc-internal/tests/stack-annotation/ann_frame005.stdout - llvm-targets - + testsuite/tests/default/T25825.hs - testsuite/tests/default/all.T - testsuite/tests/deriving/should_fail/T1496.stderr - testsuite/tests/deriving/should_fail/T4846.stderr - testsuite/tests/deriving/should_fail/T5498.stderr - testsuite/tests/deriving/should_fail/T6147.stderr - testsuite/tests/deriving/should_fail/T7148.stderr - testsuite/tests/deriving/should_fail/T7148a.stderr - testsuite/tests/deriving/should_fail/T8984.stderr - testsuite/tests/deriving/should_fail/deriving-via-fail.stderr - testsuite/tests/deriving/should_fail/deriving-via-fail4.stderr - testsuite/tests/deriving/should_fail/deriving-via-fail5.stderr - testsuite/tests/driver/T16318/Makefile - testsuite/tests/driver/T18125/Makefile - testsuite/tests/gadt/CasePrune.stderr - testsuite/tests/ghci.debugger/scripts/T8487.stdout - testsuite/tests/ghci.debugger/scripts/break011.stdout - testsuite/tests/ghci.debugger/scripts/break017.stdout - testsuite/tests/ghci.debugger/scripts/break025.stdout - testsuite/tests/indexed-types/should_fail/T9580.stderr - 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/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/linear/should_fail/LinearRole.stderr - testsuite/tests/profiling/should_run/T2552.prof.sample - testsuite/tests/profiling/should_run/ioprof.prof.sample - testsuite/tests/profiling/should_run/scc001.prof.sample - testsuite/tests/roles/should_fail/RolesIArray.stderr - + testsuite/tests/simplCore/should_compile/T26805.hs - + testsuite/tests/simplCore/should_compile/T26805.stderr - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/typecheck/should_compile/T26805a.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/T10285.stderr - testsuite/tests/typecheck/should_fail/T10534.stderr - testsuite/tests/typecheck/should_fail/T10715b.stderr - testsuite/tests/typecheck/should_fail/T11347.stderr - testsuite/tests/typecheck/should_fail/T15801.stderr - + testsuite/tests/typecheck/should_fail/T15850.hs - + testsuite/tests/typecheck/should_fail/T15850.stderr - + testsuite/tests/typecheck/should_fail/T15850_Lib.hs - + testsuite/tests/typecheck/should_fail/T20289.hs - + testsuite/tests/typecheck/should_fail/T20289.stderr - + testsuite/tests/typecheck/should_fail/T20289_A.hs - testsuite/tests/typecheck/should_fail/T22645.stderr - testsuite/tests/typecheck/should_fail/T22924a.stderr - + testsuite/tests/typecheck/should_fail/T23731.hs - + testsuite/tests/typecheck/should_fail/T23731.stderr - + testsuite/tests/typecheck/should_fail/T23731b.hs - + testsuite/tests/typecheck/should_fail/T23731b.stderr - + testsuite/tests/typecheck/should_fail/T23731b_aux.hs - + testsuite/tests/typecheck/should_fail/T25679.hs - + testsuite/tests/typecheck/should_fail/T25679.stderr - + testsuite/tests/typecheck/should_fail/T25949.hs - + testsuite/tests/typecheck/should_fail/T25949.stderr - + testsuite/tests/typecheck/should_fail/T25949_aux.hs - + testsuite/tests/typecheck/should_fail/T26137.hs - + testsuite/tests/typecheck/should_fail/T26137.stderr - testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr - testsuite/tests/typecheck/should_fail/TcCoercibleFail3.stderr - testsuite/tests/typecheck/should_fail/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0cf400eea489c3ccae58dd9e2ef2fb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0cf400eea489c3ccae58dd9e2ef2fb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/26699] Apply 4 suggestion(s) to 4 file(s)
by recursion-ninja (＠recursion-ninja) 28 Jan '26

28 Jan '26

recursion-ninja pushed to branch wip/26699 at Glasgow Haskell Compiler / GHC Commits: ebe18155 by recursion-ninja at 2026-01-28T15:24:18+00:00 Apply 4 suggestion(s) to 4 file(s) Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 4 changed files: - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Utils/Binary.hs - compiler/Language/Haskell/Syntax/Basic.hs - compiler/Language/Haskell/Syntax/Decls/Overlap.hs Changes: ===================================== compiler/GHC/Tc/Utils/Instantiate.hs ===================================== @@ -985,7 +985,7 @@ tcExtendLocalInstEnv :: [ClsInst] -> TcM a -> TcM a tcExtendLocalInstEnv dfuns thing_inside = do { traceDFuns dfuns ; env <- getGblEnv - -- F~orce the access to the TcgEnv so it isn't retained. + -- Force the access to the TcgEnv so it isn't retained. -- During auditing it is much easier to observe in -hi profiles if -- there are a very small number of TcGblEnv. Keeping a TcGblEnv -- alive is quite dangerous because it contains reference to many ===================================== compiler/GHC/Utils/Binary.hs ===================================== @@ -2013,10 +2013,14 @@ instance NFData a => NFData (FingerprintWithValue a) where = rnf fp `seq` rnf mflags `seq` () instance Binary Boxity where -- implemented via isBoxed-isomorphism to Bool - put_ bh = put_ bh . isBoxed + put_ bh t = putByte bh $ case t of + Boxed -> 0 + Unboxed -> 1 get bh = do - b <- get bh - pure $ if b then Boxed else Unboxed + t <- getByte bh + evaluate $ case t of + 0 -> Boxed + 1 -> Unboxed instance Binary ConInfoTable where get bh = Binary.decode <$> get bh ===================================== compiler/Language/Haskell/Syntax/Basic.hs ===================================== @@ -3,8 +3,6 @@ {-# LANGUAGE OverlappingInstances #-} {-# LANGUAGE UndecidableInstances #-} -- Eq XOverlapMode, NFData OverlapMode --- | Data-type defintions of the Abstrast Sytntax Tree --- which *do not* have any /Trees That Grow/ extension points. module Language.Haskell.Syntax.Basic where import Control.DeepSeq ===================================== compiler/Language/Haskell/Syntax/Decls/Overlap.hs ===================================== @@ -4,7 +4,7 @@ {-# LANGUAGE UndecidableInstances #-} -- Eq XOverlapMode, NFData OverlapMode {- | -Data-type describing the state of "overlapping instances" for a type. +Data-type describing the overlap annotations for instances. -} module Language.Haskell.Syntax.Decls.Overlap where View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ebe1815552f2d5edf28b0fd06140c03… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ebe1815552f2d5edf28b0fd06140c03… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/stability-risk-1-and-2-module-deprecation] Remove square brackets around deprecation warnings
by Wolfgang Jeltsch (＠jeltsch) 28 Jan '26

28 Jan '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/stability-risk-1-and-2-module-deprecation at Glasgow Haskell Compiler / GHC Commits: d0aa167f by Wolfgang Jeltsch at 2026-01-28T16:31:47+02:00 Remove square brackets around deprecation warnings - - - - - 15 changed files: - libraries/base/src/GHC/Arr.hs - libraries/base/src/GHC/ArrayArray.hs - libraries/base/src/GHC/Conc/IO.hs - libraries/base/src/GHC/Encoding/UTF8.hs - libraries/base/src/GHC/Exception.hs - libraries/base/src/GHC/Exception/Type.hs - libraries/base/src/GHC/Fingerprint/Type.hs - libraries/base/src/GHC/IO/Buffer.hs - libraries/base/src/GHC/IO/Device.hs - libraries/base/src/GHC/IO/Encoding.hs - libraries/base/src/GHC/IO/Exception.hs - libraries/base/src/GHC/IO/Handle/Text.hs - libraries/base/src/GHC/InfoProv.hs - libraries/base/src/GHC/Stack/Types.hs - libraries/base/src/GHC/TopHandler.hs Changes: ===================================== libraries/base/src/GHC/Arr.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.Arr - {-# DEPRECATED ["GHC.Arr is deprecated and will be removed in GHC 10.02. Please use the array package."] #-} + {-# DEPRECATED "GHC.Arr is deprecated and will be removed in GHC 10.02. Please use the array package." #-} (Ix(..), Array(..), STArray(..), ===================================== libraries/base/src/GHC/ArrayArray.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.ArrayArray - {-# DEPRECATED ["GHC.ArrayArray is deprecated and will be removed in GHC 10.02. Please use GHC.Exts."] #-} + {-# DEPRECATED "GHC.ArrayArray is deprecated and will be removed in GHC 10.02. Please use GHC.Exts." #-} (ArrayArray#(..), MutableArrayArray#(..), newArrayArray#, ===================================== libraries/base/src/GHC/Conc/IO.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.Conc.IO - {-# DEPRECATED ["GHC.Conc.IO is deprecated and will be removed in GHC 10.02. Please use GHC.Conc where possible and the ghc-internal package otherwise."] #-} + {-# DEPRECATED "GHC.Conc.IO is deprecated and will be removed in GHC 10.02. Please use GHC.Conc where possible and the ghc-internal package otherwise." #-} (ensureIOManagerIsRunning, ioManagerCapabilitiesChanged, interruptIOManager, ===================================== libraries/base/src/GHC/Encoding/UTF8.hs ===================================== @@ -30,7 +30,7 @@ #endif module GHC.Encoding.UTF8 - {-# DEPRECATED ["GHC.Encoding.UTF8 is deprecated and will be removed in GHC 10.02. Please use the text package."] #-} + {-# DEPRECATED "GHC.Encoding.UTF8 is deprecated and will be removed in GHC 10.02. Please use the text package." #-} (-- * Decoding single characters utf8DecodeCharAddr#, utf8DecodeCharPtr, ===================================== libraries/base/src/GHC/Exception.hs ===================================== @@ -25,7 +25,7 @@ #endif module GHC.Exception - {-# DEPRECATED ["GHC.Exception is deprecated and will be removed in GHC 10.02. Please use Control.Exception where possible and the ghc-internal package otherwise."] #-} + {-# DEPRECATED "GHC.Exception is deprecated and will be removed in GHC 10.02. Please use Control.Exception where possible and the ghc-internal package otherwise." #-} ( -- * 'Exception' class Exception(..) ===================================== libraries/base/src/GHC/Exception/Type.hs ===================================== @@ -19,7 +19,7 @@ #endif module GHC.Exception.Type - {-# DEPRECATED ["GHC.Exception.Type is deprecated and will be removed in GHC 10.02. Please use Control.Exception where possible and the ghc-internal package otherwise."] #-} + {-# DEPRECATED "GHC.Exception.Type is deprecated and will be removed in GHC 10.02. Please use Control.Exception where possible and the ghc-internal package otherwise." #-} ( Exception(..) -- Class , SomeException(..), ArithException(..) , divZeroException, overflowException, ratioZeroDenomException ===================================== libraries/base/src/GHC/Fingerprint/Type.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.Fingerprint.Type - {-# DEPRECATED ["GHC.Fingerprint.Type is deprecated and will be removed in GHC 10.02. Please use GHC.Fingerprint."] #-} + {-# DEPRECATED "GHC.Fingerprint.Type is deprecated and will be removed in GHC 10.02. Please use GHC.Fingerprint." #-} (Fingerprint(..) ) where ===================================== libraries/base/src/GHC/IO/Buffer.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.IO.Buffer - {-# DEPRECATED ["GHC.IO.Buffer is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.IO.Buffer is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} (-- * Buffers of any element Buffer(..), BufferState(..), ===================================== libraries/base/src/GHC/IO/Device.hs ===================================== @@ -23,7 +23,7 @@ #endif module GHC.IO.Device ( - {-# DEPRECATED ["GHC.IO.Device is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.IO.Device is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} RawIO(..), IODevice(..), IODeviceType(..), ===================================== libraries/base/src/GHC/IO/Encoding.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.IO.Encoding - {-# DEPRECATED ["GHC.IO.Encoding is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.IO.Encoding is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} (BufferCodec(..), TextEncoding(..), TextEncoder, ===================================== libraries/base/src/GHC/IO/Exception.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.IO.Exception ( - {-# DEPRECATED ["GHC.IO.Exception is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.IO.Exception is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} BlockedIndefinitelyOnMVar(..), blockedIndefinitelyOnMVar, BlockedIndefinitelyOnSTM(..), blockedIndefinitelyOnSTM, Deadlock(..), ===================================== libraries/base/src/GHC/IO/Handle/Text.hs ===================================== @@ -24,7 +24,7 @@ #endif module GHC.IO.Handle.Text ( - {-# DEPRECATED ["GHC.IO.Handle.Text is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.IO.Handle.Text is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} hWaitForInput, hGetChar, hGetLine, hGetContents, hPutChar, hPutStr, commitBuffer', -- hack, see below hGetBuf, hGetBufSome, hGetBufNonBlocking, hPutBuf, hPutBufNonBlocking, ===================================== libraries/base/src/GHC/InfoProv.hs ===================================== @@ -25,7 +25,7 @@ #endif module GHC.InfoProv - {-# DEPRECATED ["GHC.InfoProv is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package."] #-} + {-# DEPRECATED "GHC.InfoProv is deprecated and will be removed in GHC 10.02. Please use the ghc-internal package." #-} ( InfoProv(..) , ipLoc , ipeProv ===================================== libraries/base/src/GHC/Stack/Types.hs ===================================== @@ -27,7 +27,7 @@ #endif module GHC.Stack.Types - {-# DEPRECATED ["GHC.Stack.Types is deprecated and will be removed in GHC 10.02. Please use GHC.Stack."] #-} + {-# DEPRECATED "GHC.Stack.Types is deprecated and will be removed in GHC 10.02. Please use GHC.Stack." #-} (-- * Implicit call stacks CallStack(..), HasCallStack, ===================================== libraries/base/src/GHC/TopHandler.hs ===================================== @@ -26,7 +26,7 @@ #endif module GHC.TopHandler - {-# DEPRECATED ["GHC.TopHandler is deprecated and will be removed in GHC 10.02. Please use GHC.Conc where possible and the ghc-internal package otherwise."] #-} + {-# DEPRECATED "GHC.TopHandler is deprecated and will be removed in GHC 10.02. Please use GHC.Conc where possible and the ghc-internal package otherwise." #-} (runMainIO, runIO, runIOFastExit, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0aa167fdebd1c42d9196f7e096034b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0aa167fdebd1c42d9196f7e096034b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/stability-risk-3-module-deprecation] Remove square brackets around deprecation warnings
by Wolfgang Jeltsch (＠jeltsch) 28 Jan '26

28 Jan '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/stability-risk-3-module-deprecation at Glasgow Haskell Compiler / GHC Commits: 6911b44c by Wolfgang Jeltsch at 2026-01-28T16:24:02+02:00 Remove square brackets around deprecation warnings - - - - - 8 changed files: - libraries/base/src/GHC/Event/TimeOut.hs - libraries/base/src/GHC/Float/RealFracMethods.hs - libraries/base/src/GHC/GHCi.hs - libraries/base/src/GHC/GHCi/Helpers.hs - libraries/base/src/GHC/IO/Handle/Internals.hs - libraries/base/src/GHC/IO/Handle/Types.hs - libraries/base/src/GHC/IO/SubSystem.hs - libraries/base/src/System/Posix/Internals.hs Changes: ===================================== libraries/base/src/GHC/Event/TimeOut.hs ===================================== @@ -21,7 +21,7 @@ #endif module GHC.Event.TimeOut - {-# DEPRECATED ["GHC.Event.TimeOut is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.Event.TimeOut is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} ( TimeoutQueue , TimeoutCallback , TimeoutEdit ===================================== libraries/base/src/GHC/Float/RealFracMethods.hs ===================================== @@ -29,7 +29,7 @@ #endif module GHC.Float.RealFracMethods - {-# DEPRECATED ["GHC.Float.RealFracMethods is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.Float.RealFracMethods is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} (-- * Double methods -- ** Integer results properFractionDoubleInteger, ===================================== libraries/base/src/GHC/GHCi.hs ===================================== @@ -27,7 +27,7 @@ #endif module GHC.GHCi - {-# DEPRECATED ["GHC.GHCi is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.GHCi is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} (GHCiSandboxIO(..), NoIO() ) where ===================================== libraries/base/src/GHC/GHCi/Helpers.hs ===================================== @@ -25,7 +25,7 @@ #endif module GHC.GHCi.Helpers - {-# DEPRECATED ["GHC.GHCi.Helpers is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.GHCi.Helpers is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} (disableBuffering, flushAll, evalWrapper ===================================== libraries/base/src/GHC/IO/Handle/Internals.hs ===================================== @@ -28,7 +28,7 @@ #endif module GHC.IO.Handle.Internals - {-# DEPRECATED ["GHC.IO.Handle.Internals is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.IO.Handle.Internals is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} (withHandle, withHandle', withHandle_, ===================================== libraries/base/src/GHC/IO/Handle/Types.hs ===================================== @@ -25,7 +25,7 @@ #endif module GHC.IO.Handle.Types ( - {-# DEPRECATED ["GHC.IO.Handle.Types is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.IO.Handle.Types is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} Handle(..), Handle__(..), showHandle, checkHandleInvariants, BufferList(..), ===================================== libraries/base/src/GHC/IO/SubSystem.hs ===================================== @@ -26,7 +26,7 @@ #endif module GHC.IO.SubSystem - {-# DEPRECATED ["GHC.IO.SubSystem is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "GHC.IO.SubSystem is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} (withIoSubSystem, withIoSubSystem', whenIoSubSystem, ===================================== libraries/base/src/System/Posix/Internals.hs ===================================== @@ -30,7 +30,7 @@ #endif module System.Posix.Internals - {-# DEPRECATED ["System.Posix.Internals is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context."] #-} + {-# DEPRECATED "System.Posix.Internals is deprecated and will be removed in GHC 10.02. See https://github.com/well-typed/reinstallable-base/tree/main/hackage-uses-of-… for context." #-} ( module GHC.Internal.System.Posix.Internals -- TODO: deprecate ) where View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6911b44c737908d282c014facd40830… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6911b44c737908d282c014facd40830… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/detecting-os-handle-types] Add OS handle type detection to `base`
by Wolfgang Jeltsch (＠jeltsch) 28 Jan '26

28 Jan '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/detecting-os-handle-types at Glasgow Haskell Compiler / GHC Commits: 24092702 by Wolfgang Jeltsch at 2026-01-28T16:12:25+02:00 Add OS handle type detection to `base` It is deliberate that this addition to `base` does not simply reflect the `conditional`/`<!>` operation currently in `GHC.IO.SubSystem` but simply uses the value of a custom enumeration type to describe the type of OS handles currently in use. The reason for using this approach is that it is simpler and at the same type more future-proof: if a new OS handle type should be introduced in the future, it would only be necessary to add another value to `OSHandleType`, and user code that uses fallback branches in case distinctions regarding OS handle types would continue to be compilable at least; `conditional`, on the other hand, would have to have its argument count changed and `<!>` could not even be used as an infix operator anymore. Since Haskell has `case` expressions, there is no real need to have a case-distinguishing operation like `conditional`/`<!>`. - - - - - 22 changed files: - libraries/base/changelog.md - libraries/base/src/GHC/IO/SubSystem.hs - libraries/base/src/System/IO/OS.hs - libraries/base/tests/IO/all.T - libraries/base/tests/IO/osHandles001FileDescriptors.hs - libraries/base/tests/IO/osHandles001FileDescriptors.stdout - libraries/base/tests/IO/osHandles001WindowsHandles.hs - libraries/base/tests/IO/osHandles001WindowsHandles.stdout - libraries/base/tests/IO/osHandles002FileDescriptors.hs - libraries/base/tests/IO/osHandles002FileDescriptors.stdout - libraries/base/tests/IO/osHandles002WindowsHandles.hs - libraries/base/tests/IO/osHandles002WindowsHandles.stdout - + libraries/base/tests/IO/osHandles003FileDescriptors.hs - libraries/base/tests/IO/osHandles002FileDescriptors.stderr → libraries/base/tests/IO/osHandles003FileDescriptors.stderr - libraries/base/tests/IO/osHandles002FileDescriptors.stdin → libraries/base/tests/IO/osHandles003FileDescriptors.stdin - libraries/base/tests/IO/osHandles002WindowsHandles.stdin → libraries/base/tests/IO/osHandles003FileDescriptors.stdout - + libraries/base/tests/IO/osHandles003WindowsHandles.hs - libraries/base/tests/IO/osHandles002WindowsHandles.stderr → libraries/base/tests/IO/osHandles003WindowsHandles.stderr - + libraries/base/tests/IO/osHandles003WindowsHandles.stdin - + libraries/base/tests/IO/osHandles003WindowsHandles.stdout - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - testsuite/tests/interface-stability/base-exports.stdout Changes: ===================================== libraries/base/changelog.md ===================================== @@ -23,7 +23,7 @@ * `GHC.Conc.catchSTM` and `GHC.Conc.Sync.catchSTM` now attach `WhileHandling` annotation to exceptions thrown from the handler. ([GHC #25365](https://gitlab.haskell.org/ghc/ghc/-/issues/25365)) * Remove `GHC.JS.Prim.Internal.Build`, as per [CLC #329](https://github.com/haskell/core-libraries-committee/issues/329) * Export `labelThread` from `Control.Concurrent`.([CLC proposal #376](https://github.com/haskell/core-libraries-committee/issues/376)) - * Add a new module `System.IO.OS` with operations for obtaining operating-system handles (file descriptors, Windows handles). ([CLC proposal #369](https://github.com/haskell/core-libraries-committee/issues/369)) + * Add a new module `System.IO.OS` with operations for detecting the type of operating-system handles in use (file descriptors, Windows handles) and obtaining such handles. (CLC proposals [#395](https://github.com/haskell/core-libraries-committee/issues/395) and [#369](https://github.com/haskell/core-libraries-committee/issues/369)) * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) ## 4.22.0.0 *TBA* ===================================== libraries/base/src/GHC/IO/SubSystem.hs ===================================== @@ -25,9 +25,9 @@ module GHC.IO.SubSystem whenIoSubSystem, ioSubSystem, IoSubSystem(..), - conditional, - (<!>), + {-# DEPRECATED "Please use System.IO.OS.osHandleType." #-} conditional, + {-# DEPRECATED "Please use System.IO.OS.osHandleType." #-} (<!>), isWindowsNativeIO ) where -import GHC.Internal.IO.SubSystem \ No newline at end of file +import GHC.Internal.IO.SubSystem ===================================== libraries/base/src/System/IO/OS.hs ===================================== @@ -6,6 +6,10 @@ -} module System.IO.OS ( + -- * OS handle type detection + OSHandleType (FileDescriptor, WindowsHandle), + osHandleType, + -- * Obtaining file descriptors and Windows handles withFileDescriptorReadingBiased, withFileDescriptorWritingBiased, @@ -23,6 +27,8 @@ where import GHC.Internal.System.IO.OS ( + OSHandleType (FileDescriptor, WindowsHandle), + osHandleType, withFileDescriptorReadingBiased, withFileDescriptorWritingBiased, withWindowsHandleReadingBiased, ===================================== libraries/base/tests/IO/all.T ===================================== @@ -189,9 +189,11 @@ test('mkdirExists', [exit_code(1), when(opsys('mingw32'), ignore_stderr)], compi test('osHandles001FileDescriptors', omit_ways(['winio', 'winio_threaded']), compile_and_run, ['']) test('osHandles001WindowsHandles', only_ways(['winio', 'winio_threaded']), compile_and_run, ['']) -test('osHandles002FileDescriptors', [when(opsys('mingw32'), skip), when(arch('javascript'), skip)], compile_and_run, ['']) +test('osHandles002FileDescriptors', omit_ways(['winio', 'winio_threaded']), compile_and_run, ['']) test('osHandles002WindowsHandles', only_ways(['winio', 'winio_threaded']), compile_and_run, ['']) -# It would be good to let `osHandles002FileDescriptors` run also on +test('osHandles003FileDescriptors', [when(opsys('mingw32'), skip), when(arch('javascript'), skip)], compile_and_run, ['']) +test('osHandles003WindowsHandles', only_ways(['winio', 'winio_threaded']), compile_and_run, ['']) +# It would be good to let `osHandles003FileDescriptors` run also on # Windows with the file-descriptor-based I/O manager. However, this # test, as it is currently implemented, requires the `unix` package. # That said, `UCRT.DLL`, which is used by GHC-generated Windows ===================================== libraries/base/tests/IO/osHandles001FileDescriptors.hs ===================================== @@ -1,23 +1,4 @@ -{-# LANGUAGE TypeApplications #-} - -import Control.Monad (mapM_) -import Control.Exception (SomeException, try) -import System.IO (stdin, stdout, stderr) -import System.IO.OS - ( - withFileDescriptorReadingBiasedRaw, - withFileDescriptorWritingBiasedRaw, - withWindowsHandleReadingBiasedRaw, - withWindowsHandleWritingBiasedRaw - ) +import System.IO.OS (osHandleType) main :: IO () -main = mapM_ ((>>= print) . try @SomeException) $ - [ - withFileDescriptorReadingBiasedRaw stdin (return . show), - withFileDescriptorWritingBiasedRaw stdout (return . show), - withFileDescriptorWritingBiasedRaw stderr (return . show), - withWindowsHandleReadingBiasedRaw stdin (return . const "_"), - withWindowsHandleWritingBiasedRaw stdout (return . const "_"), - withWindowsHandleWritingBiasedRaw stderr (return . const "_") - ] +main = print osHandleType ===================================== libraries/base/tests/IO/osHandles001FileDescriptors.stdout ===================================== @@ -1,6 +1 @@ -Right "0" -Right "1" -Right "2" -Left <stdin>: withWindowsHandleReadingBiasedRaw: inappropriate type (handle does not use Windows handles) -Left <stdout>: withWindowsHandleWritingBiasedRaw: inappropriate type (handle does not use Windows handles) -Left <stderr>: withWindowsHandleWritingBiasedRaw: inappropriate type (handle does not use Windows handles) +FileDescriptor ===================================== libraries/base/tests/IO/osHandles001WindowsHandles.hs ===================================== @@ -1,23 +1,4 @@ -{-# LANGUAGE TypeApplications #-} - -import Control.Monad (mapM_) -import Control.Exception (SomeException, try) -import System.IO (stdin, stdout, stderr) -import System.IO.OS - ( - withFileDescriptorReadingBiasedRaw, - withFileDescriptorWritingBiasedRaw, - withWindowsHandleReadingBiasedRaw, - withWindowsHandleWritingBiasedRaw - ) +import System.IO.OS (osHandleType) main :: IO () -main = mapM_ ((>>= print) . try @SomeException) $ - [ - withFileDescriptorReadingBiasedRaw stdin (return . show), - withFileDescriptorWritingBiasedRaw stdout (return . show), - withFileDescriptorWritingBiasedRaw stderr (return . show), - withWindowsHandleReadingBiasedRaw stdin (return . const "_"), - withWindowsHandleWritingBiasedRaw stdout (return . const "_"), - withWindowsHandleWritingBiasedRaw stderr (return . const "_") - ] +main = print osHandleType ===================================== libraries/base/tests/IO/osHandles001WindowsHandles.stdout ===================================== @@ -1,6 +1 @@ -Left <stdin>: withFileDescriptorReadingBiasedRaw: inappropriate type (handle does not use file descriptors) -Left <stdout>: withFileDescriptorWritingBiasedRaw: inappropriate type (handle does not use file descriptors) -Left <stderr>: withFileDescriptorWritingBiasedRaw: inappropriate type (handle does not use file descriptors) -Right "_" -Right "_" -Right "_" +WindowsHandle ===================================== libraries/base/tests/IO/osHandles002FileDescriptors.hs ===================================== @@ -1,28 +1,23 @@ -import Data.Functor (void) -import Data.ByteString.Char8 (pack) -import System.Posix.Types (Fd (Fd), ByteCount) -import System.Posix.IO.ByteString (fdRead, fdWrite) +{-# LANGUAGE TypeApplications #-} + +import Control.Monad (mapM_) +import Control.Exception (SomeException, try) import System.IO (stdin, stdout, stderr) import System.IO.OS ( - withFileDescriptorReadingBiased, - withFileDescriptorWritingBiased + withFileDescriptorReadingBiasedRaw, + withFileDescriptorWritingBiasedRaw, + withWindowsHandleReadingBiasedRaw, + withWindowsHandleWritingBiasedRaw ) main :: IO () -main = withFileDescriptorReadingBiased stdin $ \ stdinFD -> - withFileDescriptorWritingBiased stdout $ \ stdoutFD -> - withFileDescriptorWritingBiased stderr $ \ stderrFD -> - do - regularMsg <- fdRead (Fd stdinFD) inputSizeApproximation - void $ fdWrite (Fd stdoutFD) regularMsg - void $ fdWrite (Fd stderrFD) (pack errorMsg) - where - - inputSizeApproximation :: ByteCount - inputSizeApproximation = 100 - - errorMsg :: String - errorMsg = "And every single door\n\ - \That I've walked through\n\ - \Brings me back, back here again\n" +main = mapM_ ((>>= print) . try @SomeException) $ + [ + withFileDescriptorReadingBiasedRaw stdin (return . show), + withFileDescriptorWritingBiasedRaw stdout (return . show), + withFileDescriptorWritingBiasedRaw stderr (return . show), + withWindowsHandleReadingBiasedRaw stdin (return . const "_"), + withWindowsHandleWritingBiasedRaw stdout (return . const "_"), + withWindowsHandleWritingBiasedRaw stderr (return . const "_") + ] ===================================== libraries/base/tests/IO/osHandles002FileDescriptors.stdout ===================================== @@ -1 +1,6 @@ -We've got to get in to get out +Right "0" +Right "1" +Right "2" +Left <stdin>: withWindowsHandleReadingBiasedRaw: inappropriate type (handle does not use Windows handles) +Left <stdout>: withWindowsHandleWritingBiasedRaw: inappropriate type (handle does not use Windows handles) +Left <stderr>: withWindowsHandleWritingBiasedRaw: inappropriate type (handle does not use Windows handles) ===================================== libraries/base/tests/IO/osHandles002WindowsHandles.hs ===================================== @@ -1,49 +1,23 @@ -import Control.Monad (zipWithM_) -import Data.Functor (void) -import Data.Char (ord) -import Foreign.Marshal.Alloc (allocaBytes) -import Foreign.Storable (pokeElemOff) +{-# LANGUAGE TypeApplications #-} + +import Control.Monad (mapM_) +import Control.Exception (SomeException, try) import System.IO (stdin, stdout, stderr) import System.IO.OS ( - withWindowsHandleReadingBiased, - withWindowsHandleWritingBiased + withFileDescriptorReadingBiasedRaw, + withFileDescriptorWritingBiasedRaw, + withWindowsHandleReadingBiasedRaw, + withWindowsHandleWritingBiasedRaw ) main :: IO () -main = withWindowsHandleReadingBiased stdin $ \ windowsStdin -> - withWindowsHandleWritingBiased stdout $ \ windowsStdout -> - withWindowsHandleWritingBiased stderr $ \ windowsStderr -> - do - withBuffer inputSizeApproximation $ \ bufferPtr -> do - inputSize <- win32_ReadFile windowsStdin - bufferPtr - inputSizeApproximation - Nothing - void $ win32_WriteFile windowsStdout - bufferPtr - inputSize - Nothing - withBuffer errorMsgSize $ \ bufferPtr -> do - zipWithM_ (pokeElemOff bufferPtr) - [0 ..] - (map (fromIntegral . ord) errorMsg) - void $ win32_WriteFile windowsStderr - bufferPtr - errorMsgSize - Nothing - where - - withBuffer :: DWORD -> (Ptr Word8 -> IO a) -> IO a - withBuffer = allocaBytes . fromIntegral - - inputSizeApproximation :: DWORD - inputSizeApproximation = 100 - - errorMsg :: String - errorMsg = "And every single door\n\ - \That I've walked through\n\ - \Brings me back, back here again\n" - - errorMsgSize :: DWORD - errorMsgSize = fromIntegral (length errorMsg) +main = mapM_ ((>>= print) . try @SomeException) $ + [ + withFileDescriptorReadingBiasedRaw stdin (return . show), + withFileDescriptorWritingBiasedRaw stdout (return . show), + withFileDescriptorWritingBiasedRaw stderr (return . show), + withWindowsHandleReadingBiasedRaw stdin (return . const "_"), + withWindowsHandleWritingBiasedRaw stdout (return . const "_"), + withWindowsHandleWritingBiasedRaw stderr (return . const "_") + ] ===================================== libraries/base/tests/IO/osHandles002WindowsHandles.stdout ===================================== @@ -1 +1,6 @@ -We've got to get in to get out +Left <stdin>: withFileDescriptorReadingBiasedRaw: inappropriate type (handle does not use file descriptors) +Left <stdout>: withFileDescriptorWritingBiasedRaw: inappropriate type (handle does not use file descriptors) +Left <stderr>: withFileDescriptorWritingBiasedRaw: inappropriate type (handle does not use file descriptors) +Right "_" +Right "_" +Right "_" ===================================== libraries/base/tests/IO/osHandles003FileDescriptors.hs ===================================== @@ -0,0 +1,28 @@ +import Data.Functor (void) +import Data.ByteString.Char8 (pack) +import System.Posix.Types (Fd (Fd), ByteCount) +import System.Posix.IO.ByteString (fdRead, fdWrite) +import System.IO (stdin, stdout, stderr) +import System.IO.OS + ( + withFileDescriptorReadingBiased, + withFileDescriptorWritingBiased + ) + +main :: IO () +main = withFileDescriptorReadingBiased stdin $ \ stdinFD -> + withFileDescriptorWritingBiased stdout $ \ stdoutFD -> + withFileDescriptorWritingBiased stderr $ \ stderrFD -> + do + regularMsg <- fdRead (Fd stdinFD) inputSizeApproximation + void $ fdWrite (Fd stdoutFD) regularMsg + void $ fdWrite (Fd stderrFD) (pack errorMsg) + where + + inputSizeApproximation :: ByteCount + inputSizeApproximation = 100 + + errorMsg :: String + errorMsg = "And every single door\n\ + \That I've walked through\n\ + \Brings me back, back here again\n" ===================================== libraries/base/tests/IO/osHandles002FileDescriptors.stderr → libraries/base/tests/IO/osHandles003FileDescriptors.stderr ===================================== ===================================== libraries/base/tests/IO/osHandles002FileDescriptors.stdin → libraries/base/tests/IO/osHandles003FileDescriptors.stdin ===================================== ===================================== libraries/base/tests/IO/osHandles002WindowsHandles.stdin → libraries/base/tests/IO/osHandles003FileDescriptors.stdout ===================================== ===================================== libraries/base/tests/IO/osHandles003WindowsHandles.hs ===================================== @@ -0,0 +1,49 @@ +import Control.Monad (zipWithM_) +import Data.Functor (void) +import Data.Char (ord) +import Foreign.Marshal.Alloc (allocaBytes) +import Foreign.Storable (pokeElemOff) +import System.IO (stdin, stdout, stderr) +import System.IO.OS + ( + withWindowsHandleReadingBiased, + withWindowsHandleWritingBiased + ) + +main :: IO () +main = withWindowsHandleReadingBiased stdin $ \ windowsStdin -> + withWindowsHandleWritingBiased stdout $ \ windowsStdout -> + withWindowsHandleWritingBiased stderr $ \ windowsStderr -> + do + withBuffer inputSizeApproximation $ \ bufferPtr -> do + inputSize <- win32_ReadFile windowsStdin + bufferPtr + inputSizeApproximation + Nothing + void $ win32_WriteFile windowsStdout + bufferPtr + inputSize + Nothing + withBuffer errorMsgSize $ \ bufferPtr -> do + zipWithM_ (pokeElemOff bufferPtr) + [0 ..] + (map (fromIntegral . ord) errorMsg) + void $ win32_WriteFile windowsStderr + bufferPtr + errorMsgSize + Nothing + where + + withBuffer :: DWORD -> (Ptr Word8 -> IO a) -> IO a + withBuffer = allocaBytes . fromIntegral + + inputSizeApproximation :: DWORD + inputSizeApproximation = 100 + + errorMsg :: String + errorMsg = "And every single door\n\ + \That I've walked through\n\ + \Brings me back, back here again\n" + + errorMsgSize :: DWORD + errorMsgSize = fromIntegral (length errorMsg) ===================================== libraries/base/tests/IO/osHandles002WindowsHandles.stderr → libraries/base/tests/IO/osHandles003WindowsHandles.stderr ===================================== ===================================== libraries/base/tests/IO/osHandles003WindowsHandles.stdin ===================================== @@ -0,0 +1 @@ +We've got to get in to get out ===================================== libraries/base/tests/IO/osHandles003WindowsHandles.stdout ===================================== @@ -0,0 +1 @@ +We've got to get in to get out ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs ===================================== @@ -8,6 +8,10 @@ -} module GHC.Internal.System.IO.OS ( + -- * OS handle type detection + OSHandleType (FileDescriptor, WindowsHandle), + osHandleType, + -- * Obtaining file descriptors and Windows handles withFileDescriptorReadingBiased, withFileDescriptorWritingBiased, @@ -23,6 +27,10 @@ module GHC.Internal.System.IO.OS ) where +import GHC.Internal.Classes (Eq, Ord) +import GHC.Internal.Enum (Bounded, Enum) +import GHC.Internal.Show (Show) +import GHC.Internal.Read (Read) import GHC.Internal.Control.Monad (return) import GHC.Internal.Control.Concurrent.MVar (MVar) import GHC.Internal.Control.Exception (mask) @@ -39,6 +47,7 @@ import GHC.Internal.Data.List ((++)) import GHC.Internal.Data.String (String) import GHC.Internal.Data.Typeable (Typeable, cast) import GHC.Internal.System.IO (IO) +import GHC.Internal.IO.SubSystem (conditional) import GHC.Internal.IO.FD (fdFD) #if defined(mingw32_HOST_OS) import GHC.Internal.IO.Windows.Handle @@ -64,6 +73,19 @@ import GHC.Internal.IO.Exception import GHC.Internal.Foreign.Ptr (Ptr) import GHC.Internal.Foreign.C.Types (CInt) +-- * OS handle type detection + +-- | The type of operating-system handle types. +data OSHandleType = FileDescriptor | WindowsHandle + deriving (Eq, Ord, Bounded, Enum, Show, Read) + +{-| + The type of operating-system handles that underlie Haskell handles with the + I/O manager currently in use. +-} +osHandleType :: OSHandleType +osHandleType = conditional FileDescriptor WindowsHandle + -- * Obtaining POSIX file descriptors and Windows handles {-| ===================================== testsuite/tests/interface-stability/base-exports.stdout ===================================== @@ -10050,6 +10050,9 @@ module System.IO.Error where module System.IO.OS where -- Safety: Safe + type OSHandleType :: * + data OSHandleType = FileDescriptor | WindowsHandle + osHandleType :: OSHandleType withFileDescriptorReadingBiased :: forall r. GHC.Internal.IO.Handle.Types.Handle -> (GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Types.IO r) -> GHC.Internal.Types.IO r withFileDescriptorReadingBiasedRaw :: forall r. GHC.Internal.IO.Handle.Types.Handle -> (GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Types.IO r) -> GHC.Internal.Types.IO r withFileDescriptorWritingBiased :: forall r. GHC.Internal.IO.Handle.Types.Handle -> (GHC.Internal.Foreign.C.Types.CInt -> GHC.Internal.Types.IO r) -> GHC.Internal.Types.IO r @@ -11375,6 +11378,7 @@ instance forall (c :: GHC.Internal.Types.Char). GHC.Internal.Classes.Eq (GHC.Int instance forall (s :: GHC.Internal.Types.Symbol). GHC.Internal.Classes.Eq (GHC.Internal.TypeLits.SSymbol s) -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Classes.Eq GHC.Internal.TypeLits.SomeChar -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Classes.Eq GHC.Internal.TypeLits.SomeSymbol -- Defined in ‘GHC.Internal.TypeLits’ +instance [safe] GHC.Internal.Classes.Eq GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance GHC.Internal.Classes.Eq System.Timeout.Timeout -- Defined in ‘System.Timeout’ instance GHC.Internal.Classes.Eq GHC.Internal.Text.Read.Lex.Lexeme -- Defined in ‘GHC.Internal.Text.Read.Lex’ instance GHC.Internal.Classes.Eq GHC.Internal.Text.Read.Lex.Number -- Defined in ‘GHC.Internal.Text.Read.Lex’ @@ -11528,6 +11532,7 @@ instance forall (c :: GHC.Internal.Types.Char). GHC.Internal.Classes.Ord (GHC.In instance forall (s :: GHC.Internal.Types.Symbol). GHC.Internal.Classes.Ord (GHC.Internal.TypeLits.SSymbol s) -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Classes.Ord GHC.Internal.TypeLits.SomeChar -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Classes.Ord GHC.Internal.TypeLits.SomeSymbol -- Defined in ‘GHC.Internal.TypeLits’ +instance [safe] GHC.Internal.Classes.Ord GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance GHC.Internal.Control.Arrow.Arrow (->) -- Defined in ‘GHC.Internal.Control.Arrow’ instance forall (m :: * -> *). GHC.Internal.Base.Monad m => GHC.Internal.Control.Arrow.Arrow (GHC.Internal.Control.Arrow.Kleisli m) -- Defined in ‘GHC.Internal.Control.Arrow’ instance GHC.Internal.Control.Arrow.ArrowApply (->) -- Defined in ‘GHC.Internal.Control.Arrow’ @@ -11927,6 +11932,7 @@ instance GHC.Internal.Enum.Bounded GHC.Internal.Generics.Associativity -- Define instance GHC.Internal.Enum.Bounded GHC.Internal.Generics.DecidedStrictness -- Defined in ‘GHC.Internal.Generics’ instance GHC.Internal.Enum.Bounded GHC.Internal.Generics.SourceStrictness -- Defined in ‘GHC.Internal.Generics’ instance GHC.Internal.Enum.Bounded GHC.Internal.Generics.SourceUnpackedness -- Defined in ‘GHC.Internal.Generics’ +instance [safe] GHC.Internal.Enum.Bounded GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance forall a k (b :: k). GHC.Internal.Enum.Enum a => GHC.Internal.Enum.Enum (GHC.Internal.Data.Functor.Const.Const a b) -- Defined in ‘GHC.Internal.Data.Functor.Const’ instance forall a. GHC.Internal.Enum.Enum a => GHC.Internal.Enum.Enum (GHC.Internal.Data.Bits.And a) -- Defined in ‘GHC.Internal.Data.Bits’ instance forall a. GHC.Internal.Enum.Enum a => GHC.Internal.Enum.Enum (GHC.Internal.Data.Bits.Iff a) -- Defined in ‘GHC.Internal.Data.Bits’ @@ -12008,6 +12014,7 @@ instance GHC.Internal.Enum.Enum GHC.Internal.IO.Device.SeekMode -- Defined in instance GHC.Internal.Enum.Enum GHC.Internal.IO.IOMode.IOMode -- Defined in ‘GHC.Internal.IO.IOMode’ instance GHC.Internal.Enum.Enum GHC.Internal.IO.SubSystem.IoSubSystem -- Defined in ‘GHC.Internal.IO.SubSystem’ instance GHC.Internal.Enum.Enum GHC.RTS.Flags.IoManagerFlag -- Defined in ‘GHC.RTS.Flags’ +instance [safe] GHC.Internal.Enum.Enum GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance GHC.Internal.Exception.Context.ExceptionAnnotation GHC.Internal.Exception.Type.WhileHandling -- Defined in ‘GHC.Internal.Exception.Type’ instance GHC.Internal.Exception.Context.ExceptionAnnotation GHC.Internal.Exception.Backtrace.Backtraces -- Defined in ‘GHC.Internal.Exception.Backtrace’ instance GHC.Internal.Exception.Type.Exception GHC.Internal.IO.Exception.AllocationLimitExceeded -- Defined in ‘GHC.Internal.IO.Exception’ @@ -12555,6 +12562,7 @@ instance [safe] GHC.Internal.Read.Read GHC.Stats.RTSStats -- Defined in ‘GHC.S instance GHC.Internal.Read.Read GHC.Internal.TypeNats.SomeNat -- Defined in ‘GHC.Internal.TypeNats’ instance GHC.Internal.Read.Read GHC.Internal.TypeLits.SomeChar -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Read.Read GHC.Internal.TypeLits.SomeSymbol -- Defined in ‘GHC.Internal.TypeLits’ +instance [safe] GHC.Internal.Read.Read GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance forall a k (b :: k). GHC.Internal.Real.Fractional a => GHC.Internal.Real.Fractional (GHC.Internal.Data.Functor.Const.Const a b) -- Defined in ‘GHC.Internal.Data.Functor.Const’ instance forall a. GHC.Internal.Float.RealFloat a => GHC.Internal.Real.Fractional (Data.Complex.Complex a) -- Defined in ‘Data.Complex’ instance forall k (a :: k). Data.Fixed.HasResolution a => GHC.Internal.Real.Fractional (Data.Fixed.Fixed a) -- Defined in ‘Data.Fixed’ @@ -12894,6 +12902,7 @@ instance forall (c :: GHC.Internal.Types.Char). GHC.Internal.Show.Show (GHC.Inte instance forall (s :: GHC.Internal.Types.Symbol). GHC.Internal.Show.Show (GHC.Internal.TypeLits.SSymbol s) -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Show.Show GHC.Internal.TypeLits.SomeChar -- Defined in ‘GHC.Internal.TypeLits’ instance GHC.Internal.Show.Show GHC.Internal.TypeLits.SomeSymbol -- Defined in ‘GHC.Internal.TypeLits’ +instance [safe] GHC.Internal.Show.Show GHC.Internal.System.IO.OS.OSHandleType -- Defined in ‘GHC.Internal.System.IO.OS’ instance GHC.Internal.Show.Show System.Timeout.Timeout -- Defined in ‘System.Timeout’ instance GHC.Internal.Show.Show GHC.Internal.Text.Read.Lex.Lexeme -- Defined in ‘GHC.Internal.Text.Read.Lex’ instance GHC.Internal.Show.Show GHC.Internal.Text.Read.Lex.Number -- Defined in ‘GHC.Internal.Text.Read.Lex’ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/24092702f26bb5ed4c6b0c97a2be785… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/24092702f26bb5ed4c6b0c97a2be785… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/ticked_joins] reduce allocs in OccAnal
by sheaf (＠sheaf) 28 Jan '26

28 Jan '26

sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC Commits: 0cf400ee by sheaf at 2026-01-28T14:57:56+01:00 reduce allocs in OccAnal - - - - - 2 changed files: - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/OccurAnal.hs Changes: ===================================== compiler/GHC/Core/Opt/Exitify.hs ===================================== @@ -327,16 +327,16 @@ Rationale for (ExitQuasi2): Suppose we have: - quasijoinrec j x = case x of { 0 -> 100; _ -> j (x-1) } in j 0 |> co + quasijoinrec j x = case x of { 0 -> 100; _ -> j (x-1) } in j 0 |> co If we float an exit out of 'j', we end up with - join exit = 100 in - quasijoinrec j x = case x of { 0 -> exit ; _ -> j (x-1) } in j 0 |> co + join exit = 100 in + quasijoinrec j x = case x of { 0 -> exit ; _ -> j (x-1) } in j 0 |> co Now suppose we inline j and simplify; we end up with: - join exit = 100 in exit |> co + join exit = 100 in (exit |> co) We see now that 'exit' must be a quasi join point, due to the cast. ===================================== compiler/GHC/Core/Opt/OccurAnal.hs ===================================== @@ -3714,31 +3714,21 @@ localTailCallInfo (OneOccL { lo_tail = tci }) = tci localTailCallInfo (ManyOccL tci) = tci type ZappedSet = OccInfoEnv -- Values are ignored - --- | Either zap a tail call or set it to a quasi tail call. --- --- See Note [Quasi join points] in GHC.Core.Opt.Simplify.Iteration. -type ZapTailSet = IdEnv MarkNonTail - -data MarkNonTail - = MarkQuasi - | MarkNonTail - deriving stock ( Eq, Show ) -instance Outputable MarkNonTail where - ppr MarkQuasi = text "MarkQuasi" - ppr MarkNonTail = text "MarkNonTail" -instance Semigroup MarkNonTail where - MarkQuasi <> MarkQuasi = MarkQuasi - _ <> _ = MarkNonTail - data UsageDetails = UD { ud_env :: !OccInfoEnv , ud_z_many :: !ZappedSet -- ^ apply 'markMany' to these , ud_z_in_lam :: !ZappedSet -- ^ apply 'markInsideLam' to these - , ud_z_tail :: !ZapTailSet -- ^ zap tail-call info for these + , ud_z_tail :: !ZappedSet -- ^ zap tail-call info for these + , ud_z_quasi :: !ZappedSet -- ^ mark these as quasi tail-calls + -- See Note [Quasi join points] in GHC.Core.Opt.Simplify.Iteration } -- INVARIANT: All three zapped sets are subsets of ud_env +-- Implementation remark: having two separate sets (ud_z_tail and ud_z_quasi) +-- is significantly more efficient than having a single 'IdEnv IsTrueJoinPoint', +-- as having to use 'strictPlusVarEnv_C' in 'combineUsageDetailsWith' +-- hugely regresses allocations in e.g. T24471. + instance Outputable UsageDetails where ppr ud@(UD { ud_env = env, ud_z_tail = z_tail }) = text "UD" <> (braces (vcat @@ -3852,19 +3842,25 @@ mkSimpleDetails :: OccInfoEnv -> UsageDetails mkSimpleDetails env = UD { ud_env = env , ud_z_many = emptyVarEnv , ud_z_in_lam = emptyVarEnv - , ud_z_tail = emptyVarEnv } + , ud_z_tail = emptyVarEnv + , ud_z_quasi = emptyVarEnv } modifyUDEnv :: (OccInfoEnv -> OccInfoEnv) -> UsageDetails -> UsageDetails modifyUDEnv f uds@(UD { ud_env = env }) = uds { ud_env = f env } delBndrsFromUDs :: [Var] -> UsageDetails -> UsageDetails -- Delete these binders from the UsageDetails -delBndrsFromUDs bndrs (UD { ud_env = env, ud_z_many = z_many - , ud_z_in_lam = z_in_lam, ud_z_tail = z_tail }) - = UD { ud_env = env `delVarEnvList` bndrs - , ud_z_many = z_many `delVarEnvList` bndrs - , ud_z_in_lam = z_in_lam `delVarEnvList` bndrs - , ud_z_tail = z_tail `delVarEnvList` bndrs } +delBndrsFromUDs bndrs + (UD { ud_env = env + , ud_z_many = z_many + , ud_z_in_lam = z_in_lam + , ud_z_tail = z_tail + , ud_z_quasi = z_quasi }) + = UD { ud_env = env `delVarEnvList` bndrs + , ud_z_many = z_many `delVarEnvList` bndrs + , ud_z_in_lam = z_in_lam `delVarEnvList` bndrs + , ud_z_tail = z_tail `delVarEnvList` bndrs + , ud_z_quasi = z_quasi `delVarEnvList` bndrs } markAllMany, markAllInsideLam, markAllNonTail, markAllQuasiTail, markAllManyNonTail :: HasDebugCallStack => UsageDetails -> UsageDetails @@ -3872,13 +3868,8 @@ markAllMany ud@(UD { ud_env = env }) = ud { ud_z_many = env } markAllInsideLam ud@(UD { ud_env = env }) = ud { ud_z_in_lam = env } markAllManyNonTail = markAllMany . markAllNonTail -- effectively sets to noOccInfo -markAllNonTail ud@(UD { ud_env = env }) = - ud { ud_z_tail = fmap (const MarkNonTail) env } -markAllQuasiTail ud@(UD { ud_env = env, ud_z_tail = z_tail }) = - let quasis = fmap (const MarkQuasi) env - in ud { ud_z_tail = strictPlusVarEnv_C (Semi.<>) quasis z_tail } - -- NB: be careful not to override any MarkNonTail with MarkQuasi. - +markAllNonTail ud@(UD { ud_env = env }) = ud { ud_z_tail = env } +markAllQuasiTail ud@(UD { ud_env = env }) = ud { ud_z_quasi = env } markAllInsideLamIf, markAllNonTailIf :: HasDebugCallStack => Bool -> UsageDetails -> UsageDetails markAllInsideLamIf True ud = markAllInsideLam ud @@ -3888,24 +3879,28 @@ markAllNonTailIf True ud = markAllNonTail ud markAllNonTailIf False ud = ud lookupTailCallInfo :: UsageDetails -> Id -> TailCallInfo -lookupTailCallInfo (UD { ud_env = env, ud_z_tail = z_tail }) id = +lookupTailCallInfo (UD { ud_env = env, ud_z_tail = z_tail, ud_z_quasi = z_quasi }) id = case localTailCallInfo <$> lookupVarEnv env id of Nothing -> NoTailCallInfo - Just ti -> maybeZapTailCallInfo ti z_tail (idUnique id) - -maybeZapTailCallInfo :: TailCallInfo -> ZapTailSet -> Unique -> TailCallInfo -maybeZapTailCallInfo tail_info0 z_tail id_unique = - case lookupVarEnv_Directly z_tail id_unique of - Just MarkNonTail -> NoTailCallInfo - - -- See Note [Quasi join points] in GHC.Core.Opt.Simplify.Iteration. - Just MarkQuasi -> - case tail_info0 of - NoTailCallInfo -> NoTailCallInfo - atc@AlwaysTailCalled {} -> - atc { tailCallJoinPointType = QuasiJoinPoint } - - Nothing -> tail_info0 + Just ti -> maybeZapTailCallInfo ti z_tail z_quasi (idUnique id) + +maybeZapTailCallInfo + :: TailCallInfo + -> ZappedSet -- ^ zap tail + -> ZappedSet -- ^ quasi tail + -> Unique + -> TailCallInfo +maybeZapTailCallInfo tail_info0 no_tail quasi_tail id_unique + | elemVarEnvByKey id_unique no_tail + = NoTailCallInfo + | elemVarEnvByKey id_unique quasi_tail + -- See Note [Quasi join points] in GHC.Core.Opt.Simplify.Iteration. + = case tail_info0 of + NoTailCallInfo -> NoTailCallInfo + atc@AlwaysTailCalled {} -> + atc { tailCallJoinPointType = QuasiJoinPoint } + | otherwise + = tail_info0 udFreeVars :: VarSet -> UsageDetails -> VarSet -- Find the subset of bndrs that are mentioned in uds @@ -3921,18 +3916,20 @@ combineUsageDetailsWith :: (Unique -> LocalOcc -> LocalOcc -> LocalOcc) -> UsageDetails -> UsageDetails -> UsageDetails {-# INLINE combineUsageDetailsWith #-} combineUsageDetailsWith plus_occ_info - uds1@(UD { ud_env = env1, ud_z_many = z_many1, ud_z_in_lam = z_in_lam1, ud_z_tail = z_tail1 }) - uds2@(UD { ud_env = env2, ud_z_many = z_many2, ud_z_in_lam = z_in_lam2, ud_z_tail = z_tail2 }) + uds1@(UD { ud_env = env1, ud_z_many = z_many1, ud_z_in_lam = z_in_lam1, ud_z_tail = z_tail1, ud_z_quasi = z_quasi1 }) + uds2@(UD { ud_env = env2, ud_z_many = z_many2, ud_z_in_lam = z_in_lam2, ud_z_tail = z_tail2, ud_z_quasi = z_quasi2 }) | isEmptyVarEnv env1 = uds2 | isEmptyVarEnv env2 = uds1 | otherwise -- See Note [Strictness in the occurrence analyser] -- Using strictPlusVarEnv here speeds up the test T26425 -- by about 10% by avoiding intermediate thunks. - = UD { ud_env = strictPlusVarEnv_C_Directly plus_occ_info env1 env2 - , ud_z_many = strictPlusVarEnv z_many1 z_many2 - , ud_z_in_lam = plusVarEnv z_in_lam1 z_in_lam2 - , ud_z_tail = strictPlusVarEnv_C (Semi.<>) z_tail1 z_tail2 } + = UD { ud_env = strictPlusVarEnv_C_Directly plus_occ_info env1 env2 + , ud_z_many = strictPlusVarEnv z_many1 z_many2 + , ud_z_in_lam = plusVarEnv z_in_lam1 z_in_lam2 + , ud_z_tail = strictPlusVarEnv z_tail1 z_tail2 + , ud_z_quasi = strictPlusVarEnv z_quasi1 z_quasi2 + } lookupLetOccInfo :: UsageDetails -> Id -> OccInfo -- Don't use locally-generated occ_info for exported (visible-elsewhere) @@ -3950,13 +3947,14 @@ lookupOccInfoByUnique :: UsageDetails -> Unique -> OccInfo lookupOccInfoByUnique (UD { ud_env = env , ud_z_many = z_many , ud_z_in_lam = z_in_lam - , ud_z_tail = z_tail }) + , ud_z_tail = z_tail + , ud_z_quasi = z_quasi }) uniq = case lookupVarEnv_Directly env uniq of Nothing -> IAmDead Just (OneOccL { lo_n_br = n_br, lo_int_cxt = int_cxt , lo_tail = tail_info }) - | uniq `elemVarEnvByKey`z_many + | uniq `elemVarEnvByKey` z_many -> ManyOccs { occ_tail = mk_tail_info tail_info } | otherwise -> OneOcc { occ_in_lam = in_lam @@ -3969,7 +3967,7 @@ lookupOccInfoByUnique (UD { ud_env = env Just (ManyOccL tail_info) -> ManyOccs { occ_tail = mk_tail_info tail_info } where - mk_tail_info ti = maybeZapTailCallInfo ti z_tail uniq + mk_tail_info ti = maybeZapTailCallInfo ti z_tail z_quasi uniq ------------------- -- See Note [Adjusting right-hand sides] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0cf400eea489c3ccae58dd9e2ef2fb6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0cf400eea489c3ccae58dd9e2ef2fb6… You're receiving this email because of your account on gitlab.haskell.org.

1 0