January 2026 - ghc-commits

[Git][ghc/ghc][wip/26416] DmdAnal: Don't give an absent demand signature to an argument if the argument doesn't
by Zubin (＠wz1000) 14 Jan '26

14 Jan '26

Zubin pushed to branch wip/26416 at Glasgow Haskell Compiler / GHC Commits: 3723f07e by Zubin Duggal at 2026-01-14T19:50:40+05:30 DmdAnal: Don't give an absent demand signature to an argument if the argument doesn't also have an absent demand signature in its unfolding. Otherwise, in some cases we might mark an argument as absent and generate a LitRubbish for it, but then the function might inline and turn out to actually use this argument, resulting in a run time crash. Partially addresses #26416. There may still be cases where an absent argument turns out to be used due to a rule firing. - - - - - 3 changed files: - compiler/GHC/Core/Opt/DmdAnal.hs - + testsuite/tests/dmdanal/should_run/M1.hs - + testsuite/tests/dmdanal/should_run/T26416.hs Changes: ===================================== compiler/GHC/Core/Opt/DmdAnal.hs ===================================== @@ -1106,8 +1106,17 @@ dmdAnalRhsSig top_lvl rec_flag env let_sd id rhs WithDmdType rhs_dmd_ty rhs' = dmdAnal env rhs_sd rhs DmdType rhs_env rhs_dmds = rhs_dmd_ty + + -- See Note [Absence analysis for stable unfoldings and RULES] + -- If there's a stable unfolding, we need to combine argument demands + -- from the unfolding with those from the RHS, because the unfolding + -- might use arguments that the (optimised) RHS doesn't. + -- Any argument with a demand absent in one but not the other can + -- be problematic, see #26416 + combined_rhs_dmds = combineUnfoldingDmds env rhs_sd id rhs_dmds + (final_rhs_dmds, final_rhs) = finaliseArgBoxities env id ww_arity - rhs_dmds (de_div rhs_env) rhs' + combined_rhs_dmds (de_div rhs_env) rhs' dmd_sig_arity = ww_arity + strictCallArity body_sd sig = mkDmdSigForArity dmd_sig_arity (DmdType sig_env final_rhs_dmds) @@ -1144,6 +1153,28 @@ splitWeakDmds :: DmdEnv -> (DmdEnv, WeakDmds) splitWeakDmds (DE fvs div) = (DE sig_fvs div, weak_fvs) where (!weak_fvs, !sig_fvs) = partitionVarEnv isWeakDmd fvs +-- | If there is a stable unfolding, don't let any demand be absent that +-- is also not absent in the unfolding +-- See Note [Absence analysis for stable unfoldings and RULES], Wrinkle (W3). +combineUnfoldingDmds :: AnalEnv -> SubDemand -> Id -> [Demand] -> [Demand] +combineUnfoldingDmds env rhs_sd id rhs_dmds + | not (isStableUnfolding unf) + = rhs_dmds -- No stable unfolding, nothing to do + + | Just unf_body <- maybeUnfoldingTemplate unf + , let WithDmdType (DmdType _ unf_dmds) _ = dmdAnal env rhs_sd unf_body + , let result = go rhs_dmds unf_dmds + = -- pprTrace "lubUnfoldingDmds" (ppr id $$ ppr rhs_dmds $$ ppr unf_dmds $$ ppr result) $ + result + | otherwise = rhs_dmds + where + unf = realIdUnfolding id + go rhs [] = rhs + go [] _ = [] + go (AbsDmd:rhs) (u:unfs) = u : go rhs unfs + go (r:rhs) (AbsDmd:unfs) = r : go rhs unfs + go (r:rhs) (_:unfs) = r : go rhs unfs + -- | The result type after applying 'idArity' many arguments. Returns 'Nothing' -- when the type doesn't have exactly 'idArity' many arrows. resultType_maybe :: Id -> Maybe Type @@ -1523,6 +1554,25 @@ Wrinkles: for `sg`, failing to unleash the signature and hence observed an absent error instead of the `really important message`. + (W3) The SOLUTION above handles /free variables/ of stable unfoldings, but + what about /arguments/? Consider (#25965) + + fromVector :: (Storable a, KnownNat n) => Vector a -> Vector a + fromVector v = ... (uses Storable dictionary) ... + {-# INLINABLE fromVector #-} + + Suppose that the optimised RHS of `fromVector` somehow discards the use of + the Storable dictionary, but the stable unfolding still uses it. Then the + demand signature will say that the Storable dictionary argument is absent, + and worker/wrapper will replace it with `LitRubbish`. But when the + worker's unfolding is inlined, it will use that rubbish value as a real + dictionary, leading to a segfault! + + SOLUTION: in `dmdAnalRhsSig`, if the function has a stable unfolding, + analyse it and drop any AbsDmds which are not absent in the unfolding. + This is done by `combineUnfoldingDmds`. This ensures that if the unfolding + uses an argument, it won't be marked as absent. + Note [DmdAnal for DataCon wrappers] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We give DataCon wrappers a (necessarily flat) demand signature in @@ -2046,8 +2096,11 @@ finaliseArgBoxities env fn ww_arity arg_dmds div rhs arg_triples :: [(Type, StrictnessMark, Demand)] arg_triples = take ww_arity $ - [ (idType bndr, NotMarkedStrict, get_dmd bndr) - | bndr <- bndrs, isRuntimeVar bndr ] + zipWith mk_triple + [ bndr | bndr <- bndrs, isRuntimeVar bndr ] + arg_dmds + where + mk_triple bndr dmd = (idType bndr, NotMarkedStrict, get_dmd dmd) arg_dmds' = ww_arg_dmds ++ map trimBoxity (drop ww_arity arg_dmds) -- If ww_arity < length arg_dmds, the leftover ones @@ -2063,12 +2116,10 @@ finaliseArgBoxities env fn ww_arity arg_dmds div rhs -- This is the budget initialisation step of -- Note [Worker argument budget] - get_dmd :: Id -> Demand - get_dmd bndr + get_dmd :: Demand -> Demand + get_dmd dmd | is_bot_fn = unboxDeeplyDmd dmd -- See Note [Boxity for bottoming functions], | otherwise = dmd -- case (B) - where - dmd = idDemandInfo bndr -- is_bot_fn: see Note [Boxity for bottoming functions] is_bot_fn = div == botDiv ===================================== testsuite/tests/dmdanal/should_run/M1.hs ===================================== @@ -0,0 +1,17 @@ +-- Short module name is essential, or else f doesn't inline +module M1 where +{-# INLINABLE [2] f #-} +f :: Int -> Int -> Float +f !dummy x = if times dummy 0 x == 1 + then 3.0 else 4.0 + +{-# INLINE [0] times #-} +times :: Int -> Int -> Int -> Int +times dummy 0 x = x `seq` ( 0 + big dummy ) +times _ a b = a * b + +{-# RULES "times" [1] forall dummy x. times dummy 0 x = 0 + big dummy #-} + +big :: Int -> Int +big x = succ . succ . succ . succ . succ . succ . succ . succ . succ $ x +{-# INLINE big #-} ===================================== testsuite/tests/dmdanal/should_run/T26416.hs ===================================== @@ -0,0 +1,3 @@ +module Main where +import M1 ( f ) +main = print (f 19 12) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3723f07e0a325a3efd863022d728cdc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3723f07e0a325a3efd863022d728cdc… You're receiving this email because of your account on gitlab.haskell.org.

1 0

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

14 Jan '26

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

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 23 commits: [#26183] Associated Type Iface Fix
by Sven Tennie (＠supersven) 14 Jan '26

14 Jan '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 8a317b6f by Aaron Allen at 2026-01-01T03:05:15-05:00 [#26183] Associated Type Iface Fix When determining "extras" for class decl interface entries, axioms for the associated types need to included so that dependent modules will be recompiled if those axioms change. resolves #26183 - - - - - ae1aeaab by Cheng Shao at 2026-01-01T03:06:32-05:00 testsuite: run numeric tests with optasm when available This patch adds the `optasm` extra way to nueric tests when NCG is available. Some numeric bugs only surface with optimization, omitting this can hide these bugs and even make them slip into release! (e.g. #26711) - - - - - 6213bb57 by maralorn at 2026-01-02T16:30:32+01:00 GHC.Internal.Exception.Context: Fix comment on addExceptionAnnotation - - - - - b820ff50 by Janis Voigtlaender at 2026-01-05T02:43:18-05:00 GHC.Internal.Control.Monad.replicateM: Fix comment - - - - - a8a94aad by Cheng Shao at 2026-01-05T16:24:04-05:00 hadrian: drops unused PE linker script for windows This patch drops unused PE linker script for windows in the `MergeObjects` builder of hadrian. The linker script is used for merging object files into a single `HS*.o` object file and undoing the effect of split sections, when building the "ghci library" object file. However, we don't build the ghci library on windows, and this code path is actually unreachable. - - - - - 977dd8ae by Matthew Pickering at 2026-01-14T11:30:03+01:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - a0a4bf10 by Matthew Pickering at 2026-01-14T11:30:03+01:00 Use explicit syntax rather than pure - - - - - 24452628 by Matthew Pickering at 2026-01-14T11:30:03+01:00 packaging: correctly propagate build/host/target to bindist configure script At the moment the host and target which we will produce a compiler for is fixed at the initial configure time. Therefore we need to persist the choice made at this time into the installation bindist as well so we look for the right tools, with the right prefixes at install time. In the future, we want to provide a bit more control about what kind of bindist we produce so the logic about what the host/target will have to be written by hadrian rather than persisted by the configure script. In particular with cross compilers we want to either build a normal stage 2 cross bindist or a stage 3 bindist, which creates a bindist which has a native compiler for the target platform. Fixes #21970 - - - - - 410be291 by Matthew Pickering at 2026-01-14T11:30:03+01:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 2eca860a by Matthew Pickering at 2026-01-14T11:30:03+01:00 hadrian: Disable docs when cross compiling Before there were a variety of ad-hoc places where doc building was disabled when cross compiling. * Some CI jobs sets --docs=none in gen_ci.hs * Some CI jobs set --docs=none in .gitlab/ci.sh * There was some logic in hadrian to not need the ["docs"] target when making a bindist. Now the situation is simple: * If you are cross compiling then defaultDocsTargets is empty by default. In theory, there is no reason why we can't build documentation for cross compiler bindists, but this is left to future work to generalise the documentation building rules to allow this (#24289) - - - - - 172ecac4 by Matthew Pickering at 2026-01-14T11:30:57+01:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: ManyAlternatives MultiComponentModulesRecomp MultiLayerModulesRecomp T10421 T12425 T12707 T13035 T13379 T15703 T16577 T18698a T18698b T18923 T1969 T21839c T3294 T4801 T5030 T5321Fun T5642 T783 T9198 T9872d T9961 parsing001 T5321FD T6048 ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> - - - - - 71cfd85c by Sven Tennie at 2026-01-14T11:30:58+01:00 Align CI scripts with master Fixup - - - - - 5a73da21 by Matthew Pickering at 2026-01-14T11:30:58+01:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 0bc4fe47 by Matthew Pickering at 2026-01-14T11:30:58+01:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - 8990a098 by Matthew Pickering at 2026-01-14T11:30:58+01:00 hadrian: Refactor system-cxx-std-lib rules0 I noticed a few things wrong with the hadrian rules for `system-cxx-std-lib` rules. * For `text` there is an ad-hoc check to depend on `system-cxx-std-lib` outside of `configurePackage`. * The `system-cxx-std-lib` dependency is not read from cabal files. * Recache is not called on the packge database after the `.conf` file is generated, a more natural place for this rule is `registerRules`. Treating this uniformly like other packages is complicated by it not having any source code or a cabal file. However we can do a bit better by reporting the dependency firstly in `PackageData` and then needing the `.conf` file in the same place as every other package in `configurePackage`. Fixes #25303 - - - - - 689ae7d8 by Sven Tennie at 2026-01-14T11:30:58+01:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - 0384959b by Sven Tennie at 2026-01-14T11:30:58+01:00 ghc: Distinguish between having an interpreter and having an internal one Otherwise, we fail with warnings when compiling tools. Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter - - - - - 6e0d2a41 by Matthew Pickering at 2026-01-14T11:30:58+01:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. - - - - - 61d2c137 by Sven Tennie at 2026-01-14T11:30:58+01:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - bbc8f3d0 by Sven Tennie at 2026-01-14T11:30:58+01:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - 7c04c65c by Sven Tennie at 2026-01-14T11:30:58+01:00 WIP: Dirty hack Let Stage0 build with the default.host.target file and decide for other stages if default.target cannot be used. Acutally, I don't like this logic on this level. - - - - - 51721834 by Sven Tennie at 2026-01-14T11:30:58+01:00 Windows needs NM_STAGE0 as well The stage0 always needs nm. - - - - - 86ba1363 by Sven Tennie at 2026-01-14T11:30:58+01:00 T17912 sometimes works for windows-validate This seems to be timing related. However, just simply increasing the timeout (sleep) statement of this test didn't help. Maybe, it has been flaky on CI before. - - - - - 87 changed files: - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - compiler/GHC/Iface/Recomp.hs - configure.ac - distrib/configure.ac.in - − driver/utils/merge_sections_pe.ld - ghc/GHC/Driver/Session/Mode.hs - ghc/GHCi/UI.hs - ghc/Main.hs - ghc/ghc-bin.cabal.in - hadrian/README.md - hadrian/bindist/config.mk.in - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Cabal/Type.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Lint.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.hs - libraries/base/tests/IO/all.T - libraries/base/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Context.hs - m4/fp_find_nm.m4 - m4/fptools_set_platform_vars.m4 - m4/prep_target_file.m4 - testsuite/ghc-config/ghc-config.hs - + testsuite/tests/driver/recomp26183/M.hs - + testsuite/tests/driver/recomp26183/M2A.hs - + testsuite/tests/driver/recomp26183/M2B.hs - + testsuite/tests/driver/recomp26183/Makefile - + testsuite/tests/driver/recomp26183/all.T - + testsuite/tests/driver/recomp26183/recomp26183.stderr - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/javascript/closure/all.T - testsuite/tests/numeric/should_run/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/28e8c6083ba06e1a24530bd900e4dc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/28e8c6083ba06e1a24530bd900e4dc… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL_SAVE
by Sven Tennie (＠supersven) 14 Jan '26

14 Jan '26

Sven Tennie pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL_SAVE at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/romes/hadrian-cross-stage2-re… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26746] 10 commits: Don't re-use stack slots for growing registers
by Simon Peyton Jones (＠simonpj) 14 Jan '26

14 Jan '26

Simon Peyton Jones pushed to branch wip/T26746 at Glasgow Haskell Compiler / GHC Commits: 023c301c by sheaf at 2026-01-13T04:57:30-05:00 Don't re-use stack slots for growing registers This commit avoids re-using a stack slot for a register that has grown but already had a stack slot. For example, suppose we have stack slot assigments %v1 :: FF64 |-> StackSlot 0 %v2 :: FF64 |-> StackSlot 1 Later, we start using %v1 at a larger format (e.g. F64x2) and we need to spill it again. Then we **must not** use StackSlot 0, as a spill at format F64x2 would clobber the data in StackSlot 1. This can cause some fragmentation of the `StackMap`, but that's probably OK. Fixes #26668 - - - - - d0966e64 by fendor at 2026-01-13T04:58:11-05:00 Remove `traceId` from ghc-pkg executable - - - - - 20d7efec by Simon Peyton Jones at 2026-01-13T12:41:22-05:00 Make SpecContr rules fire a bit later See #26615 and Note [SpecConstr rule activation] - - - - - 8bc4eb8c by Andrew Lelechenko at 2026-01-13T12:42:03-05:00 Upgrade mtl submodule to 2.3.2 Fixes #26656 - - - - - c94aaacd by Cheng Shao at 2026-01-13T12:42:44-05:00 compiler: remove iserv and only use on-demand external interpreter This patch removes `iserv` from the tree completely. Hadrian would no longer build or distribute `iserv`, and the GHC driver would use the on-demand external interpreter by default when invoked with `-fexternal-interpreter`, without needing to specify `-pgmi ""`. This has multiple benefits: - It allows cleanup of a lot of legacy hacks in the hadrian codebase. - It paves the way for running cross ghc's iserv via cross emulator (#25523), fixing TH/ghci support for cross targets other than wasm/js. - - - - - c1fe0097 by Peter Trommler at 2026-01-14T03:54:49-05:00 PPC NCG: Fix shift right MO code The shift amount in shift right [arithmetic] MOs is machine word width. Therefore remove unnecessary zero- or sign-extending of shift amount. It looks harmless to extend the shift amount argument because the shift right instruction uses only the seven lowest bits (i. e. mod 128). But now we have a conversion operation from a smaller type to word width around a memory load at word width. The types are not matching up but there is no check done in CodeGen. The necessary conversion from word width down to the smaller width would be translated into a no-op on PowerPC anyway. So all seems harmless if it was not for a small optimisation in getRegister'. In getRegister' a load instruction with the smaller width of the conversion operation was generated. This loaded the most significant bits of the word in memory on a big-endian platform. These bits were zero and hence shift right was used with shift amount zero and not one as required in test Sized. Fixes #26519 - - - - - 2dafc65a by Cheng Shao at 2026-01-14T03:55:31-05:00 Tree-wide cleanup of cygwin logic GHC has not supported cygwin for quite a few years already, and will not resume support in the forseeable future. The only supported windows toolchain is clang64/clangarm64 of the msys2 project. This patch cleans up the unused cygwin logic in the tree. Co-authored-by: Codex <codex(a)openai.com> - - - - - 66b96e2a by Teo Camarasu at 2026-01-14T03:56:13-05:00 Set default eventlog-flush-interval to 5s Resolves #26707 - - - - - d0254579 by Andrew Lelechenko at 2026-01-14T03:56:53-05:00 Document when -maxN RTS option was added - - - - - 4a01ec30 by Simon Peyton Jones at 2026-01-14T10:22:12+00:00 Improve newtype unwrapping Ticket #26746 describes several relatively-minor shortcomings of newtype unwrapping. This MR addresses them, while also (arguably) simplifying the code a bit. See new Note [Solving newtype equalities: overview] and Note [Decomposing newtype equalities] and Note [Eager newtype decomposition] and Note [Even more eager newtype decomposition] - - - - - 82 changed files: - CODEOWNERS - cabal.project-reinstall - compiler/GHC/CmmToAsm/PPC/CodeGen.hs - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs - compiler/GHC/Core/FamInstEnv.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/Opt/WorkWrap.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Unfold/Make.hs - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/SysTools/Terminal.hs - compiler/GHC/Tc/Instance/Family.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/Monad.hs - configure.ac - docs/users_guide/9.16.1-notes.rst - docs/users_guide/ghci.rst - docs/users_guide/packages.rst - docs/users_guide/phases.rst - docs/users_guide/using-concurrent.rst - docs/users_guide/win32-dlls.rst - driver/ghci/ghci.c - driver/utils/cwrapper.c - driver/utils/isMinTTY.c - hadrian/bindist/cwrappers/cwrapper.c - hadrian/doc/user-settings.md - hadrian/src/Packages.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - libraries/base/tests/IO/T12010/cbits/initWinSock.c - libraries/ghc-internal/cbits/consUtils.c - libraries/ghc-internal/configure.ac - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - libraries/mtl - m4/ghc_select_file_extensions.m4 - rts/RtsFlags.c - testsuite/driver/runtests.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/mk/test.mk - 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/T24731.hs - testsuite/tests/driver/all.T - testsuite/tests/rts/linker/rdynamic.hs - testsuite/tests/simplCore/should_compile/T14003.stderr - testsuite/tests/simplCore/should_compile/T19672.stderr - testsuite/tests/simplCore/should_compile/T21763.stderr - testsuite/tests/simplCore/should_compile/T21763a.stderr - + testsuite/tests/simplCore/should_compile/T26615.hs - + testsuite/tests/simplCore/should_compile/T26615.stderr - + testsuite/tests/simplCore/should_compile/T26615a.hs - testsuite/tests/simplCore/should_compile/T4908.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/simplCore/should_compile/spec-inline.stderr - + testsuite/tests/typecheck/should_compile/T26746.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/T15801.stderr - testsuite/tests/typecheck/should_fail/T22924b.stderr - testsuite/tests/typecheck/should_fail/TcCoercibleFail.hs - testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr - testsuite/tests/typecheck/should_fail/all.T - utils/ghc-pkg/Main.hs - − utils/iserv/iserv.cabal.in - − utils/iserv/src/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a505c4e1468274b59b744ec3053137… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a505c4e1468274b59b744ec3053137… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 9 commits: PPC NCG: Fix shift right MO code
by Marge Bot (＠marge-bot) 14 Jan '26

14 Jan '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: c1fe0097 by Peter Trommler at 2026-01-14T03:54:49-05:00 PPC NCG: Fix shift right MO code The shift amount in shift right [arithmetic] MOs is machine word width. Therefore remove unnecessary zero- or sign-extending of shift amount. It looks harmless to extend the shift amount argument because the shift right instruction uses only the seven lowest bits (i. e. mod 128). But now we have a conversion operation from a smaller type to word width around a memory load at word width. The types are not matching up but there is no check done in CodeGen. The necessary conversion from word width down to the smaller width would be translated into a no-op on PowerPC anyway. So all seems harmless if it was not for a small optimisation in getRegister'. In getRegister' a load instruction with the smaller width of the conversion operation was generated. This loaded the most significant bits of the word in memory on a big-endian platform. These bits were zero and hence shift right was used with shift amount zero and not one as required in test Sized. Fixes #26519 - - - - - 2dafc65a by Cheng Shao at 2026-01-14T03:55:31-05:00 Tree-wide cleanup of cygwin logic GHC has not supported cygwin for quite a few years already, and will not resume support in the forseeable future. The only supported windows toolchain is clang64/clangarm64 of the msys2 project. This patch cleans up the unused cygwin logic in the tree. Co-authored-by: Codex <codex(a)openai.com> - - - - - 66b96e2a by Teo Camarasu at 2026-01-14T03:56:13-05:00 Set default eventlog-flush-interval to 5s Resolves #26707 - - - - - d0254579 by Andrew Lelechenko at 2026-01-14T03:56:53-05:00 Document when -maxN RTS option was added - - - - - 9c8c8e37 by Cheng Shao at 2026-01-14T04:29:45-05:00 testsuite: remove obsolete --ci option from the testsuite driver This patch removes the obsolete `--ci` option from the testsuite driver: neither the CI scripts nor hadrian ever invokes the testsuite driver with `--ci`, and the perf notes are always fetched to the `refs/notes/perf` local reference anyway. - - - - - 440647e0 by Julian Ospald at 2026-01-14T04:29:57-05:00 Fix fetch_cabal * download cabal if the existing one is of an older version * fix FreeBSD download url * fix unpacking on FreeBSD - - - - - 96f4fb6c by Julian Ospald at 2026-01-14T04:29:57-05:00 Bump toolchain in CI - - - - - 59f56b35 by Julian Ospald at 2026-01-14T04:29:57-05:00 Use libffi-clib Previously, we would build libffi via hadrian and bundle it manually with the GHC bindist. This now moves all that logic out of hadrian and allows us to have a clean Haskell package to build and link against and ship it without extra logic. This patch still retains the ability to link against a system libffi. The main reason of bundling libffi was that on some platforms (e.g. FreeBSD and Mac), system libffi is not visible to the C toolchain by default, so users would require settings in e.g. cabal to be able to compile anything. This adds the submodule libffi-clib to the repository. - - - - - e1320756 by Peng Fan at 2026-01-14T04:30:11-05:00 NCG/LA64: add support for la664 micro architecture Add '-mla664' flag to LA664, which has some new features: atomic instructions, dbar hints, etc. 'LA464' is the default so that unrecognized instructions are not generated. - - - - - 58 changed files: - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitmodules - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/PPC/CodeGen.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/SysTools/Terminal.hs - compiler/GHC/Unit/State.hs - configure.ac - docs/users_guide/9.16.1-notes.rst - docs/users_guide/packages.rst - docs/users_guide/using-concurrent.rst - docs/users_guide/using.rst - docs/users_guide/win32-dlls.rst - driver/ghci/ghci.c - driver/utils/cwrapper.c - driver/utils/isMinTTY.c - hadrian/bindist/cwrappers/cwrapper.c - hadrian/hadrian.cabal - hadrian/src/Builder.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - − hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/SourceDist.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - − libffi-tarballs - libraries/base/tests/IO/T12010/cbits/initWinSock.c - libraries/ghc-internal/cbits/consUtils.c - libraries/ghc-internal/configure.ac - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - + libraries/libffi-clib - m4/ghc_select_file_extensions.m4 - packages - rts/RtsFlags.c - rts/include/rts/ghc_ffi.h - rts/rts.buildinfo.in - rts/rts.cabal - testsuite/driver/perf_notes.py - testsuite/driver/runtests.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/mk/test.mk - testsuite/tests/rts/linker/rdynamic.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6ef0ac0c8c1582a1991a6cae9a7cee… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6ef0ac0c8c1582a1991a6cae9a7cee… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-try-opt-coercion] Fuse optCoRefl and substCo
by Simon Peyton Jones (＠simonpj) 14 Jan '26

14 Jan '26

Simon Peyton Jones pushed to branch wip/spj-try-opt-coercion at Glasgow Haskell Compiler / GHC Commits: e180c6dc by Simon Peyton Jones at 2026-01-14T09:07:38+00:00 Fuse optCoRefl and substCo Maybe this will be better than either - - - - - 4 changed files: - compiler/GHC/Core/Coercion/Opt.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Utils/Misc.hs Changes: ===================================== compiler/GHC/Core/Coercion/Opt.hs ===================================== @@ -257,12 +257,17 @@ optCoAlt is (Alt k bs e) left-to-right, and won't spot (co1 ; co2 ; sym co2) -} -optCoRefl :: Coercion -> Coercion +optCoRefl :: Subst -> Coercion -> Coercion -- See Note [optCoRefl] -optCoRefl in_co -#ifdef DEBUG +optCoRefl subst in_co + | isEmptyTCvSubst subst = in_co + + | otherwise +#ifndef DEBUG + = opt_co_refl subst in_co +#else -- Debug check that optCoRefl doesn't change the type - = let out_co = go in_co + = let out_co = opt_co_refl subst in_co (Pair in_l in_r) = coercionKind in_co (Pair out_l out_r) = coercionKind out_co in if (in_l `eqType` out_l) && (in_r `eqType` out_r) @@ -274,9 +279,11 @@ optCoRefl in_co , text "in_co:" <+> ppr in_co , text "out_co:" <+> ppr out_co ]) $ out_co -#else - = go in_co #endif + + +opt_co_refl :: Subst -> Coercion -> Coercion +opt_co_refl subst co = go co where go_m MRefl = MRefl go_m (MCo co) = MCo (go co) @@ -294,12 +301,17 @@ optCoRefl in_co go (LRCo n co) = mkLRCo n (go co) go (AppCo co1 co2) = mkAppCo (go co1) (go co2) go (InstCo co1 co2) = mkInstCo (go co1) (go co2) - go (ForAllCo v vl vr mco co) = mkForAllCo v vl vr (go_m mco) (go co) go (FunCo r afl afr com coa cor) = mkFunCo2 r afl afr (go com) (go coa) (go cor) go (TyConAppCo r tc cos) = mkTyConAppCo r tc (go_s cos) go (UnivCo p r lt rt cos) = mkUnivCo p (go_s cos) r lt rt go (AxiomCo ax cos) = mkAxiomCo ax (go_s cos) + go (ForAllCo v vl vr mco co) = mkForAllCo v' vl vr + $!! go_m mco + $!! opt_co_refl subst' co + where + !(subst', v') = substVarBndr subst v + -- This is the main payload go (TransCo co1 co2) = gobble gs0 co1 [co2] where ===================================== compiler/GHC/Core/Opt/Simplify/Iteration.hs ===================================== @@ -1390,7 +1390,7 @@ simplCoercionF env co cont simplCoercion :: SimplEnv -> InCoercion -> SimplM OutCoercion simplCoercion env co - = do { let out_co = optCoRefl (substCo env co) + = do { let out_co = optCoRefl (getTCvSubst env) co ; seqCo out_co `seq` return out_co } ----------------------------------- ===================================== compiler/GHC/Core/TyCo/Subst.hs ===================================== @@ -860,33 +860,33 @@ subst_co subst co go_mco (MCo co) = MCo (go co) go :: Coercion -> Coercion - go (Refl ty) = mkNomReflCo $! (go_ty ty) - go (GRefl r ty mco) = (mkGReflCo r $! (go_ty ty)) $! (go_mco mco) - go (TyConAppCo r tc args)= mkTyConAppCo r tc $! go_cos args - go (AxiomCo con cos) = mkAxiomCo con $! go_cos cos - go (AppCo co arg) = (mkAppCo $! go co) $! go arg + go (Refl ty) = mkNomReflCo $!! go_ty ty + go (GRefl r ty mco) = mkGReflCo r $!! go_ty ty $!! go_mco mco + go (TyConAppCo r tc args)= mkTyConAppCo r tc $!! go_cos args + go (AxiomCo con cos) = mkAxiomCo con $!! go_cos cos + go (AppCo co arg) = mkAppCo $!! go co $!! go arg go (ForAllCo { fco_tcv = tcv, fco_visL = visL, fco_visR = visR , fco_kind = kind_co, fco_body = co }) - = ((mkForAllCo $! tcv') visL visR - $! go_mco kind_co) - $! subst_co subst' co + = (mkForAllCo $!! tcv') visL visR + $!! go_mco kind_co + $!! subst_co subst' co where !(subst', tcv') = substVarBndrUnchecked subst tcv -- Unchecked because used from substTyUnchecked - go (FunCo r afl afr w co1 co2) = ((mkFunCo2 r afl afr $! go w) $! go co1) $! go co2 + go (FunCo r afl afr w co1 co2) = mkFunCo2 r afl afr $!! go w $!! go co1 $!! go co2 go (CoVarCo cv) = substCoVar subst cv go (UnivCo { uco_prov = p, uco_role = r , uco_lty = t1, uco_rty = t2, uco_deps = deps }) - = ((((mkUnivCo $! p) $! go_cos deps) $! r) $! - (go_ty t1)) $! (go_ty t2) - go (SymCo co) = mkSymCo $! (go co) - go (TransCo co1 co2) = (mkTransCo $! (go co1)) $! (go co2) - go (SelCo d co) = mkSelCo d $! (go co) - go (LRCo lr co) = mkLRCo lr $! (go co) - go (InstCo co arg) = (mkInstCo $! (go co)) $! go arg - go (KindCo co) = mkKindCo $! (go co) - go (SubCo co) = mkSubCo $! (go co) - go (HoleCo h) = HoleCo $! go_hole h + = mkUnivCo p $!! go_cos deps $!! r + $!! go_ty t1 $!! go_ty t2 + go (SymCo co) = mkSymCo $!! go co + go (TransCo co1 co2) = mkTransCo $!! go co1 $!! go co2 + go (SelCo d co) = mkSelCo d $!! go co + go (LRCo lr co) = mkLRCo lr $!! go co + go (InstCo co arg) = mkInstCo $!! go co $!! go arg + go (KindCo co) = mkKindCo $!! go co + go (SubCo co) = mkSubCo $!! go co + go (HoleCo h) = HoleCo $!! go_hole h go_cos cos = let cos' = map go cos in cos' `seqList` cos' ===================================== compiler/GHC/Utils/Misc.hs ===================================== @@ -8,7 +8,7 @@ -- module GHC.Utils.Misc ( -- * Miscellaneous higher-order functions - applyWhen, nTimes, const2, + applyWhen, nTimes, const2, ($!!), -- * General list processing zipEqual, zipWithEqual, zipWith3Equal, zipWith4Equal, @@ -44,8 +44,7 @@ module GHC.Utils.Misc ( mergeListsBy, isSortedBy, - -- Foldable generalised functions, - + -- * Foldable generalised functions, mapMaybe', -- * Tuples @@ -153,6 +152,8 @@ import qualified Data.Set as Set import Data.Time +infixl 0 $!! -- LEFT associative + {- ************************************************************************ * * @@ -199,6 +200,14 @@ third3 f (a, b, c) = (a, b, f c) uncurry3 :: (a -> b -> c -> d) -> (a, b, c) -> d uncurry3 f (a, b, c) = f a b c +($!!) :: forall r a (b :: TYPE r). (a -> b) -> a -> b +-- | ^ ($!!) is left-associative so you can write +-- (f $!! e1 $!! e2) for a multi-argument strict application +-- In contrast ($) and ($!) are right associative +{-# INLINE ($!!) #-} +f $!! x = let !vx = x in f vx -- see #2273 + + {- ************************************************************************ * * View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e180c6dc8f8141c31771b50d30c17c4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e180c6dc8f8141c31771b50d30c17c4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Document when -maxN RTS option was added
by Marge Bot (＠marge-bot) 14 Jan '26

14 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d0254579 by Andrew Lelechenko at 2026-01-14T03:56:53-05:00 Document when -maxN RTS option was added - - - - - 1 changed file: - docs/users_guide/using-concurrent.rst Changes: ===================================== docs/users_guide/using-concurrent.rst ===================================== @@ -112,7 +112,7 @@ use the RTS :rts-flag:`-N ⟨x⟩` options. .. rts-flag:: -N ⟨x⟩ -N - -maxN ⟨x⟩ + -maxN ⟨x⟩ :since: 8.0 Use ⟨x⟩ simultaneous threads when running the program. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0254579799c8cc3885179c58b8d204… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0254579799c8cc3885179c58b8d204… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Set default eventlog-flush-interval to 5s
by Marge Bot (＠marge-bot) 14 Jan '26

14 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 66b96e2a by Teo Camarasu at 2026-01-14T03:56:13-05:00 Set default eventlog-flush-interval to 5s Resolves #26707 - - - - - 2 changed files: - docs/users_guide/9.16.1-notes.rst - rts/RtsFlags.c Changes: ===================================== docs/users_guide/9.16.1-notes.rst ===================================== @@ -88,6 +88,8 @@ Runtime system kqueue). This first one, based on `poll()`, is merely intended to be portable. +- The default for :rts-flag:`--eventlog-flush-interval=⟨seconds⟩` has changed from being disabled to being enabled with a flush inverval of 5 seconds. + Cmm ~~~ ===================================== rts/RtsFlags.c ===================================== @@ -250,7 +250,7 @@ void initRtsFlagsDefaults(void) RtsFlags.TraceFlags.ticky = false; RtsFlags.TraceFlags.trace_output = NULL; # if defined(THREADED_RTS) - RtsFlags.TraceFlags.eventlogFlushTime = 0; + RtsFlags.TraceFlags.eventlogFlushTime = SecondsToTime(5); // 5s # endif RtsFlags.TraceFlags.nullWriter = false; #endif View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66b96e2a591d8e3d60e74af3671344d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66b96e2a591d8e3d60e74af3671344d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Tree-wide cleanup of cygwin logic
by Marge Bot (＠marge-bot) 14 Jan '26

14 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 2dafc65a by Cheng Shao at 2026-01-14T03:55:31-05:00 Tree-wide cleanup of cygwin logic GHC has not supported cygwin for quite a few years already, and will not resume support in the forseeable future. The only supported windows toolchain is clang64/clangarm64 of the msys2 project. This patch cleans up the unused cygwin logic in the tree. Co-authored-by: Codex <codex(a)openai.com> - - - - - 21 changed files: - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/SysTools/Terminal.hs - configure.ac - docs/users_guide/packages.rst - docs/users_guide/win32-dlls.rst - driver/ghci/ghci.c - driver/utils/cwrapper.c - driver/utils/isMinTTY.c - hadrian/bindist/cwrappers/cwrapper.c - hadrian/src/Settings/Program.hs - libraries/base/tests/IO/T12010/cbits/initWinSock.c - libraries/ghc-internal/cbits/consUtils.c - libraries/ghc-internal/configure.ac - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - m4/ghc_select_file_extensions.m4 - testsuite/driver/runtests.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/mk/test.mk - testsuite/tests/rts/linker/rdynamic.hs Changes: ===================================== compiler/GHC/Driver/MakeFile.hs ===================================== @@ -331,7 +331,7 @@ writeDependency :: FilePath -> Handle -> [FilePath] -> FilePath -> IO () writeDependency root hdl targets dep = do let -- We need to avoid making deps on -- c:/foo/... - -- on cygwin as make gets confused by the : + -- on Windows as make gets confused by the : -- Making relative deps avoids some instances of this. dep' = makeRelative root dep forOutput = escapeSpaces . reslash Forwards . normalise ===================================== compiler/GHC/SysTools/Terminal.hs ===================================== @@ -41,7 +41,7 @@ stderrSupportsAnsiColors' = do case eMode of Left (_ :: IOError) -> Win32.isMinTTYHandle h -- Check if the we're in a MinTTY terminal - -- (e.g., Cygwin or MSYS2) + -- (e.g., MSYS2) Right mode | modeHasVTP mode -> pure True | otherwise -> enableVTP h mode ===================================== configure.ac ===================================== @@ -469,7 +469,7 @@ dnl -------------------------------------------------------------- dnl Note: we may not have objdump on OS X, and we only need it on dnl Windows (for DLL checks), OpenBSD, and AIX case $HostOS_CPP in - cygwin32|mingw32|openbsd|aix) + mingw32|openbsd|aix) AC_CHECK_TARGET_TOOL([OBJDUMP], [objdump]) ;; esac ===================================== docs/users_guide/packages.rst ===================================== @@ -1139,7 +1139,7 @@ read and write this syntax respectively. Here's an example of the Operating System Interface for Computing Environments - IEEE Std. 1003.1). . - The package is not supported under Windows (except under Cygwin). + The package is not supported under Windows. category: System author: exposed: True ===================================== docs/users_guide/win32-dlls.rst ===================================== @@ -33,23 +33,16 @@ We recommend running GHCi in a standard Windows console: select the use ``Start->Run->cmd`` to get a Windows console and invoke ``ghci`` from there (as long as it's in your ``PATH``). -If you run GHCi in a Cygwin or MSYS shell, then the Control-C behaviour -is adversely affected. In one of these environments you should use the +If you run GHCi in an MSYS shell, then the Control-C behaviour +is adversely affected. In this environment you should use the ``ghcii.sh`` script to start GHCi, otherwise when you hit Control-C you'll be returned to the shell prompt but the GHCi process will still be running. However, even using the ``ghcii.sh`` script, if you hit Control-C then the GHCi process will be killed immediately, rather than letting you interrupt a running program inside GHCi as it should. This -problem is caused by the fact that the Cygwin and MSYS shell -environments don't pass Control-C events to non-Cygwin child processes, -because in order to do that there needs to be a Windows console. - -There's an exception: you can use a Cygwin shell if the ``CYGWIN`` -environment variable does *not* contain ``tty``. In this mode, the -Cygwin shell behaves like a Windows console shell and console events are -propagated to child processes. Note that the ``CYGWIN`` environment -variable must be set *before* starting the Cygwin shell; changing it -afterwards has no effect on the shell. +problem is caused by the fact that the MSYS shell environment doesn't +pass Control-C events to non-console child processes, because in order +to do that there needs to be a Windows console. This problem doesn't just affect GHCi, it affects any GHC-compiled program that wants to catch console events. See the @@ -138,78 +131,6 @@ See the for more details. -.. _ghci-cygwin: - -Using GHC (and other GHC-compiled executables) with Cygwin ----------------------------------------------------------- - -Background -~~~~~~~~~~ - -The Cygwin tools aim to provide a Unix-style API on top of the windows -libraries, to facilitate ports of Unix software to windows. To this end, -they introduce a Unix-style directory hierarchy under some root -directory (typically ``/`` is ``C:\cygwin\``). Moreover, everything -built against the Cygwin API (including the Cygwin tools and programs -compiled with Cygwin's GHC) will see ``/`` as the root of their file system, -happily pretending to work in a typical unix environment, and finding -things like ``/bin`` and ``/usr/include`` without ever explicitly -bothering with their actual location on the windows system (probably -``C:\cygwin\bin`` and ``C:\cygwin\usr\include``). - -The problem -~~~~~~~~~~~ - -GHC, by default, no longer depends on cygwin, but is a native Windows -program. It is built using mingw, and it uses mingw's GHC while -compiling your Haskell sources (even if you call it from cygwin's bash), -but what matters here is that - just like any other normal windows -program - neither GHC nor the executables it produces are aware of -Cygwin's pretended unix hierarchy. GHC will happily accept either ``/`` or -``\`` as path separators, but it won't know where to find ``/home/joe/Main.hs`` -or ``/bin/bash`` or the like. This causes all kinds of fun when GHC is used from -within Cygwin's bash, or in make-sessions running under Cygwin. - -Things to do -~~~~~~~~~~~~ - -- Don't use absolute paths in ``make``, ``configure`` & co if there is any - chance that those might be passed to GHC (or to GHC-compiled - programs). Relative paths are fine because cygwin tools are happy - with them and GHC accepts ``/`` as path-separator. And relative paths - don't depend on where Cygwin's root directory is located, or on which - partition or network drive your source tree happens to reside, as - long as you ``cd`` there first. - -- If you have to use absolute paths (beware of the innocent-looking - ``ROOT=$(pwd)`` in makefile hierarchies or configure scripts), Cygwin - provides a tool called ``cygpath`` that can convert Cygwin's - Unix-style paths to their actual Windows-style counterparts. Many - Cygwin tools actually accept absolute Windows-style paths (remember, - though, that you either need to escape ``\`` or convert ``\`` to ``/``), - so you should be fine just using those everywhere. If you need to use - tools that do some kind of path-mangling that depends on unix-style - paths (one fun example is trying to interpret ``:`` as a separator in - path lists), you can still try to convert paths using ``cygpath`` - just before they are passed to GHC and friends. - -- If you don't have ``cygpath``, you probably don't have cygwin and - hence no problems with it... unless you want to write one build - process for several platforms. Again, relative paths are your friend, - but if you have to use absolute paths, and don't want to use - different tools on different platforms, you can simply write a short - Haskell program to print the current directory (thanks to George - Russell for this idea): compiled with GHC, this will give you the - view of the file system that GHC depends on (which will differ - depending on whether GHC is compiled with cygwin's gcc or mingw's gcc - or on a real Unix system..) - that little program can also deal with - escaping ``\`` in paths. Apart from the banner and the startup time, - something like this would also do: - - .. code-block:: none - - $ echo "Directory.getCurrentDirectory >>= putStrLn . init . tail . show " | ghci - .. _win32-dlls: Building and using Win32 DLLs ===================================== driver/ghci/ghci.c ===================================== @@ -27,7 +27,7 @@ int main(int argc, char** argv) { char *preArgv[1]; if (isMinTTY()) { - printf("WARNING: GHCi invoked via 'ghci.exe' in MinTTY consoles (e.g., Cygwin or MSYS)\n"); + printf("WARNING: GHCi invoked via 'ghci.exe' in MinTTY consoles (e.g., MSYS2)\n"); printf(" doesn't handle Ctrl-C well; use the 'ghcii.sh' shell wrapper instead\n"); fflush(stdout); } ===================================== driver/utils/cwrapper.c ===================================== @@ -116,7 +116,7 @@ __attribute__((noreturn)) int run (char *exePath, didn't do the trick either. Irrespective of this issue, using CreateProcess() is preferable, - as it makes this wrapper work on both mingw and cygwin. + as it makes this wrapper work reliably on Windows. */ #if 0 fprintf(stderr, "Invoking %s\n", new_cmdline); fflush(stderr); ===================================== driver/utils/isMinTTY.c ===================================== @@ -28,6 +28,6 @@ bool isMinTTY() { PWSTR fn = pfni->FileName; fn[pfni->FileNameLength] = L'\0'; - return ((wcsstr(fn, L"\\cygwin-") || wcsstr(fn, L"\\msys-")) && - wcsstr(fn, L"-pty") && wcsstr(fn, L"-master")); + return (wcsstr(fn, L"\\msys-") && + wcsstr(fn, L"-pty") && wcsstr(fn, L"-master")); } ===================================== hadrian/bindist/cwrappers/cwrapper.c ===================================== @@ -116,7 +116,7 @@ __attribute__((noreturn)) int run (char *exePath, didn't do the trick either. Irrespective of this issue, using CreateProcess() is preferable, - as it makes this wrapper work on both mingw and cygwin. + as it makes this wrapper work reliably on Windows. */ #if 0 fprintf(stderr, "Invoking %s\n", new_cmdline); fflush(stderr); ===================================== hadrian/src/Settings/Program.hs ===================================== @@ -40,7 +40,7 @@ programContext stage pkg = do ghcWithInterpreter :: Stage -> Action Bool ghcWithInterpreter stage = do is_cross <- flag CrossCompiling - goodOs <- anyTargetOs [ OSMinGW32, OSLinux, OSSolaris2 -- TODO "cygwin32"?, + goodOs <- anyTargetOs [ OSMinGW32, OSLinux, OSSolaris2 , OSFreeBSD, OSDragonFly, OSNetBSD, OSOpenBSD , OSDarwin, OSKFreeBSD , OSWasi ] ===================================== libraries/base/tests/IO/T12010/cbits/initWinSock.c ===================================== @@ -1,7 +1,7 @@ #include "HsBase.h" #include "HsFFI.h" -#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +#if defined(HAVE_WINSOCK_H) static int winsock_inited = 0; ===================================== libraries/ghc-internal/cbits/consUtils.c ===================================== @@ -3,17 +3,13 @@ * * Win32 Console API support */ -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) /* to the end */ #include "consUtils.h" #include <windows.h> #include <io.h> -#if defined(__CYGWIN__) -#define _get_osfhandle get_osfhandle -#endif - int is_console__(int fd) { DWORD st; HANDLE h; ===================================== libraries/ghc-internal/configure.ac ===================================== @@ -12,7 +12,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_MSG_CHECKING(for WINDOWS platform) case $host_alias in - *mingw32*|*mingw64*|*cygwin*|*msys*|*windows*) + *mingw32*|*mingw64*|*msys*|*windows*) WINDOWS=YES;; *) WINDOWS=NO;; ===================================== libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc ===================================== @@ -67,9 +67,7 @@ data Handler -- running in a Windows console. Certain environments that look like consoles -- do not support console events, these include: -- --- * Cygwin shells with @CYGWIN=tty@ set (if you don't set @CYGWIN=tty@, --- then a Cygwin shell behaves like a Windows console). --- * Cygwin xterm and rxvt windows +-- * MSYS MinTTY shells -- * MSYS rxvt windows -- -- In order for your application to receive console events, avoid running ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs ===================================== @@ -575,7 +575,7 @@ hGetEcho handle = do -- | Is the handle connected to a terminal? -- -- On Windows the result of 'hIsTerminalDevide' might be misleading, --- because non-native terminals, such as MinTTY used in MSYS and Cygwin environments, +-- because non-native terminals, such as MinTTY used in MSYS environments, -- are implemented via redirection. -- Use @System.Win32.Types.withHandleToHANDLE System.Win32.MinTTY.isMinTTYHandle@ -- to recognise it. Also consider @ansi-terminal@ package for crossplatform terminal ===================================== m4/ghc_select_file_extensions.m4 ===================================== @@ -3,11 +3,6 @@ AC_DEFUN([GHC_SELECT_FILE_EXTENSIONS], $2='' $3='.so' case $1 in - *-unknown-cygwin32) - AC_MSG_WARN([GHC does not support the Cygwin target at the moment]) - AC_MSG_WARN([I'm assuming you wanted to build for x86_64-w64-mingw32]) - exit 1 - ;; # examples: x86_64-w64-mingw32 *-mingw32) windows=YES ===================================== testsuite/driver/runtests.py ===================================== @@ -21,8 +21,8 @@ from pathlib import Path # We don't actually need subprocess in runtests.py, but: # * We do need it in testlibs.py # * We can't import testlibs.py until after we have imported ctypes -# * If we import ctypes before subprocess on cygwin, then sys.exit(0) -# says "Aborted" and we fail with exit code 134. +# * If we import ctypes before subprocess on some Windows environments, +# then sys.exit(0) says "Aborted" and we fail with exit code 134. # So we import it here first, so that the testsuite doesn't appear to fail. import subprocess @@ -182,16 +182,13 @@ elif args.ignore_perf_failures == 'decreases': if args.test_env: config.test_env = args.test_env -config.cygwin = False config.msys = False if windows: h = os.popen('uname -s', 'r') v = h.read() h.close() - if v.startswith("CYGWIN"): - config.cygwin = True - elif v.startswith("MINGW") or v.startswith("MSYS"): + if v.startswith("MINGW") or v.startswith("MSYS"): # msys gives "MINGW32" # msys2 gives "MINGW_NT-6.2" or "MSYS_NT-6.3" config.msys = True @@ -274,12 +271,6 @@ def format_path(path): # letter representation. Otherwise it thinks we're adding two env # variables E and /Foo when we add E:/Foo. path = re.sub('([a-zA-Z]):', '/\\1', path) - if config.cygwin: - # On cygwin we can't put "c:\foo" in $PATH, as : is a - # field separator. So convert to /cygdrive/c/foo instead. - # Other pythons use ; as the separator, so no problem. - path = re.sub('([a-zA-Z]):', '/cygdrive/\\1', path) - path = re.sub('\\\\', '/', path) return path # On Windows we need to set $PATH to include the paths to all the DLLs ===================================== testsuite/driver/testglobals.py ===================================== @@ -80,7 +80,6 @@ class TestConfig: self.os = '' self.arch = '' self.msys = False - self.cygwin = False # What is the wordsize (in bits) of this platform? self.wordsize = '' ===================================== testsuite/driver/testlib.py ===================================== @@ -1023,9 +1023,6 @@ def wordsize( ws: int ) -> bool: def msys( ) -> bool: return config.msys -def cygwin( ) -> bool: - return config.cygwin - def js_arch() -> bool: return arch("javascript"); ===================================== testsuite/mk/test.mk ===================================== @@ -65,13 +65,13 @@ TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -f RUNTEST_OPTS = -ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" "" +ifeq "$(filter $(TargetOS_CPP), mingw32)" "" exeext = else exeext = .exe endif -ifneq "$(filter $(TargetOS_CPP),cygwin32 mingw32)" "" +ifneq "$(filter $(TargetOS_CPP),mingw32)" "" dllext = .dll else ifeq "$(TargetOS_CPP)" "darwin" dllext = .dylib ===================================== testsuite/tests/rts/linker/rdynamic.hs ===================================== @@ -39,10 +39,8 @@ loadFunction mpkg m valsym = do where prefixUnderscore = case (os, arch) of ("mingw32", "x86_64") -> "" - ("cygwin" , "x86_64") -> "" ("mingw32", _ ) -> "_" ("darwin" , _ ) -> "_" - ("cygwin" , _ ) -> "_" _ -> "" foreign import ccall safe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr a) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2dafc65a48f7d0d959030b801ee45fb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2dafc65a48f7d0d959030b801ee45fb… You're receiving this email because of your account on gitlab.haskell.org.

1 0