- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/T26746] Wibble
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: a505c4e1 by Simon Peyton Jones at 2026-01-14T08:13:54+00:00 Wibble - - - - - 1 changed file: - compiler/GHC/Tc/Solver/Equality.hs Changes: ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -357,9 +357,9 @@ can_eq_nc _rewritten _rdr_env _envs ev eq_rel ty1 _ ty2 _ -- You might think that representational role would also be OK, but -- see Note [Even more eager newtype decomposition] ok (ty1:tys1) (ty2:tys2) rs - | Phantom : rs <- r = ok tys1 tys2 rs - | ty1 `tcEqType` ty2 = ok tys1 tys2 (drop 1 rs) - | otherwise = False + | Phantom : rs' <- rs = ok tys1 tys2 rs' + | ty1 `tcEqType` ty2 = ok tys1 tys2 (drop 1 rs) + | otherwise = False ok [] [] _ = True ok _ _ _ = False -- Mis-matched lengths, just about possible because of -- kind polymorphism. Anyway False is a safe result! View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a505c4e1468274b59b744ec30531377… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a505c4e1468274b59b744ec30531377… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-llvm-split-sections] llvm: fix split sections for llvm backend
by Cheng Shao (＠TerrorJack) 14 Jan '26

14 Jan '26

Cheng Shao pushed to branch wip/fix-llvm-split-sections at Glasgow Haskell Compiler / GHC Commits: 41074dd7 by Cheng Shao at 2026-01-14T03:28:25+01:00 llvm: fix split sections for llvm backend This patch fixes split sections for llvm backend: - Pass missing `--data-sections`/`--function-sections` flags to llc/opt. - Use `(a)llvm.compiler.used` instead of `(a)llvm.used` to avoid sections being unnecessarily retained at link-time. Fixes #26770. ------------------------- Metric Decrease: libdir size_hello_artifact size_hello_unicode ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 3 changed files: - compiler/GHC/CmmToLlvm.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/Driver/Pipeline/Execute.hs Changes: ===================================== compiler/GHC/CmmToLlvm.hs ===================================== @@ -271,7 +271,7 @@ cmmUsedLlvmGens = do -- used if we didn't provide these hints. This will generate a -- definition of the form -- - -- @llvm.used = appending global [42 x i8*] [i8* bitcast <var> to i8*, ...] + -- @llvm.compiler.used = appending global [42 x i8*] [i8* bitcast <var> to i8*, ...] -- -- Which is the LLVM way of protecting them against getting removed. ivars <- getUsedVars @@ -279,7 +279,7 @@ cmmUsedLlvmGens = do ty = LMArray (length ivars) i8Ptr usedArray = LMStaticArray (map cast ivars) ty sectName = Just $ fsLit "llvm.metadata" - lmUsedVar = LMGlobalVar (fsLit "llvm.used") ty Appending sectName Nothing Constant + lmUsedVar = LMGlobalVar (fsLit "llvm.compiler.used") ty Appending sectName Nothing Constant lmUsed = LMGlobal lmUsedVar (Just usedArray) if null ivars then return () ===================================== compiler/GHC/CmmToLlvm/Base.hs ===================================== @@ -286,7 +286,7 @@ data LlvmEnv = LlvmEnv , envUniqMeta :: UniqFM Unique MetaId -- ^ Global metadata nodes , envFunMap :: LlvmEnvMap -- ^ Global functions so far, with type , envAliases :: UniqSet LMString -- ^ Globals that we had to alias, see [Llvm Forward References] - , envUsedVars :: [LlvmVar] -- ^ Pointers to be added to llvm.used (see @cmmUsedLlvmGens@) + , envUsedVars :: [LlvmVar] -- ^ Pointers to be added to llvm.compiler.used (see @cmmUsedLlvmGens@) -- the following get cleared for every function (see @withClearVars@) , envVarMap :: LlvmEnvMap -- ^ Local variables so far, with type ===================================== compiler/GHC/Driver/Pipeline/Execute.hs ===================================== @@ -934,6 +934,14 @@ llvmOptions llvm_config llvm_version dflags = [("-relocation-model=" ++ rmodel ,"-relocation-model=" ++ rmodel) | not (null rmodel)] + -- Both llc/opt need these flags for split sections + ++ [ ("--data-sections", "--data-sections") + | gopt Opt_SplitSections dflags + ] + ++ [ ("--function-sections", "--function-sections") + | gopt Opt_SplitSections dflags + ] + -- Additional llc flags ++ [("", "-mcpu=" ++ mcpu) | not (null mcpu) , not (any (isInfixOf "-mcpu") (getOpts dflags opt_lc)) ] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/41074dd7f7695979bb90180c19fe78c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/41074dd7f7695979bb90180c19fe78c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/26737] 21 commits: ghc-internal: Move STM utilities out of GHC.Internal.Conc.Sync
by Simon Peyton Jones (＠simonpj) 13 Jan '26

13 Jan '26

Simon Peyton Jones pushed to branch wip/26737 at Glasgow Haskell Compiler / GHC Commits: 039bac4c by Ben Gamari at 2026-01-09T20:22:16-05:00 ghc-internal: Move STM utilities out of GHC.Internal.Conc.Sync This is necessary to avoid an import cycle on Windows when importing `GHC.Internal.Exception.Context` in `GHC.Internal.Conc.Sync`. On the road to address #25365. - - - - - 8c389e8c by Ben Gamari at 2026-01-09T20:22:16-05:00 base: Capture backtrace from throwSTM Implements core-libraries-committee#297. Fixes #25365. - - - - - e1ce1fc3 by Ben Gamari at 2026-01-09T20:22:16-05:00 base: Annotate rethrown exceptions in catchSTM with WhileHandling Implements core-libraries-committee#298 - - - - - c4ebdbdf by Cheng Shao at 2026-01-09T20:23:06-05:00 compiler: make getPrim eagerly evaluate its result This commit makes `GHC.Utils.Binary.getPrim` eagerly evaluate its result, to avoid accidental laziness when future patches build other binary parsers using `getPrim`. - - - - - 66a0c4f7 by Cheng Shao at 2026-01-09T20:23:06-05:00 compiler: implement fast get/put for Word16/Word32/Word64 Previously, `GHC.Utils.Binary` contains `get`/`put` functions for `Word16`/`Word32`/`Word64` which always loads and stores them as big-endian words at a potentially unaligned address. The previous implementation is based on loads/stores of individual bytes and concatenating bytes with bitwise operations, which currently cannot be fused to a single load/store operation by GHC. This patch implements fast `get`/`put` functions for `Word16`/`Word32`/`Word64` based on a single memory load/store, with an additional `byteSwap` operation on little-endian hosts. It is based on unaligned load/store primops added since GHC 9.10, and we already require booting with at least 9.10, so it's about time to switch to this faster path. - - - - - 641ec3f0 by Simon Peyton Jones at 2026-01-09T20:23:55-05:00 Fix scoping errors in specialisation Using -fspecialise-aggressively in #26682 showed up a couple of subtle errors in the type-class specialiser. * dumpBindUDs failed to call `deleteCallsMentioning`, resulting in a call that mentioned a dictionary that was not in scope. This call has been missing since 2009! commit c43c981705ec33da92a9ce91eb90f2ecf00be9fe Author: Simon Peyton Jones <simonpj(a)microsoft.com> Date: Fri Oct 23 16:15:51 2009 +0000 Fixed by re-combining `dumpBindUDs` and `dumpUDs`. * I think there was another bug involving the quantified type variables in polymorphic specialisation. In any case I refactored `specHeader` and `spec_call` so that the former looks for the extra quantified type variables rather than the latter. This is quite a worthwhile simplification: less code, easier to grok. Test case in simplCore/should_compile/T26682, brilliantly minimised by @sheaf. - - - - - 2433e91d by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: change sectionProtection to take SectionType argument This commit changes `sectionProtection` to only take `SectionType` argument instead of whole `Section`, since it doesn't need the Cmm section content anyway, and it can then be called in parts of NCG where we only have a `SectionType` in scope. - - - - - e5926fbe by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: change isInitOrFiniSection to take SectionType argument This commit changes `isInitOrFiniSection` to only take `SectionType` argument instead of whole `Section`, since it doesn't need the Cmm section content anyway, and it can then be called in parts of NCG where we only have a `SectionType` in scope. Also marks it as exported. - - - - - 244d57d7 by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: fix split sections on windows This patch fixes split sections on windows by emitting the right COMDAT section header in NCG, see added comment for more explanation. Fix #26696 #26494. ------------------------- Metric Decrease: LargeRecord T9675 size_hello_artifact size_hello_artifact_gzip size_hello_unicode size_hello_unicode_gzip Metric Increase: T13035 ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 182f3d0f by Cheng Shao at 2026-01-09T20:25:28-05:00 iserv: add comment about -fkeep-cafs - - - - - 49675b69 by Matthew Craven at 2026-01-09T20:26:14-05:00 Account for "stupid theta" in demand sig for DataCon wrappers Fixes #26748. - - - - - f3c18890 by Samuel Thibault at 2026-01-10T15:48:22+01:00 hurd: Fix getExecutablePath build 3939a8bf93e27 ("GNU/Hurd: Add getExecutablePath support") added using /proc/self/exe for GNU/Hurd but missed adding the required imports for the corresponding code. - - - - - 7f15bd15 by Samuel Thibault at 2026-01-12T07:16:25-05:00 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - 1db2f240 by Andrew Lelechenko at 2026-01-12T07:17:06-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - 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. - - - - - ecc0f11c by Simon Peyton Jones at 2026-01-13T23:56:46+00:00 Make the implicit-parameter class have representational role This MR addresses #26737, by making the built-in class IP have a representational role for its second parameter. See Note [IP: implicit parameter class] in ghc-internal:GHC.Internal.Classes.IP - - - - - 82 changed files: - .gitignore - CODEOWNERS - cabal.project-reinstall - compiler/GHC/Builtin/Names.hs - compiler/GHC/Cmm.hs - compiler/GHC/Cmm/InitFini.hs - compiler/GHC/CmmToAsm/AArch64/Ppr.hs - compiler/GHC/CmmToAsm/Ppr.hs - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - compiler/GHC/CmmToC.hs - compiler/GHC/CmmToLlvm/Data.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/Runtime/Interpreter/Init.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/Types/Id/Make.hs - compiler/GHC/Utils/Binary.hs - docs/users_guide/ghci.rst - docs/users_guide/phases.rst - 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 - libraries/base/changelog.md - libraries/base/src/Data/Bifoldable1.hs - libraries/base/src/GHC/Conc.hs - libraries/base/src/GHC/Conc/Sync.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/Classes.hs - + libraries/ghc-internal/src/GHC/Internal/Classes/IP.hs - libraries/ghc-internal/src/GHC/Internal/Conc/IO.hs - libraries/ghc-internal/src/GHC/Internal/Conc/POSIX.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs-boot - libraries/ghc-internal/src/GHC/Internal/Conc/Windows.hs - libraries/ghc-internal/src/GHC/Internal/Event/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows/Thread.hs - + libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs - libraries/mtl - + testsuite/tests/dmdanal/should_run/T26748.hs - + testsuite/tests/dmdanal/should_run/T26748.stdout - testsuite/tests/dmdanal/should_run/all.T - − testsuite/tests/driver/T24731.hs - testsuite/tests/driver/all.T - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/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/T26682.hs - + testsuite/tests/simplCore/should_compile/T26682a.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/T26737.hs - testsuite/tests/typecheck/should_compile/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/86cd91adca0c4f269382c525859f70… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/86cd91adca0c4f269382c525859f70… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26722] 5 commits: Make SpecContr rules fire a bit later
by Simon Peyton Jones (＠simonpj) 13 Jan '26

13 Jan '26

Simon Peyton Jones pushed to branch wip/T26722 at Glasgow Haskell Compiler / GHC Commits: 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. - - - - - 2d3fbbd1 by Simon Peyton Jones at 2026-01-13T23:24:06+00:00 Add evals for strict data-con args in worker-functions This fixes #26722, by adding an eval in a worker for arguments of strict data constructors, even if the function body uses them strictly. See (WIS1) in Note [Which Ids should be strictified] I took the opportunity to make substantial improvements in the documentation for call-by-value functions. See especially Note [CBV Function Ids: overview] in GHC.Types.Id.Info Note [Which Ids should be CBV candidates?] ditto Note [EPT enforcement] in GHC.Stg.EnforceEpt among others. - - - - - 511bd86b by Simon Peyton Jones at 2026-01-13T23:24:06+00:00 Improve `interestingArg` This function analyses a function's argument to see if it is interesting enough to deserve an inlining discount. Improvements for * LitRubbish arguments * exprIsExpandable arguments See Note [Interesting arguments] which is substantially rewritten. - - - - - 55 changed files: - CODEOWNERS - cabal.project-reinstall - compiler/GHC/Core/Opt/Arity.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/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Unfold/Make.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Lint.hs - compiler/GHC/StgToCmm/Closure.hs - compiler/GHC/StgToCmm/Expr.hs - compiler/GHC/Types/Id.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/Id/Make.hs - docs/users_guide/ghci.rst - docs/users_guide/phases.rst - 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 - libraries/mtl - − testsuite/tests/driver/T24731.hs - testsuite/tests/driver/all.T - testsuite/tests/simplCore/should_compile/T14003.stderr - testsuite/tests/simplCore/should_compile/T18013.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/T26722.hs - + testsuite/tests/simplCore/should_compile/T26722.stderr - testsuite/tests/simplCore/should_compile/T4908.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/simplCore/should_compile/spec-inline.stderr - − 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/dc8001c28934bc5e5467478030fca1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dc8001c28934bc5e5467478030fca1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/windows-aarch64-tntc
by Cheng Shao (＠TerrorJack) 13 Jan '26

13 Jan '26

Cheng Shao pushed new branch wip/windows-aarch64-tntc at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/windows-aarch64-tntc You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-llvm-split-sections
by Cheng Shao (＠TerrorJack) 13 Jan '26

13 Jan '26

Cheng Shao pushed new branch wip/fix-llvm-split-sections at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-llvm-split-sections 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] T17912 sometimes works for windows-validate
by Sven Tennie (＠supersven) 13 Jan '26

13 Jan '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 28e8c608 by Sven Tennie at 2026-01-13T19:38:27+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. - - - - - 1 changed file: - libraries/base/tests/IO/all.T Changes: ===================================== libraries/base/tests/IO/all.T ===================================== @@ -182,7 +182,7 @@ test('T17414', compile_and_run, ['']) test('T17510', expect_broken(17510), compile_and_run, ['']) test('bytestringread001', extra_run_opts('test.data'), compile_and_run, ['']) -test('T17912', [only_ways(['threaded1']), when(opsys('mingw32'),expect_broken(1))], compile_and_run, ['']) +test('T17912', [only_ways(['threaded1']), when(opsys('mingw32'),fragile(1))], compile_and_run, ['']) test('T18832', only_ways(['threaded1']), compile_and_run, ['']) test('mkdirExists', [exit_code(1), when(opsys('mingw32'), ignore_stderr)], compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/28e8c6083ba06e1a24530bd900e4dc7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/28e8c6083ba06e1a24530bd900e4dc7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 7 commits: Make SpecContr rules fire a bit later
by Marge Bot (＠marge-bot) 13 Jan '26

13 Jan '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 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. - - - - - a4ed976e by Peter Trommler at 2026-01-13T13:14:06-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 - - - - - d219cbc5 by Cheng Shao at 2026-01-13T13:14:07-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> - - - - - 37351bae by Teo Camarasu at 2026-01-13T13:14:08-05:00 Set default eventlog-flush-interval to 5s Resolves #26707 - - - - - 6ef0ac0c by Andrew Lelechenko at 2026-01-13T13:14:09-05:00 Document when -maxN RTS option was added - - - - - 64 changed files: - CODEOWNERS - cabal.project-reinstall - compiler/GHC/CmmToAsm/PPC/CodeGen.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 - 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/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 - − 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/d00f9a3b9a38d6b84ed25ebc05ad5b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d00f9a3b9a38d6b84ed25ebc05ad5b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: remove iserv and only use on-demand external interpreter
by Marge Bot (＠marge-bot) 13 Jan '26

13 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 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. - - - - - 20 changed files: - CODEOWNERS - cabal.project-reinstall - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Settings/IO.hs - docs/users_guide/ghci.rst - docs/users_guide/phases.rst - 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 - − testsuite/tests/driver/T24731.hs - testsuite/tests/driver/all.T - − utils/iserv/iserv.cabal.in - − utils/iserv/src/Main.hs Changes: ===================================== CODEOWNERS ===================================== @@ -66,7 +66,6 @@ [Internal utilities and libraries] /utils/iserv-proxy/ @angerman @simonmar -/utils/iserv/ @angerman @simonmar /utils/fs/ @Phyx /utils/jsffi @TerrorJack /utils/haddock @Kleidukos ===================================== cabal.project-reinstall ===================================== @@ -52,7 +52,6 @@ packages: ./compiler ./utils/hsc2hs ./utils/runghc ./utils/unlit - ./utils/iserv ./linters/**/*.cabal constraints: ghc +internal-interpreter +dynamic-system-linke, ===================================== compiler/GHC/Runtime/Interpreter/Init.hs ===================================== @@ -128,13 +128,7 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do prog <- case interpProg opts of -- build iserv program if none specified "" -> generateIservC dflags logger tmpfs (interpExecutableLinkOpts opts) unit_env - _ -> pure (interpProg opts ++ flavour) - where - flavour - | profiled && dynamic = "-prof-dyn" - | profiled = "-prof" - | dynamic = "-dyn" - | otherwise = "" + _ -> pure $ interpProg opts let msg = text "Starting " <> text prog tr <- if interpVerbosity opts >= 3 then return (logInfo logger $ withPprStyle defaultDumpStyle msg) ===================================== compiler/GHC/Settings/IO.hs ===================================== @@ -41,8 +41,6 @@ initSettings initSettings top_dir = do let installed :: FilePath -> FilePath installed file = top_dir </> file - libexec :: FilePath -> FilePath - libexec file = top_dir </> ".." </> "bin" </> file settingsFile = installed "settings" targetFile = installed $ "targets" </> "default.target" @@ -142,7 +140,9 @@ initSettings top_dir = do ld_r_prog <- tgtMergeObjs target let (ld_r_path, ld_r_args) = getTool (mergeObjsProgram . const ld_r_prog) pure (ld_r_path, map Option ld_r_args) - iserv_prog = libexec "ghc-iserv" + -- Default to the on-demand external interpreter. A non-empty value can + -- be provided via -pgmi to use a custom external interpreter. + iserv_prog = "" ghcWithInterpreter <- getBooleanSetting "Use interpreter" ===================================== docs/users_guide/ghci.rst ===================================== @@ -3560,15 +3560,18 @@ default in future releases. Building an external interpreter ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The source code for the external interpreter program is in `utils/iserv`. It is -very simple because most of the heavy lifting code is from the `ghci` library. +When :ghc-flag:`-fexternal-interpreter` is enabled, GHC builds a small external +interpreter executable on demand using the installed `ghci` library and runs it +directly. There is no longer a dedicated `utils/iserv` program in the tree. It is sometimes desirable to customize the external interpreter program. For example, it is possible to add symbols to the RTS linker used by the external interpreter. This is done simply at link time by linking an additional `.o` that defines a `rtsExtraSyms` function returning the extra symbols. Doing it this way avoids the need to recompile the RTS with symbols added to its built-in list. -A typical C file would look like this: +Build your custom interpreter (using `ghci:GHCi.Server.defaultServer` as the +entry point) and point :ghc-flag:`-pgmi ⟨cmd⟩` at it. A typical C file would +look like this: .. code:: C ===================================== docs/users_guide/phases.rst ===================================== @@ -151,16 +151,10 @@ given compilation phase: :category: phase-programs Use ⟨cmd⟩ as the external interpreter command (see - :ref:`external-interpreter`). Default: ``ghc-iserv-prof`` if - :ghc-flag:`-prof` is enabled, ``ghc-iserv-dyn`` if :ghc-flag:`-dynamic` is - enabled, or ``ghc-iserv`` otherwise. - - If <cmd> is the empty string then GHC will try to build an appropriate iserv - program for the target platform. It does this by looking for the installed - ``ghci`` unit and by building an executable program that uses - ``ghci:GHCi.Server.defaultServer`` as an entry point. Note that it doesn't - work when cross-compiling: the cross-compiled ``iserv`` program (if it can - be built) can't be run on the build platform. + :ref:`external-interpreter`). By default GHC builds an on-demand external + interpreter using the installed ``ghci`` unit and runs it directly. This + requires that target executables can run on the build host; when + cross-compiling, pass ``-pgmi`` to use a proxy such as ``iserv-proxy``. .. _forcing-options-through: ===================================== hadrian/doc/user-settings.md ===================================== @@ -238,7 +238,7 @@ quickDebug = quickFlavour { name = "dbg", ghcDebugged = const True } ``` Running `build --flavour=dbg` will build a `quick`-flavoured GHC and link -GHC, iserv, iserv-proxy and remote-iserv against the debugged RTS, by passing +GHC, iserv-proxy and remote-iserv against the debugged RTS, by passing `-debug` to the commands that link those executables. More generally, a predicate on `Stage` can be provided to specify which stages should be built debugged. For example, setting `ghcDebugged = (>= Stage2)` will build a debugged compiler at stage 2 or higher, but not stage 1. ===================================== hadrian/src/Packages.hs ===================================== @@ -7,7 +7,7 @@ module Packages ( exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, - hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, + hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, @@ -38,7 +38,7 @@ ghcPackages = , exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs - , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString + , hp2ps, hpc, hpcBin, integerGmp, libffi, mtl, osString , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell, thLift, thQuasiquoter , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout @@ -55,7 +55,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, - hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, + hp2ps, hpc, hpcBin, integerGmp, iservProxy, remoteIserv, libffi, mtl, osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, @@ -109,7 +109,6 @@ hp2ps = util "hp2ps" hpc = lib "hpc" hpcBin = util "hpc-bin" `setPath` "utils/hpc" integerGmp = lib "integer-gmp" -iserv = util "iserv" iservProxy = util "iserv-proxy" libffi = top "libffi" mtl = lib "mtl" @@ -182,24 +181,12 @@ programName :: Context -> Action String programName Context {..} = do prefix <- crossPrefix -- TODO: Can we extract this information from Cabal files? - -- Alp: We could, but then the iserv package would have to - -- use Cabal conditionals + a 'profiling' flag - -- to declare the executable name, and I'm not sure - -- this is allowed (or desired for that matter). return $ prefix ++ basename where basename | package == ghc = "ghc" | package == ghciWrapper = "ghci" -- See Note [Hadrian's ghci-wrapper package] | package == hpcBin = "hpc" - | package == iserv = "ghc-iserv" ++ concat [ - if wayUnit' `wayUnit` way - then suffix - else "" - | (wayUnit', suffix) <- [ - (Profiling, "-prof"), - (Dynamic, "-dyn") - ]] | otherwise = pkgName package -- | The 'FilePath' to a program executable in a given 'Context'. ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -5,7 +5,6 @@ import CommandLine import Context import Expression import Oracles.Setting -import Oracles.Flag import Packages import Settings import Settings.Program (programContext) @@ -154,10 +153,7 @@ bindistRules = do -- We 'need' all binaries and libraries all_pkgs <- stagePackages Stage1 (lib_targets, bin_targets) <- partitionEithers <$> mapM pkgTarget all_pkgs - cross <- flag CrossCompiling - iserv_targets <- if cross then pure [] else iservBins - - let lib_exe_targets = (lib_targets ++ (map (\(_, p) -> p) (bin_targets ++ iserv_targets))) + let lib_exe_targets = lib_targets ++ map snd bin_targets let doc_target = ["docs"] @@ -173,7 +169,7 @@ bindistRules = do createDirectory (bindistFilesDir -/- "bin") createDirectory (bindistFilesDir -/- "lib") -- Also create wrappers with version suffixes (#20074) - forM_ (bin_targets ++ iserv_targets) $ \(pkg, prog_path) -> do + forM_ bin_targets $ \(pkg, prog_path) -> do let orig_filename = takeFileName prog_path (name, ext) = splitExtensions orig_filename suffix = if useGhcPrefix pkg @@ -481,20 +477,6 @@ ghciScriptWrapper = do [ "executable=\"$bindir/" ++ prefix ++ "ghc-" ++ version ++ "\"" , "exec $executable --interactive \"$@\"" ] --- | When not on Windows, we want to ship the 3 flavours of the iserv program --- in binary distributions. This isn't easily achievable by just asking for --- the package to be built, since here we're generating 3 different --- executables out of just one package, so we need to specify all 3 contexts --- explicitly and 'need' the result of building them. -iservBins :: Action [(Package, FilePath)] -iservBins = do - rtsways <- interpretInContext (vanillaContext Stage1 ghc) getRtsWays - traverse (fmap (\p -> (iserv, p)) . programPath) - [ Context Stage1 iserv w Final - | w <- [vanilla, profiling, dynamic] - , w `elem` rtsways - ] - -- Version wrapper scripts -- See Note [Two Types of Wrappers] ===================================== hadrian/src/Rules/CabalReinstall.hs ===================================== @@ -2,7 +2,6 @@ module Rules.CabalReinstall where import Context import Expression -import Oracles.Flag import Packages import Settings import Target @@ -48,9 +47,7 @@ cabalBuildRules = do -- We 'need' all binaries and libraries all_pkgs <- stagePackages Stage1 (lib_targets, bin_targets) <- partitionEithers <$> mapM pkgTarget all_pkgs - cross <- flag CrossCompiling - iserv_targets <- if cross then pure [] else iservBins - need (lib_targets ++ (map (\(_, p) -> p) (bin_targets ++ iserv_targets))) + need (lib_targets ++ map snd bin_targets) distDir <- Context.distDir (vanillaContext Stage1 rts) let rtsIncludeDir = distDir -/- "include" @@ -69,7 +66,7 @@ cabalBuildRules = do let cabal_package_db = cwd -/- root -/- "stage-cabal" -/- "dist-newstyle" -/- "packagedb" -/- "ghc-" ++ version - forM_ (filter ((/= iserv) . fst) bin_targets) $ \(bin_pkg,_bin_path) -> do + forM_ bin_targets $ \(bin_pkg,_bin_path) -> do let pgmName pkg | pkg == ghc = "ghc" | pkg == hpcBin = "hpc" @@ -92,14 +89,4 @@ cabalBuildRules = do makeExecutable output_file pure () - -- Just symlink these for now - -- TODO: build these with cabal as well - forM_ iserv_targets $ \(_bin_pkg,bin_path') -> do - bin_path <- liftIO $ makeAbsolute bin_path' - let orig_filename = takeFileName bin_path - output_file = outputDir -/- orig_filename - liftIO $ do - IO.removeFile output_file <|> pure () - IO.createFileLink bin_path output_file - pure () writeFile' stamp "OK" ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -351,7 +351,6 @@ templateRules = do templateRule "compiler/ghc.cabal" $ projectVersion templateRule "driver/ghci/ghci-wrapper.cabal" $ projectVersion templateRule "ghc/ghc-bin.cabal" $ projectVersion - templateRule "utils/iserv/iserv.cabal" $ projectVersion templateRule "utils/remote-iserv/remote-iserv.cabal" $ projectVersion templateRule "utils/runghc/runghc.cabal" $ projectVersion templateRule "libraries/ghc-boot/ghc-boot.cabal" $ projectVersion ===================================== hadrian/src/Rules/Program.hs ===================================== @@ -53,27 +53,10 @@ getProgramContexts stage = do -- TODO: Shall we use Stage2 for testsuite packages instead? let allPackages = sPackages ++ tPackages - fmap concat . forM allPackages $ \pkg -> do - -- the iserv pkg results in three different programs at - -- the moment, ghc-iserv (built the vanilla way), - -- ghc-iserv-prof (built the profiling way), - -- ghc-iserv-dyn (built the dynamic way), and - -- ghc-iserv-prof-dyn (built the profiling+dynamic way). - -- The testsuite requires all to be present, so we - -- make sure that we cover these - -- "prof-build-under-other-name" cases. - -- iserv gets its names from Packages.hs:programName + forM allPackages $ \pkg -> do ctx <- programContext stage pkg -- TODO: see todo on programContext. - let allCtxs = if pkg == iserv - then [ vanillaContext stage pkg - , Context stage pkg profiling Final - , Context stage pkg dynamic Final - , Context stage pkg profilingDynamic Final - ] - else [ ctx ] - forM allCtxs $ \ctx -> do - name <- programName ctx - return (name <.> exe, ctx) + name <- programName ctx + return (name <.> exe, ctx) lookupProgramContext :: FilePath -> [(FilePath, Context)] -> Maybe Context lookupProgramContext wholePath progs = lookup (takeFileName wholePath) progs ===================================== hadrian/src/Rules/Test.hs ===================================== @@ -17,7 +17,6 @@ import Settings.Builders.RunTest import Settings.Program (programContext) import Target import Utilities -import Context.Type import qualified System.Directory as IO import GHC.Toolchain as Toolchain @@ -320,11 +319,9 @@ needTestsuitePackages stg = do -- This is a hack, but a major usecase for testing the stage1 compiler is -- so that we can use it even if ghc stage2 fails to build -- Unfortunately, we still need the liba - let pkgs = filter (\(_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && isStage0 stg)) + let pkgs = filter (\(_,p) -> not $ (pkgName p `elem` ["ghc", "Cabal"]) && isStage0 stg) (libpkgs ++ exepkgs ++ [ (stg,timeout) | windowsHost ]) need =<< mapM (uncurry pkgFile) pkgs - cross <- flag CrossCompiling - when (not cross) $ needIservBins stg -- stage 1 ghc lives under stage0/bin, -- stage 2 ghc lives under stage1/bin, etc @@ -334,28 +331,6 @@ stageOf "stage2" = Just Stage1 stageOf "stage3" = Just Stage2 stageOf _ = Nothing -needIservBins :: Stage -> Action () -needIservBins stg = do - let ws = [vanilla, profiling, dynamic] - progs <- catMaybes <$> mapM (canBuild stg) ws - need progs - where - -- Only build iserv binaries if all dependencies are built the right - -- way already. In particular this fixes the case of no_profiled_libs - -- not working with the testsuite, see #19624 - canBuild (Stage0 {}) _ = pure Nothing - canBuild stg w = do - contextDeps <- contextDependencies (Context stg iserv w Final) - ws <- forM contextDeps $ \c -> - interpretInContext c (getLibraryWays <> - if Context.Type.package c == rts - then getRtsWays - else mempty) - if (all (w `elem`) ws) - then Just <$> programPath (Context stg iserv w Final) - else return Nothing - - pkgFile :: Stage -> Package -> Action FilePath pkgFile stage pkg | isLibrary pkg = pkgConfFile (Context stage pkg profilingDynamic Final) ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -168,7 +168,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do , pure [ "-L" ++ libDir | libDir <- libDirs ] , rtsFfiArg , osxTarget ? pure (concat [ ["-framework", fmwk] | fmwk <- fmwks ]) - , debugged ? packageOneOf [ghc, iservProxy, iserv, remoteIserv] ? + , debugged ? packageOneOf [ghc, iservProxy, remoteIserv] ? arg "-debug" ] ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -183,7 +183,6 @@ stage1Packages = do ] , when (not cross) [ hpcBin - , iserv , runGhc , ghcToolchainBin ] ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -41,8 +41,6 @@ packageArgs = do libzstdLibraryDir <- getSetting LibZstdLibDir stageVersion <- readVersion <$> (expr $ ghcVersionStage stage) - rtsWays <- getRtsWays - mconcat --------------------------------- base --------------------------------- [ package base ? mconcat @@ -179,23 +177,6 @@ packageArgs = do , package directory ? builder (Cabal Flags) ? arg "+os-string" , package win32 ? builder (Cabal Flags) ? arg "+os-string" - --------------------------------- iserv -------------------------------- - -- Add -Wl,--export-dynamic enables GHCi to load dynamic objects that - -- refer to the RTS. This is harmless if you don't use it (adds a bit - -- of overhead to startup and increases the binary sizes) but if you - -- need it there's no alternative. - -- - -- The Solaris linker does not support --export-dynamic option. It also - -- does not need it since it exports all dynamic symbols by default - , package iserv ? mconcat [ - expr isElfTarget - ? notM (expr $ anyTargetOs [OSFreeBSD, OSSolaris2])? mconcat - [ builder (Ghc LinkHs) ? arg "-optl-Wl,--export-dynamic" ] - - -- Link iserv with -threaded if possible - , builder (Cabal Flags) ? any (wayUnit Threaded) rtsWays `cabalFlag` "threaded" - ] - -------------------------------- haddock ------------------------------- , package haddockApi ? builder (Cabal Flags) ? arg "in-ghc-tree" ===================================== testsuite/tests/driver/T24731.hs deleted ===================================== @@ -1,5 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} -module T24731 where - -foo :: Int -foo = $([|10|]) ===================================== testsuite/tests/driver/all.T ===================================== @@ -333,4 +333,3 @@ test('T25382', normal, makefile_test, []) test('T26018', req_c, makefile_test, []) test('T24120', normal, compile, ['-Wunused-packages -hide-all-packages -package base -package system-cxx-std-lib']) test('T26551', [extra_files(['T26551.hs'])], makefile_test, []) -test('T24731', [only_ways(['ext-interp'])], compile, ['-fexternal-interpreter -pgmi ""']) ===================================== utils/iserv/iserv.cabal.in deleted ===================================== @@ -1,43 +0,0 @@ --- WARNING: iserv.cabal is automatically generated from iserv.cabal.in by --- ../../configure. Make sure you are editing iserv.cabal.in, not --- iserv.cabal. - -Name: iserv -Version: @ProjectVersion@ -Copyright: XXX -License: BSD3 --- XXX License-File: LICENSE -Author: XXX -Maintainer: XXX -Synopsis: iserv allows GHC to delegate Template Haskell computations -Description: - GHC can be provided with a path to the iserv binary with - @-pgmi=/path/to/iserv-bin@, and will in combination with - @-fexternal-interpreter@, compile Template Haskell though the - @iserv-bin@ delegate. This is very similar to how ghcjs has been - compiling Template Haskell, by spawning a separate delegate (so - called runner on the javascript vm) and evaluating the splices - there. - -Category: Development -build-type: Simple -cabal-version: >=1.10 - -Flag threaded - Description: Link the iserv executable against the threaded RTS - Default: True - Manual: True - -Executable iserv - Default-Language: Haskell2010 - -- We never know what symbols GHC will look up in the future, so we - -- must retain CAFs for running interpreted code. - ghc-options: -fkeep-cafs -rtsopts - if flag(threaded) - ghc-options: -threaded - Main-Is: Main.hs - Hs-Source-Dirs: src - include-dirs: . - Build-Depends: - base >= 4 && < 5, - ghci == @ProjectVersionMunged@ ===================================== utils/iserv/src/Main.hs deleted ===================================== @@ -1,12 +0,0 @@ --- | --- The Remote GHCi server. --- --- For details on Remote GHCi, see Note [Remote GHCi] in --- compiler/GHC/Runtime/Interpreter.hs. --- -module Main (main) where - -import GHCi.Server (defaultServer) - -main :: IO () -main = defaultServer View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c94aaacd4c4e31a2fe2cb8dadcdd14c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c94aaacd4c4e31a2fe2cb8dadcdd14c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Upgrade mtl submodule to 2.3.2
by Marge Bot (＠marge-bot) 13 Jan '26

13 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 8bc4eb8c by Andrew Lelechenko at 2026-01-13T12:42:03-05:00 Upgrade mtl submodule to 2.3.2 Fixes #26656 - - - - - 1 changed file: - libraries/mtl Changes: ===================================== libraries/mtl ===================================== @@ -1 +1 @@ -Subproject commit 37cbd924cb71eba591a2e2b6b131767f632d22c9 +Subproject commit 4b5080f43cbc372a437d5fecb144c7b75aadd86b View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8bc4eb8c8fe08bce9c741a5b0b628e4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8bc4eb8c8fe08bce9c741a5b0b628e4… You're receiving this email because of your account on gitlab.haskell.org.

1 0