- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: ci: Use shallow submodule clones by default
by Marge Bot (＠marge-bot) 24 Jul '26

24 Jul '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 1ddd3438 by Simon Jakobi at 2026-07-24T13:54:40-04:00 ci: Use shallow submodule clones by default Limit submodule clones to depth one to reduce CI checkout costs. Keep fetching full submodule history for the submodule lint jobs, which inspect commits across a range. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - 878455b2 by Duncan Coutts at 2026-07-24T13:54:41-04:00 Fix flaky test T3994 on FreeBSD On current FreeBSD versions, calling getpgid on a zombie process fails. In T3994, if we're really unlucky with delays and scheduling then we can end up in exactly that situation. Just catch that specific exception and ignore it. It's rare, and not our fault. - - - - - f0ae5111 by Cheng Shao at 2026-07-24T13:54:42-04:00 ci: add missing workaround for docker permissions in lint jobs Some lint jobs use ci-images with default user `ghc`, and the gitlab ci docker executor requires the `sudo chown` workaround to fix workspace directory permission issue. This patch adds the missing workarounds for the lint jobs. Fixes #27554. Co-authored-by: Codex <codex(a)openai.com> - - - - - 2 changed files: - .gitlab-ci.yml - testsuite/tests/process/T3994.hs Changes: ===================================== .gitlab-ci.yml ===================================== @@ -23,6 +23,10 @@ variables: # Always start with a fresh clone to avoid non-hermetic builds GIT_STRATEGY: clone + # Shallow submodule clones. Overridden by individual jobs that need deeper + # submodule history. + GIT_SUBMODULE_DEPTH: 1 + # Overridden by individual jobs CONFIGURE_ARGS: "" @@ -262,7 +266,8 @@ lint-changelog: GIT_SUBMODULE_STRATEGY: none before_script: - export PATH="/opt/toolchain/bin:$PATH" - - git config --global --add safe.directory "$CI_PROJECT_DIR" + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - .gitlab/ci.sh lint_changelog dependencies: [] @@ -279,6 +284,9 @@ lint-linters: variables: GIT_DEPTH: 1 GIT_SUBMODULE_STRATEGY: none + before_script: + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - mypy testsuite/tests/linters/regex-linters/*.py dependencies: [] @@ -290,6 +298,9 @@ lint-testsuite: variables: GIT_DEPTH: 1 GIT_SUBMODULE_STRATEGY: none + before_script: + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - make -Ctestsuite list_broken TEST_HC=$GHC dependencies: [] @@ -301,6 +312,9 @@ typecheck-testsuite: variables: GIT_DEPTH: 1 GIT_SUBMODULE_STRATEGY: none + before_script: + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - mypy testsuite/driver/runtests.py dependencies: [] @@ -313,6 +327,7 @@ typecheck-testsuite: extends: .lint-params variables: BUILD_FLAVOUR: default + GIT_SUBMODULE_DEPTH: 0 # full history script: - .gitlab/ci.sh configure - .gitlab/ci.sh run_hadrian stage0:exe:lint-submodule-refs @@ -330,6 +345,9 @@ lint-author: extends: .lint variables: GIT_SUBMODULE_STRATEGY: none + before_script: + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - git fetch "$CI_MERGE_REQUEST_PROJECT_URL" $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)" ===================================== testsuite/tests/process/T3994.hs ===================================== @@ -1,7 +1,10 @@ module Main where import Control.Concurrent +import Control.Exception +import Control.Monad import System.IO +import System.IO.Error import System.Process main :: IO () @@ -9,14 +12,24 @@ main = do (_,Just hout,_,p) <- createProcess (proc "./T3994app" ["start", "10000 { std_out = CreatePipe, create_group = True } start <- hGetLine hout putStrLn start - interruptProcessGroupOf p - t <- myThreadId - -- timeout - forkIO $ do - threadDelay 5000000 - putStrLn "Interrupting a Running Process Failed" - hFlush stdout - killThread t - waitForProcess p + + -- On FreeBSD if we're _really_ unlucky with scheduling, then the + -- call to interruptProcessGroupOf can fail due to the process + -- having already terminated (despite it running for at least 10ms!) + -- If so, we just skip doing anything rather than fail the test, + -- since this isn't our fault and is rare and scheduling dependent. + -- See #27512 and https://reviews.freebsd.org/D58393 + handleJust (guard . isDoesNotExistError) (\_ -> return ()) $ do + interruptProcessGroupOf p + t <- myThreadId + -- timeout + forkIO $ do + threadDelay 5000000 + putStrLn "Interrupting a Running Process Failed" + hFlush stdout + killThread t + waitForProcess p + return () + putStrLn "end" return () View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/801a42be8fdb807ee59f694707a0d9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/801a42be8fdb807ee59f694707a0d9… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/cmm-add-flags
by Cheng Shao (＠TerrorJack) 24 Jul '26

24 Jul '26

Cheng Shao pushed new branch wip/cmm-add-flags at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/cmm-add-flags You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/davide/windows-dlls
by David Eichmann (＠DavidEichmann) 24 Jul '26

24 Jul '26

David Eichmann deleted branch wip/davide/windows-dlls at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/dcoutts/windows-dlls] 3 commits: RTS NCG: output explicit export directives in generated assembly
by David Eichmann (＠DavidEichmann) 24 Jul '26

24 Jul '26

David Eichmann pushed to branch wip/dcoutts/windows-dlls at Glasgow Haskell Compiler / GHC Commits: 51883203 by David Eichmann at 2026-07-24T15:47:57+01:00 RTS NCG: output explicit export directives in generated assembly - - - - - aa055fa9 by David Eichmann at 2026-07-24T15:47:58+01:00 rts: explicit dll exports - - - - - 6a794f60 by David Eichmann at 2026-07-24T15:47:58+01:00 WIP link haskell libs via import library - - - - - 78 changed files: - compiler/GHC/Cmm.hs - compiler/GHC/CmmToAsm/Ppr.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - libraries/Cabal - libraries/Win32 - libraries/base/src/Control/Concurrent.hs - libraries/bytestring - libraries/file-io - libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/cbits/Win32Utils.c - libraries/ghc-internal/cbits/inputReady.c - libraries/ghc-internal/include/HsBase.h - libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs - libraries/ghc-internal/src/GHC/Internal/IO/Windows/Handle.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs - libraries/ghc-internal/src/GHC/Internal/Windows.hs - libraries/text - rts/Arena.h - rts/BeginPrivate.h - rts/CloneStack.h - rts/Globals.c - rts/IOManager.c - rts/Interpreter.h - rts/RtsSymbols.c - rts/TopHandler.h - rts/include/HsFFI.h - rts/include/Rts.h - rts/include/RtsAPI.h - + rts/include/RtsPublic.h - rts/include/rts/Adjustor.h - rts/include/rts/BlockSignals.h - rts/include/rts/EventLogWriter.h - rts/include/rts/ExecPage.h - rts/include/rts/FileLock.h - rts/include/rts/Flags.h - rts/include/rts/ForeignExports.h - rts/include/rts/GetTime.h - rts/include/rts/Globals.h - rts/include/rts/Hpc.h - rts/include/rts/IOInterface.h - rts/include/rts/IPE.h - rts/include/rts/Libdw.h - rts/include/rts/LibdwPool.h - rts/include/rts/Linker.h - rts/include/rts/Main.h - rts/include/rts/Messages.h - rts/include/rts/NonMoving.h - rts/include/rts/OSThreads.h - rts/include/rts/Parallel.h - rts/include/rts/PrimFloat.h - rts/include/rts/Profiling.h - rts/include/rts/RtsToHsIface.h - rts/include/rts/StableName.h - rts/include/rts/StablePtr.h - rts/include/rts/StaticPtrTable.h - rts/include/rts/TTY.h - rts/include/rts/Threads.h - rts/include/rts/Ticky.h - rts/include/rts/Time.h - rts/include/rts/Timer.h - rts/include/rts/Utils.h - rts/include/rts/prof/CCS.h - rts/include/rts/prof/Heap.h - rts/include/rts/storage/ClosureMacros.h - rts/include/rts/storage/GC.h - rts/include/rts/storage/InfoTables.h - rts/include/stg/MiscClosures.h - rts/include/stg/Prim.h - rts/include/stg/Regs.h - rts/include/stg/Ticky.h - rts/rts.cabal - rts/win32/AsyncWinIO.h - utils/ghc-pkg/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96c595861fead0cc421006fde23fea… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96c595861fead0cc421006fde23fea… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/davide/windows-dlls] 3 commits: RTS NCG: output explicit export directives in generated assembly
by David Eichmann (＠DavidEichmann) 24 Jul '26

24 Jul '26

David Eichmann pushed to branch wip/davide/windows-dlls at Glasgow Haskell Compiler / GHC Commits: 51883203 by David Eichmann at 2026-07-24T15:47:57+01:00 RTS NCG: output explicit export directives in generated assembly - - - - - aa055fa9 by David Eichmann at 2026-07-24T15:47:58+01:00 rts: explicit dll exports - - - - - 6a794f60 by David Eichmann at 2026-07-24T15:47:58+01:00 WIP link haskell libs via import library - - - - - 78 changed files: - compiler/GHC/Cmm.hs - compiler/GHC/CmmToAsm/Ppr.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - libraries/Cabal - libraries/Win32 - libraries/base/src/Control/Concurrent.hs - libraries/bytestring - libraries/file-io - libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/cbits/Win32Utils.c - libraries/ghc-internal/cbits/inputReady.c - libraries/ghc-internal/include/HsBase.h - libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs - libraries/ghc-internal/src/GHC/Internal/IO/Windows/Handle.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs - libraries/ghc-internal/src/GHC/Internal/Windows.hs - libraries/text - rts/Arena.h - rts/BeginPrivate.h - rts/CloneStack.h - rts/Globals.c - rts/IOManager.c - rts/Interpreter.h - rts/RtsSymbols.c - rts/TopHandler.h - rts/include/HsFFI.h - rts/include/Rts.h - rts/include/RtsAPI.h - + rts/include/RtsPublic.h - rts/include/rts/Adjustor.h - rts/include/rts/BlockSignals.h - rts/include/rts/EventLogWriter.h - rts/include/rts/ExecPage.h - rts/include/rts/FileLock.h - rts/include/rts/Flags.h - rts/include/rts/ForeignExports.h - rts/include/rts/GetTime.h - rts/include/rts/Globals.h - rts/include/rts/Hpc.h - rts/include/rts/IOInterface.h - rts/include/rts/IPE.h - rts/include/rts/Libdw.h - rts/include/rts/LibdwPool.h - rts/include/rts/Linker.h - rts/include/rts/Main.h - rts/include/rts/Messages.h - rts/include/rts/NonMoving.h - rts/include/rts/OSThreads.h - rts/include/rts/Parallel.h - rts/include/rts/PrimFloat.h - rts/include/rts/Profiling.h - rts/include/rts/RtsToHsIface.h - rts/include/rts/StableName.h - rts/include/rts/StablePtr.h - rts/include/rts/StaticPtrTable.h - rts/include/rts/TTY.h - rts/include/rts/Threads.h - rts/include/rts/Ticky.h - rts/include/rts/Time.h - rts/include/rts/Timer.h - rts/include/rts/Utils.h - rts/include/rts/prof/CCS.h - rts/include/rts/prof/Heap.h - rts/include/rts/storage/ClosureMacros.h - rts/include/rts/storage/GC.h - rts/include/rts/storage/InfoTables.h - rts/include/stg/MiscClosures.h - rts/include/stg/Prim.h - rts/include/stg/Regs.h - rts/include/stg/Ticky.h - rts/rts.cabal - rts/win32/AsyncWinIO.h - utils/ghc-pkg/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/461f3e257a22783a6398e39a08eb36… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/461f3e257a22783a6398e39a08eb36… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/spray-sudo-chown
by Cheng Shao (＠TerrorJack) 24 Jul '26

24 Jul '26

Cheng Shao pushed new branch wip/spray-sudo-chown at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/spray-sudo-chown You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 22 commits: Eliminate STM_AWOKEN
by Marge Bot (＠marge-bot) 24 Jul '26

24 Jul '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 4d798b17 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Eliminate STM_AWOKEN It was used as nullary closure for the block_info.closure in the case of a thread being awoken after an STM transaction. However, while it was written, it was never read, so contributed nothing to the behaviour. Furthermore, in the only place it was set (in tryWakeupThread) the why_blocked was immediately overwritten by the NotBlocked status, and the block_info was updated accordingly (by appendToRunQueue). So it didn't even serve a purpose of clarifying an intermediate state, there really was no such intermediate state. Cleaning this up will allow the BlockedOnSTM case to follow the same pattern as the other why_blocked cases that do not use the block_info, and in turn this reduces the number of different categories. - - - - - e1cece79 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Document that eventlog thread stop code ThreadBlocked is no longer used It has not been used since GHC 7.0.x (2011). In 7.2 all the BlockedOn* codes were added, and these were and are used instead of ThreadBlocked. - - - - - 795db115 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Add a proper mapping to eventlog external thread stop status That is the mapping from rts-internal codes, to the coes used in the status field in the eventlog EVENT_STOP_THREAD event. See issue #9003 for what goes wrong when we mess this up. In that ticket, people note that we should really not require the internal tso->why_blocked codes to leak into the external eventlog thread stop codes. The same principle applies to the StgThreadReturnCode. This change properly separates them, and explicitly maps between them using a pair of (compact, constant) tables. These tables are pretty small (with no alignment constraints) and will soon shrink so it seems a sensible tradeoff. We also introduce and use proper EVENT_STOP_THREAD constants in the event log format header. Previously there was not specification in the code for these (only in the docs): the values were encoded into the conversion code. This will allow us to renumber the internal why_blockd codes without breaking the eventlog output. - - - - - 6f1c8efa by Duncan Coutts at 2026-07-23T17:26:18-04:00 Remove unused tso->block_info.wakeup member Presumably it was used once, but not now. - - - - - 740b88a9 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Document StgTSOBlockInfo to say what cases use what members In principle, tso->why_blocked is the tag for the StgTSOBlockInfo union, so we should be able to say for each union member the why_blocked cases that use that member. - - - - - 5b92eae2 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Add a tso->block_info.mvar member and use it in preference to the generic block_info.closure union member, with casts. The plan is that when we know what case we're in (via tso->why_blocked) then we can always access the correct union member, and so we will only need to access block_info.closure for generic cases where we don't know or don't care. - - - - - d931715f by Duncan Coutts at 2026-07-23T17:26:18-04:00 Add a tso->block_info.unused member and use it in preference to the generic block_info.closure union member, with casts. The plan is that when we know what case we're in (via tso->why_blocked) then we can always access the correct union member, and so we will only need to access block_info.closure for generic cases where we don't know or don't care. - - - - - 47e28ebb by Duncan Coutts at 2026-07-23T17:26:18-04:00 Avoid storing to tso->block_info.closure In one case we can use a specific union member (.prev) instead. In several cases the stores were in fact redundant because of subsequent overwrites. In scavengeTSO we replace setting tso->block_info.closure to a valid closure, with an assertion that the block_info.unused is already set to END_TSO_QUEUE which is a valid (static) closure. - - - - - 96e4749d by Duncan Coutts at 2026-07-23T17:26:18-04:00 Renumber the tso->why_blocked constants We can do this now because we have separated the internal values from the external ones used in the eventlog. This lets us put them back into a deliberate order and consolodate some gaps. More importantly, it is a prepation for a slightly more sophisticated encoding. - - - - - 8f62661c by Duncan Coutts at 2026-07-23T17:26:18-04:00 Define constants for the existing stg_threadStatuszh return codes The stg_threadStatuszh reuses the internal tso->why_blocked codes but also extends them with a couple previously magic values. This is awkward since we need to know what those magic values are so we don't accidentally use those values to mean something else. By pulling a definition up to where the why_blocked codes are defined we will be able to avoid mistakenly assining those codes some meaning (or just changing the BlockedThreadComplete, BlockedThreadKilled code if necessary). - - - - - 42c69ae2 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Extend the tso->why_blocked encoding to indicate block_info closures We use some bit tricks to cheaply and generically test if a tso->why_blocked tag implies that the corresponding tso->block_info will contain a non-trivial valid closure (i.e. not just block_info.unused set to END_TSO_QUEUE). In particular we arrange for most why_blocked values to naturally have a distinguishing bit, but for the BlockedOn{Read,Write,Delay} cases, they can come in either non-closure or closure forms. We allow an additional bit to distinguish these cases. The non-closure forms are only from legacy I/O managers: select and win32-legacy. So this extra bit mechanism will be able to be retired once the legacy I/O managers are themselves retired. This means in a few places we need to untag the why_blocked value before inspecting it, but in most places we do not. - - - - - 7c64632b by Duncan Coutts at 2026-07-23T17:26:18-04:00 Use BlockInfoForceNonClosure in the select I/O manager - - - - - 8fd7104a by Duncan Coutts at 2026-07-23T17:26:18-04:00 Use BlockInfoForceNonClosure in the win32-legacy I/O manager for the BlockedOn{Read,Write} since these use the non-heap allocated StgAsyncIOResult. - - - - - e0da603b by Duncan Coutts at 2026-07-23T17:26:18-04:00 Enforce the why_blocked and block_info rules in checkTSO We now check the cases wher IsBlockInfoClosure should hold, the cases that are supposed to use block_info.unused == END_TSO_QUEUE, and which cases are allowed to use BlockInfoForceNonClosure. This partially enforces the use of why_blocked as a tag for the block_info union. We could be stricter and check for the correct expected info table for the closure cases. - - - - - 1dd0f381 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Use IsBlockInfoClosure to simplify several tests In GC and generic traversal we need to know if we should look at the block_info.closure or not. Now we can do just that using a cheap bit test on the why_blocked tag. This fixes issue 26717, where the problem was that some GC modes did not know when to look at block_info.closure, because the poll I/O manager uses a closure for BlockedOn{Read,Write} while the select I/O manager uses a non-closure. Now this information is in the why_blocked tag itself. - - - - - 7a00ffbc by Duncan Coutts at 2026-07-23T17:26:18-04:00 Remove the now-unused scavengeTSOIOManager The GC no longer has to delegate to the I/O manager, since it can use IsBlockInfoClosure to decide things itself. - - - - - 522a481f by Duncan Coutts at 2026-07-23T17:26:18-04:00 Remove duplicate assertion - - - - - 0874d965 by Duncan Coutts at 2026-07-23T17:26:18-04:00 Follow atomic access rules more consistently for tso->why_blocked The rule is this: store block_info *before* why_blocked store why_blocked using store release load why_blocked using load acquire load block_info *after* why_blocked This is a an atomic store release / load acquire pair and (if the reads are in a separate thread to the writes, and the read receives the value stored) then this guarantees a full "happens before" relationship of these stores and loads. In some cases, we do not need a full load acquire, because we don't read the block_info at all and so do not need any ordering. In this case we just need an atomic relaxed load. This was being followed in most places, but not all. If there's good reason in any case that we don't need atomic access, then we should document that in a comment. In the absence of that I think it's easier to follow the rule everywhere. - - - - - 8f0bdbe1 by Duncan Coutts at 2026-07-23T17:26:19-04:00 Add a changelog entry - - - - - 4fdfe757 by Alan Zimmerman at 2026-07-23T17:27:06-04:00 EPA: Keep decls together in ClassDecl Similar to 1718230f4d3d19d8c49c0e5d496cb0fb6f399528 for HsValBindsLR, this commit updates ClassDecl so that it no longer splits out the assorted `LHsDecl GhcPs` until the renamer. It does this by inserting a type family (separate from the classic TTG one) for this. So data TyClDecl ... | ClassDecl { ... tcdDecls :: XClassDecls pass with type instance XClassDecls GhcPs = [LHsDecl GhcPs] type instance XClassDecls GhcRn = ClassDeclX GhcRn type instance XClassDecls GhcTc = ClassDeclX GhcTc data ClassDeclX pass = ClassDeclX { tcdSigs :: [LSig pass], -- ^ Methods' signatures tcdMeths :: LHsBinds pass, -- ^ Default methods tcdATs :: [LFamilyDecl pass], -- ^ Associated types; tcdATDefs :: [LTyFamDefltDecl pass], -- ^ Associated type defaults tcdDocs :: [LDocDecl pass] -- ^ Haddock docs } - - - - - 51c9f478 by Zubin Duggal at 2026-07-24T10:23:37-04:00 UniqueDFM: alter should preserve insertion order Before it always inserting new elements at the end. This is problematic because instances get inserted into the map with `alterF`, which can change ordering of how instances are printed with `:info` depending on the order in which we consult interfaces I expect `alter id k = id` and `alter (fmap f) k = adjust f k`. Moving keys to the end breaks that (`adjust` already preserves position). Fixes #27532 - - - - - 801a42be by Duncan Coutts at 2026-07-24T10:23:37-04:00 Fix flaky test T3994 on FreeBSD On current FreeBSD versions, calling getpgid on a zombie process fails. In T3994, if we're really unlucky with delays and scheduling then we can end up in exactly that situation. Just catch that specific exception and ignore it. It's rare, and not our fault. - - - - - 92 changed files: - + changelog.d/27532 - + changelog.d/T26716 - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Stats.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/Class.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - docs/users_guide/eventlog-formats.rst - libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.hsc - libraries/ghc-heap/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.hsc - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs - rts/IOManager.c - rts/IOManager.h - rts/Messages.c - rts/PrimOps.cmm - rts/RaiseAsync.c - rts/RaiseAsync.h - rts/STM.c - rts/Schedule.c - rts/StgMiscClosures.cmm - rts/Threads.c - rts/Trace.c - rts/Trace.h - rts/TraverseHeap.c - rts/include/Cmm.h - rts/include/rts/Constants.h - rts/include/rts/EventLogFormat.h - rts/include/rts/storage/TSO.h - rts/include/stg/MiscClosures.h - rts/posix/Poll.c - rts/posix/Select.c - rts/posix/Timeout.c - rts/sm/Compact.c - rts/sm/NonMovingMark.c - rts/sm/Sanity.c - rts/sm/Scav.c - rts/win32/AsyncMIO.c - testsuite/tests/ghci/T16793/T16793.stdout - testsuite/tests/ghci/T18060/T18060.stdout - + testsuite/tests/ghci/T27532/Makefile - + testsuite/tests/ghci/T27532/T27532.stdout - + testsuite/tests/ghci/T27532/T27532j4.stdout - + testsuite/tests/ghci/T27532/a.script - + testsuite/tests/ghci/T27532/all.T - + testsuite/tests/ghci/T27532/b.script - + testsuite/tests/ghci/T27532/genT27532Modules - testsuite/tests/ghci/scripts/ListTuplePunsPpr.stdout - testsuite/tests/ghci/scripts/T4175.stdout - testsuite/tests/ghci/scripts/T8469.stdout - testsuite/tests/ghci/scripts/T8535.stdout - testsuite/tests/ghci/scripts/T9881.stdout - testsuite/tests/ghci/scripts/ghci020.stdout - testsuite/tests/ghci/scripts/ghci064.stdout - testsuite/tests/ghci/should_run/T10145.stdout - testsuite/tests/ghci/should_run/T18594.stdout - testsuite/tests/haddock/haddock_examples/haddock.Test.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr - testsuite/tests/printer/Test24533.stdout - testsuite/tests/process/T3994.hs - testsuite/tests/roles/should_compile/Roles14.stderr - testsuite/tests/roles/should_compile/Roles3.stderr - testsuite/tests/roles/should_compile/Roles4.stderr - testsuite/tests/roles/should_compile/T8958.stderr - testsuite/tests/typecheck/should_compile/T18406b.stderr - testsuite/tests/typecheck/should_compile/T18529.stderr - testsuite/tests/typecheck/should_fail/T5300.stderr - utils/check-exact/ExactPrint.hs - utils/check-exact/Utils.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e634fd2a8ac6cd1533b32f710e0601… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e634fd2a8ac6cd1533b32f710e0601… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/drop-unused-cabal-flags
by Cheng Shao (＠TerrorJack) 24 Jul '26

24 Jul '26

Cheng Shao deleted branch wip/drop-unused-cabal-flags at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-cmm-dump-labels
by Cheng Shao (＠TerrorJack) 24 Jul '26

24 Jul '26

Cheng Shao pushed new branch wip/fix-cmm-dump-labels at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-cmm-dump-labels You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/sjakobi/lazy-field-anns] Add -XLazyFieldAnnotations (GHC proposal 752)
by Simon Jakobi (＠sjakobi) 24 Jul '26

24 Jul '26

Simon Jakobi pushed to branch wip/sjakobi/lazy-field-anns at Glasgow Haskell Compiler / GHC Commits: 6cdfc6cd by Simon Jakobi at 2026-07-24T15:16:22+02:00 Add -XLazyFieldAnnotations (GHC proposal 752) Unbundle the prefix `~` lazy field annotation syntax from StrictData. The new LazyFieldAnnotations extension controls whether `~` is accepted on constructor fields. StrictData (and Strict, transitively) imply the new extension. See https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0752-l…. Closes #24455. Assisted-by: Claude Opus 4.8 - - - - - 18 changed files: - + changelog.d/lazy-field-annotations - compiler/GHC/Driver/Flags.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/TyCl.hs - docs/users_guide/exts/strict.rst - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - + testsuite/tests/deSugar/should_run/LazyFieldAnnotationsSemantics.hs - + testsuite/tests/deSugar/should_run/LazyFieldAnnotationsSemantics.stdout - testsuite/tests/deSugar/should_run/all.T - testsuite/tests/driver/T4437.hs - testsuite/tests/interface-stability/template-haskell-exports.stdout - + testsuite/tests/typecheck/should_compile/LazyFieldAnnotations.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/LazyFieldsDisabled.stderr - + testsuite/tests/typecheck/should_fail/LazyFieldsDisabledStrictData.hs - + testsuite/tests/typecheck/should_fail/LazyFieldsDisabledStrictData.stderr - testsuite/tests/typecheck/should_fail/all.T Changes: ===================================== changelog.d/lazy-field-annotations ===================================== @@ -0,0 +1,14 @@ +section: language +synopsis: Add the `LazyFieldAnnotations` extension +issues: #24455 +mrs: !16246 + +description: { + The new :extension:`LazyFieldAnnotations` extension permits the prefix + ``~`` lazy field annotation on data and GADT constructor fields without + enabling :extension:`StrictData`. :extension:`StrictData` (and therefore + :extension:`Strict`) now implies :extension:`LazyFieldAnnotations` and + continues to control the default strictness of unannotated fields. + + See `GHC Proposal #752 <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0752-l…>`_. +} ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -261,6 +261,7 @@ extensionName = \case LangExt.ExplicitLevelImports -> "ExplicitLevelImports" LangExt.ImplicitStagePersistence -> "ImplicitStagePersistence" LangExt.QualifiedStrings -> "QualifiedStrings" + LangExt.LazyFieldAnnotations -> "LazyFieldAnnotations" -- | Is this extension known by any other names? For example -- -XGeneralizedNewtypeDeriving is accepted @@ -343,6 +344,7 @@ impliedXFlags , (LangExt.TemplateHaskell, On LangExt.TemplateHaskellQuotes) , (LangExt.Strict, On LangExt.StrictData) + , (LangExt.StrictData, On LangExt.LazyFieldAnnotations) -- Historically only UnboxedTuples was required for unboxed sums to work. -- To avoid breaking code, we make UnboxedTuples imply UnboxedSums. ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -3231,7 +3231,7 @@ instance Diagnostic TcRnMessage where TcRnHasFieldResolvedIncomplete{} -> noHints TcRnBadFieldAnnotation _ _ LazyFieldsDisabled - -> [suggestExtension LangExt.StrictData] + -> [suggestExtension LangExt.LazyFieldAnnotations] TcRnBadFieldAnnotation{} -> noHints TcRnSuperclassCycle{} ===================================== compiler/GHC/Tc/Errors/Types.hs ===================================== @@ -6355,7 +6355,7 @@ data PatSynInvalidRhsReason data BadFieldAnnotationReason where {-| A lazy data type field annotation (~) was used without enabling the - extension StrictData. + extension LazyFieldAnnotations. Test cases: LazyFieldsDisabled ===================================== compiler/GHC/Tc/TyCl.hs ===================================== @@ -5186,7 +5186,7 @@ checkValidDataCon dflags existential_ok tc con ; let check_bang :: Type -> HsSrcBang -> HsImplBang -> Int -> TcM () check_bang orig_arg_ty bang rep_bang n | HsSrcBang _ _ SrcLazy <- bang - , not (bang_opt_strict_data bang_opts) + , not (xopt LangExt.LazyFieldAnnotations dflags) = addErrTc (bad_bang n LazyFieldsDisabled) -- Warn about UNPACK without "!" ===================================== docs/users_guide/exts/strict.rst ===================================== @@ -155,6 +155,45 @@ Note the following points: for more discussion and examples. +.. _lazy-field-annotations: + +Lazy field annotations +---------------------- + +.. extension:: LazyFieldAnnotations + :shortdesc: Allow the prefix ``~`` lazy field annotation on constructor fields. + + :since: 10.2.1 + + Allow the prefix ``~`` lazy field annotation on data and GADT constructor + fields. + +``LazyFieldAnnotations`` allows a prefix ``~`` lazy annotation in every +constructor-field position where a prefix ``!`` strict annotation is accepted: +Haskell-98 prefix and record fields, and GADT argument types and record +fields. :: + + {-# LANGUAGE LazyFieldAnnotations #-} + + data A = A ~Int Bool + data B = B { b1 :: ~Int, b2 :: !Bool } + + data C where + C1 :: ~Int -> C + C2 :: { c1 :: ~Int, c2 :: !Bool } -> C + +A field annotated with ``~`` is lazy: it is not forced when the constructor is +built, but held as a thunk — the same behaviour as an unannotated field under +:extension:`NoStrictData`. + +The ``~`` annotation must be written in prefix form:: + + data T = MkT ~Int -- valid + data T = MkT ~ Int -- invalid + +See `GHC Proposal #229 <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0229-w…>`__ +for the precise rules. + .. _strict-data: Strict-by-default data types @@ -163,6 +202,8 @@ Strict-by-default data types .. extension:: StrictData :shortdesc: Treat datatype fields as strict by default. + :implies: :extension:`LazyFieldAnnotations` + :since: 8.0.1 Make fields of data types defined in the current module strict by default. @@ -183,13 +224,8 @@ we interpret it as if they had written :: The extension only affects definitions in this module. -The ``~`` annotation must be written in prefix form:: - - data T = MkT ~Int -- valid - data T = MkT ~ Int -- invalid - -See `GHC Proposal #229 <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0229-w…>`__ -for the precise rules. +The ``~`` lazy field annotation is provided by :extension:`LazyFieldAnnotations` +(which ``StrictData`` implies); see :ref:`lazy-field-annotations`. .. _strict: ===================================== libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs ===================================== @@ -169,6 +169,7 @@ data Extension | ExplicitLevelImports | ImplicitStagePersistence | QualifiedStrings + | LazyFieldAnnotations deriving (Eq, Enum, Show, Generic, Bounded) -- 'Ord' and 'Bounded' are provided for GHC API users (see discussions -- in https://gitlab.haskell.org/ghc/ghc/merge_requests/2707 and ===================================== testsuite/tests/deSugar/should_run/LazyFieldAnnotationsSemantics.hs ===================================== @@ -0,0 +1,24 @@ +{-# LANGUAGE LazyFieldAnnotations #-} + +-- | LazyFieldAnnotations does not change the default strictness of fields. +-- Without StrictData an unannotated field stays lazy and a ~ field is lazy +-- too; a ! field is still strict. +module Main where + +import Control.Exception (try, evaluate, SomeException) + +data T = Plain Int -- unannotated: lazy + | Lazy ~Int -- explicit ~: lazy + | Strict !Int -- explicit !: strict + +-- | Does building the constructor force the field? +forcesField :: T -> IO Bool +forcesField x = do + r <- try (evaluate x) :: IO (Either SomeException T) + pure (either (const True) (const False) r) + +main :: IO () +main = do + print =<< forcesField (Plain undefined) -- False: lazy + print =<< forcesField (Lazy undefined) -- False: lazy + print =<< forcesField (Strict undefined) -- True: strict ===================================== testsuite/tests/deSugar/should_run/LazyFieldAnnotationsSemantics.stdout ===================================== @@ -0,0 +1,3 @@ +False +False +True ===================================== testsuite/tests/deSugar/should_run/all.T ===================================== @@ -76,3 +76,5 @@ test('T19680A', normal, compile_and_run, ['']) test('T20024', exit_code(1), compile_and_run, ['']) test('Or5', exit_code(1), compile_and_run, ['']) + +test('LazyFieldAnnotationsSemantics', normal, compile_and_run, ['']) ===================================== testsuite/tests/driver/T4437.hs ===================================== @@ -36,7 +36,7 @@ check title expected got -- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs. expectedGhcOnlyExtensions :: [String] -expectedGhcOnlyExtensions = [ "QualifiedStrings", "Modifiers" ] +expectedGhcOnlyExtensions = [ "QualifiedStrings", "Modifiers", "LazyFieldAnnotations" ] expectedCabalOnlyExtensions :: [String] expectedCabalOnlyExtensions = ["Generics", ===================================== testsuite/tests/interface-stability/template-haskell-exports.stdout ===================================== @@ -269,6 +269,7 @@ module Language.Haskell.TH where | ExplicitLevelImports | ImplicitStagePersistence | QualifiedStrings + | LazyFieldAnnotations type FamilyResultSig :: * data FamilyResultSig = NoSig | KindSig Kind | TyVarSig (TyVarBndr ()) type FamilyResultSigQ :: * @@ -880,6 +881,7 @@ module Language.Haskell.TH.LanguageExtensions where | ExplicitLevelImports | ImplicitStagePersistence | QualifiedStrings + | LazyFieldAnnotations module Language.Haskell.TH.Lib where -- Safety: Safe @@ -1625,6 +1627,7 @@ module Language.Haskell.TH.Syntax where | ExplicitLevelImports | ImplicitStagePersistence | QualifiedStrings + | LazyFieldAnnotations type FamilyResultSig :: * data FamilyResultSig = NoSig | KindSig Kind | TyVarSig (TyVarBndr ()) type FieldExp :: * ===================================== testsuite/tests/typecheck/should_compile/LazyFieldAnnotations.hs ===================================== @@ -0,0 +1,15 @@ +{-# LANGUAGE LazyFieldAnnotations #-} +{-# LANGUAGE GADTs #-} + +-- | LazyFieldAnnotations accepts the prefix ~ annotation in every +-- constructor-field position. +module LazyFieldAnnotations where + +-- Haskell-98 prefix and record fields +data A = A ~Int Bool +data B = B { b1 :: ~Int, b2 :: !Bool } + +-- GADT argument types and record fields +data C where + C1 :: ~Int -> C + C2 :: { c1 :: ~Int, c2 :: !Bool } -> C ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -967,4 +967,5 @@ test('T26805a', normal, compile, ['']) test('T24464', normal, compile, ['']) test('ExpansionQLIm', normal, compile, ['']) test('T23135', normal, compile, ['']) +test('LazyFieldAnnotations', normal, compile, ['']) ===================================== testsuite/tests/typecheck/should_fail/LazyFieldsDisabled.stderr ===================================== @@ -1,8 +1,8 @@ - LazyFieldsDisabled.hs:3:10: error: [GHC-81601] • Lazy field annotations (~) are disabled on the first argument of ‘A’ • In the definition of data constructor ‘A’ In the data type declaration for ‘A’ Suggested fix: - Perhaps you intended to use the ‘StrictData’ extension (implied by ‘Strict’) + Perhaps you intended to use the ‘LazyFieldAnnotations’ extension (implied by ‘StrictData’) + ===================================== testsuite/tests/typecheck/should_fail/LazyFieldsDisabledStrictData.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE StrictData #-} +{-# LANGUAGE NoLazyFieldAnnotations #-} + +-- | A later NoLazyFieldAnnotations overrides the implication from StrictData, +-- so ~ is rejected. +module LazyFieldsDisabledStrictData where + +data A = A ~Int ===================================== testsuite/tests/typecheck/should_fail/LazyFieldsDisabledStrictData.stderr ===================================== @@ -0,0 +1,8 @@ +LazyFieldsDisabledStrictData.hs:8:10: error: [GHC-81601] + • Lazy field annotations (~) are disabled + on the first argument of ‘A’ + • In the definition of data constructor ‘A’ + In the data type declaration for ‘A’ + Suggested fix: + Perhaps you intended to use the ‘LazyFieldAnnotations’ extension (implied by ‘StrictData’) + ===================================== testsuite/tests/typecheck/should_fail/all.T ===================================== @@ -690,6 +690,7 @@ test('T21444', normal, compile_fail, ['']) test('T23308', normal, compile_fail, ['']) test('MultiAssocDefaults', normal, compile_fail, ['']) test('LazyFieldsDisabled', normal, compile_fail, ['']) +test('LazyFieldsDisabledStrictData', normal, compile_fail, ['']) test('TyfamsDisabled', normal, compile_fail, ['']) test('CommonFieldResultTypeMismatch', normal, compile_fail, ['']) test('CommonFieldTypeMismatch', normal, compile_fail, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6cdfc6cd3727d1143438756ac95df36… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6cdfc6cd3727d1143438756ac95df36… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0