July 2026 - ghc-commits

[Git][ghc/ghc][wip/sjakobi/T16720] 4 commits: testsuite: Match failure output summary markers
by Simon Jakobi (＠sjakobi2) 18 Jul '26

18 Jul '26

Simon Jakobi pushed to branch wip/sjakobi/T16720 at Glasgow Haskell Compiler / GHC Commits: fc9b2d1e by Simon Jakobi at 2026-07-18T12:15:27+02:00 testsuite: Match failure output summary markers Use the same wording in the closing marker as in the unexpected failures output summary heading. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - c229dbea by Simon Jakobi at 2026-07-18T12:23:01+02:00 testsuite: Exercise excessive failure summary in CI Temporarily force one unexpected failure in the aarch64 Debian 13 validation job and lower its summary threshold so CI covers the too-many-failures path. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - f9d154cb by Simon Jakobi at 2026-07-18T12:28:47+02:00 testsuite: Exercise failure summary line limit in CI Add a 101-line failing test to the aarch64 Darwin validation job so CI covers output truncation without changing the 100-line limit. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - 0c3b23ed by Simon Jakobi at 2026-07-18T12:39:35+02:00 testsuite: Exercise unexpected pass summary in CI Add an intentional unexpected pass to the Darwin validation probe so its placement relative to the failure output summary is visible in CI. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - 5 changed files: - testsuite/driver/testlib.py - + testsuite/tests/driver/T16720SummaryLines.hs - + testsuite/tests/driver/T16720TooManyFailures.hs - + testsuite/tests/driver/T16720UnexpectedPass.hs - testsuite/tests/driver/all.T Changes: ===================================== testsuite/driver/testlib.py ===================================== @@ -3653,7 +3653,8 @@ MAX_SUMMARY_OUTPUT_LINES = 100 # Above this many unexpected failures, skip repeating output entirely: the # dump would drown out the summary. -MAX_SUMMARY_OUTPUT_TESTS = 20 +MAX_SUMMARY_OUTPUT_TESTS = \ + 0 if config.test_env == 'aarch64-linux-deb13-validate' else 20 def printTestOutputSummary(file: TextIO, testInfos, color: bool=False, junit_path: Optional[Path]=None) -> None: @@ -3692,7 +3693,7 @@ def printTestOutputSummary(file: TextIO, testInfos, color: bool=False, # cannot represent; replace rather than crash (cf safe_print). enc = getattr(file, 'encoding', None) or 'utf-8' file.write(s.encode(enc, errors='replace').decode(enc)) - footer = '<===== end of output of unexpected failures' + footer = '<===== end of unexpected failures output summary' if color: footer = colored(Color.RED, footer) file.write(footer + '\n\n') ===================================== testsuite/tests/driver/T16720SummaryLines.hs ===================================== @@ -0,0 +1,8 @@ +module Main where + +import System.Exit (exitFailure) + +main :: IO () +main = do + mapM_ print [1 .. 101 :: Int] + exitFailure ===================================== testsuite/tests/driver/T16720TooManyFailures.hs ===================================== @@ -0,0 +1 @@ +module T16720TooManyFailures where ===================================== testsuite/tests/driver/T16720UnexpectedPass.hs ===================================== @@ -0,0 +1 @@ +module T16720UnexpectedPass where ===================================== testsuite/tests/driver/all.T ===================================== @@ -336,3 +336,17 @@ 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('T26435', [only_ways(['llvm'])], warn_and_run, ['-finfo-table-map']) + +# Deliberately fail fast-CI jobs to exercise the summary output limits. +test('T16720TooManyFailures', + [unless(config.test_env == 'aarch64-linux-deb13-validate', skip)], + compile_fail, ['']) + +test('T16720SummaryLines', + [unless(config.test_env == 'aarch64-darwin-validate', skip)], + compile_and_run, ['']) + +# Show the failure output summary alongside another kind of unexpected result. +test('T16720UnexpectedPass', + [unless(config.test_env == 'aarch64-darwin-validate', skip), expect_fail], + compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3883ecb858b1d73322688307fb01c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3883ecb858b1d73322688307fb01c… 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/andreask/deep-discounts-2026] Document -dsuppress-guidance
by Andreas Klebinger (＠AndreasK) 18 Jul '26

18 Jul '26

Andreas Klebinger pushed to branch wip/andreask/deep-discounts-2026 at Glasgow Haskell Compiler / GHC Commits: 551b9cca by Andreas Klebinger at 2026-07-18T09:57:09+00:00 Document -dsuppress-guidance - - - - - 1 changed file: - docs/users_guide/debugging.rst Changes: ===================================== docs/users_guide/debugging.rst ===================================== @@ -940,6 +940,15 @@ parts that you are not interested in. Suppress "ticks" in the pretty-printer output. +.. ghc-flag:: -dsuppress-guidance + :shortdesc: Suppress details of unfolding guidance. + :type: dynamic + :since: 10.2 + + Unfolding guidance describes how the structure of an argument impacts inlining + behaviour. However it can be quite noisy so we often want to suppress it. + :ghc-flag:`-dsuppress-guidance` + .. ghc-flag:: -dsuppress-uniques :shortdesc: Suppress the printing of uniques in debug output (easier to use ``diff``) @@ -952,6 +961,7 @@ parts that you are not interested in. has shown you where to look, you can try again without :ghc-flag:`-dsuppress-uniques` + .. ghc-flag:: -dstable-core-dump-order :shortdesc: Reorder top-level bindings in Core dumps into a stable, diffable order View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/551b9ccadbd91155770a8aa940b5092… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/551b9ccadbd91155770a8aa940b5092… 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/andreask/deep-discounts-2026
by Andreas Klebinger (＠AndreasK) 18 Jul '26

18 Jul '26

Andreas Klebinger pushed new branch wip/andreask/deep-discounts-2026 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/andreask/deep-discounts-2026 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] 21 commits: Coercion optimisation: avoid double-Sym for InstCo
by Marge Bot (＠marge-bot) 18 Jul '26

18 Jul '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 775ab775 by sheaf at 2026-07-18T02:27:55-04:00 Coercion optimisation: avoid double-Sym for InstCo Ticket #27374 pointed out an issue with GHC.Core.Coercion.Opt.optCoercion's handling of InstCo: it contravened (LC2) in Note [The LiftingContext in optCoercion] because it applied the ambient 'sym' to a coercion that was then added to the lifting context substitution. Fixes #27374 Co-authored-by: Simon Jakobi <simon.jakobi(a)gmail.com> - - - - - 35d5c7be by sheaf at 2026-07-18T02:27:55-04:00 Coercion optimisation: avoid exponential behaviour The change to coercion optimisation of 'InstCo' in the previous commit introduces exponential behaviour to the coercion optimiser. To avoid this, this commit provides a way to push in 'Sym' of an already-optimised coercion: GHC.Core.Coercion.Opt.mkDeepSymCo. See Note [Pushing Sym without re-optimising] in GHC.Core.Coercion.Opt. - - - - - d89552bc by Duncan Coutts at 2026-07-18T02:27:56-04:00 Move THREADED_RTS-conditional struct members to end of Capability Accessing members of the Capability struct from CMM code rely on accessor macros. (The macros are generated by deriveConstants). These macros have a single definition. This means that the offsets of all struct members must *not* vary based on THREADED_RTS vs !THREADED_RTS. This requires that any struct members that are conditional on THREADED_RTS must occur after the unconditional struct members. Hence we move all the ones that are conditional on THREADED_RTS to the end. Add a deriveConstants entry for the iomgr member of the Capability struct, which was the motivation for this change. Add warning messages to help our future selves. Debugging this took me a couple hours in gdb! - - - - - c2b2bccb by Duncan Coutts at 2026-07-18T02:27:56-04:00 Make the IOManager API use CapIOManager rather than Capability This makes the API somewhat more self-contained and more consistent. Now the IOManager API and each of the backends takes just the I/O manager structure. Previously we had a bit of a mixture, depending on whether the function needed access to the Capability or just the CapIOManager. We still need access to the cap, so we introduce a back reference to reach the capability, via iomgr->cap. Convert all uses in select and poll backends, but not win32 ones. Convert callers in the scheduler and elsewhere. Also convert the three CMM primops that call IOManager APIs. They just need to use Capability_iomgr(MyCapability()). - - - - - 4dc5bb92 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Split posix/MIO.c out of posix/Signals.c The MIO I/O manager was secretly living inside the Signals file. Now it gets its own file, like any other self-respecting I/O manager. - - - - - 736261e9 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Rationalise some scheduler run queue utilities Move them all to the same place in the file. Make some static that were used only internally. Also remove a redundant assignment after calling truncateRunQueue that is already done within truncateRunQueue. - - - - - 79ebdf64 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Rename initIOManager{AfterFork} to {re}startIOManager These are more accurate names, since these actions happen after initialisation and are really about starting (or restarting) background threads. - - - - - 7875e681 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Free per-cap I/O managers during shutdown and forkProcess Historically this was not strictly necessary. The select and win32 legacy I/O managers did not maintain any dynamically allocated resources. The new poll one does (an auxillary table), and so this should be freed. After forkProcess, all threads get deleted. This includes threads waiting on I/O or timers. So as of this patch, resetting the I/O manager is just about tidying things up. For example, for the poll I/O manager this will reset the size of the AIOP table (which otherwise grows but never shrinks). In future however the re-initialising will become neeecessary for functionality, since some I/O managers will need to re-initialise wakeup fds that are set CLOEXEC. - - - - - e63ea9b7 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add a TODO to the MIO I/O manager The direction of travel is to make I/O managers per-capability and have all their state live in the struct CapIOManager. The MIO I/O manager however still has a number of global variables. It's not obvious how handle these globals however. - - - - - df6717d2 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add a FIXME note in the Poll I/O manager - - - - - ee8ceb5e by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add missing updateRemembSetPushClosure in poll I/O manager For the non-moving GC. - - - - - 6e0f6abb by Duncan Coutts at 2026-07-18T02:27:56-04:00 Minor doc improvement to struct StgAsyncIOOp member outcome Mention the enumeration names, as well as their numeric values. The rest of the code uses the enum names. - - - - - 98f6bc8d by Duncan Coutts at 2026-07-18T02:27:56-04:00 Minor doc improvements for StgTSOBlockInfo Clarify that certain union members are used only by certain legacy I/O managers. Hopefully we will be able to remove these at some point. - - - - - 6ebbdc66 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Avoid exporting various win32-specific rts symbols The BeginPrivate.h / EndPrivate.h scheme works perfectly well on Windows, but all of the rts/win32/*.h files were not using it. - - - - - 74d3bb1a by Duncan Coutts at 2026-07-18T02:27:56-04:00 Remove wakeupIOManager, ioManagerWakeup and setIOManagerWakeupFd We no longer need wakeupIOManager for the threaded RTS case, so we can remove it and the bits only needed to support it. This includes the pipe/eventfd fd shared between the RTS and the in-library I/O manager used for waking up the I/O manager thread. The pipe/eventfd still exists, but it no longer has to be communicated to the RTS, since the RTS no longer needs to use it. So we remove the RTS API export setIOManagerWakeupFd, and remove uses of it within the I/O managers in ghc-internal. - - - - - 1a43c373 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add a new interruptIOManager API for the I/O managers It will be used to interrupt awaitCompletedTimeoutsOrIO. Also update the return type and docs for awaitCompletedTimeoutsOrIO to have it return false when it gets interrupted, and have no useful post condition in that case. - - - - - 5f4916bb by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add interruptIOManager support for select I/O manager Uses the FdWakup mechanism. - - - - - 96a9d07d by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add interruptIOManager support for poll I/O manager Uses the FdWakup mechanism. A quirk we have to cope with is that we now need to poll one more fd -- the wakeup_fd_r -- but this fd has no corresponding entry in the aiop_table. This is awkward since we have set up our aiop_poll_table to be an auxilliary table with matching indicies. The solution this patch uses (and described in the comments) is to have two tables: struct pollfd *aiop_poll_table, *full_poll_table; and to have the aiop_poll_table alias the tail of the full_poll_table. The head entry in the full_poll_table is the extra fd. So we poll the full_poll_table, while the aiop_poll_table still has matching indicies with the aiop_table. Hurrah for C aliasing rules. - - - - - e3f10717 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Add interruptIOManager support for win32 legacy I/O manager And remove unused related helper resetAbandonRequestWait. It is not called because the event is created in auto-reset mode, so never needs to be reset manually. - - - - - bc424298 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Note lack of interruptIOManager support for WinIO I/O manager Though there's a plausible design, we can't sanely test it at the moment due to related WinIO bugs. Filed as issue #27403. - - - - - 42936301 by Duncan Coutts at 2026-07-18T02:27:56-04:00 Be more explicit about enum IOReadOrWrite values, and type within cmm Belt and braces. - - - - - 44 changed files: - + changelog.d/T27374 - compiler/GHC/Core/Coercion/Opt.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Event/Manager.hs - libraries/ghc-internal/src/GHC/Internal/Event/TimerManager.hs - rts/Capability.c - rts/Capability.h - rts/IOManager.c - rts/IOManager.h - rts/IOManagerInternals.h - rts/PrimOps.cmm - rts/RaiseAsync.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/Schedule.c - rts/Schedule.h - rts/include/rts/IOInterface.h - rts/include/rts/storage/Closures.h - rts/include/rts/storage/TSO.h - rts/posix/FdWakeup.h - + rts/posix/MIO.c - + rts/posix/MIO.h - rts/posix/Poll.c - rts/posix/Poll.h - rts/posix/Select.c - rts/posix/Select.h - rts/posix/Signals.c - rts/posix/Signals.h - rts/posix/Timeout.c - rts/posix/Timeout.h - rts/rts.cabal - rts/win32/AsyncMIO.c - rts/win32/AsyncMIO.h - rts/win32/AsyncWinIO.h - rts/win32/AwaitEvent.c - rts/win32/AwaitEvent.h - rts/win32/ConsoleHandler.h - rts/win32/MIOManager.h - rts/win32/ThrIOManager.h - rts/win32/WorkQueue.h - rts/win32/veh_excn.h - + testsuite/tests/corelint/T27374.hs - testsuite/tests/corelint/all.T - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e0ecc6c7c38ba7d6d956be7e37728e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e0ecc6c7c38ba7d6d956be7e37728e… 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] 21 commits: Coercion optimisation: avoid double-Sym for InstCo
by Marge Bot (＠marge-bot) 18 Jul '26

18 Jul '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 8d6bb07e by sheaf at 2026-07-17T23:56:22-04:00 Coercion optimisation: avoid double-Sym for InstCo Ticket #27374 pointed out an issue with GHC.Core.Coercion.Opt.optCoercion's handling of InstCo: it contravened (LC2) in Note [The LiftingContext in optCoercion] because it applied the ambient 'sym' to a coercion that was then added to the lifting context substitution. Fixes #27374 Co-authored-by: Simon Jakobi <simon.jakobi(a)gmail.com> - - - - - 22d4e6e8 by sheaf at 2026-07-17T23:56:22-04:00 Coercion optimisation: avoid exponential behaviour The change to coercion optimisation of 'InstCo' in the previous commit introduces exponential behaviour to the coercion optimiser. To avoid this, this commit provides a way to push in 'Sym' of an already-optimised coercion: GHC.Core.Coercion.Opt.mkDeepSymCo. See Note [Pushing Sym without re-optimising] in GHC.Core.Coercion.Opt. - - - - - 7c93f190 by Duncan Coutts at 2026-07-17T23:56:23-04:00 Move THREADED_RTS-conditional struct members to end of Capability Accessing members of the Capability struct from CMM code rely on accessor macros. (The macros are generated by deriveConstants). These macros have a single definition. This means that the offsets of all struct members must *not* vary based on THREADED_RTS vs !THREADED_RTS. This requires that any struct members that are conditional on THREADED_RTS must occur after the unconditional struct members. Hence we move all the ones that are conditional on THREADED_RTS to the end. Add a deriveConstants entry for the iomgr member of the Capability struct, which was the motivation for this change. Add warning messages to help our future selves. Debugging this took me a couple hours in gdb! - - - - - 30524630 by Duncan Coutts at 2026-07-17T23:56:23-04:00 Make the IOManager API use CapIOManager rather than Capability This makes the API somewhat more self-contained and more consistent. Now the IOManager API and each of the backends takes just the I/O manager structure. Previously we had a bit of a mixture, depending on whether the function needed access to the Capability or just the CapIOManager. We still need access to the cap, so we introduce a back reference to reach the capability, via iomgr->cap. Convert all uses in select and poll backends, but not win32 ones. Convert callers in the scheduler and elsewhere. Also convert the three CMM primops that call IOManager APIs. They just need to use Capability_iomgr(MyCapability()). - - - - - 0f5b0064 by Duncan Coutts at 2026-07-17T23:56:23-04:00 Split posix/MIO.c out of posix/Signals.c The MIO I/O manager was secretly living inside the Signals file. Now it gets its own file, like any other self-respecting I/O manager. - - - - - b503e5f6 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Rationalise some scheduler run queue utilities Move them all to the same place in the file. Make some static that were used only internally. Also remove a redundant assignment after calling truncateRunQueue that is already done within truncateRunQueue. - - - - - aff61019 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Rename initIOManager{AfterFork} to {re}startIOManager These are more accurate names, since these actions happen after initialisation and are really about starting (or restarting) background threads. - - - - - bbc2613e by Duncan Coutts at 2026-07-17T23:56:24-04:00 Free per-cap I/O managers during shutdown and forkProcess Historically this was not strictly necessary. The select and win32 legacy I/O managers did not maintain any dynamically allocated resources. The new poll one does (an auxillary table), and so this should be freed. After forkProcess, all threads get deleted. This includes threads waiting on I/O or timers. So as of this patch, resetting the I/O manager is just about tidying things up. For example, for the poll I/O manager this will reset the size of the AIOP table (which otherwise grows but never shrinks). In future however the re-initialising will become neeecessary for functionality, since some I/O managers will need to re-initialise wakeup fds that are set CLOEXEC. - - - - - 983018df by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add a TODO to the MIO I/O manager The direction of travel is to make I/O managers per-capability and have all their state live in the struct CapIOManager. The MIO I/O manager however still has a number of global variables. It's not obvious how handle these globals however. - - - - - edfa4648 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add a FIXME note in the Poll I/O manager - - - - - 0bc22436 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add missing updateRemembSetPushClosure in poll I/O manager For the non-moving GC. - - - - - 52ace9eb by Duncan Coutts at 2026-07-17T23:56:24-04:00 Minor doc improvement to struct StgAsyncIOOp member outcome Mention the enumeration names, as well as their numeric values. The rest of the code uses the enum names. - - - - - eb0e626d by Duncan Coutts at 2026-07-17T23:56:24-04:00 Minor doc improvements for StgTSOBlockInfo Clarify that certain union members are used only by certain legacy I/O managers. Hopefully we will be able to remove these at some point. - - - - - 3c7b78fb by Duncan Coutts at 2026-07-17T23:56:24-04:00 Avoid exporting various win32-specific rts symbols The BeginPrivate.h / EndPrivate.h scheme works perfectly well on Windows, but all of the rts/win32/*.h files were not using it. - - - - - e0d4480e by Duncan Coutts at 2026-07-17T23:56:24-04:00 Remove wakeupIOManager, ioManagerWakeup and setIOManagerWakeupFd We no longer need wakeupIOManager for the threaded RTS case, so we can remove it and the bits only needed to support it. This includes the pipe/eventfd fd shared between the RTS and the in-library I/O manager used for waking up the I/O manager thread. The pipe/eventfd still exists, but it no longer has to be communicated to the RTS, since the RTS no longer needs to use it. So we remove the RTS API export setIOManagerWakeupFd, and remove uses of it within the I/O managers in ghc-internal. - - - - - 5c238d77 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add a new interruptIOManager API for the I/O managers It will be used to interrupt awaitCompletedTimeoutsOrIO. Also update the return type and docs for awaitCompletedTimeoutsOrIO to have it return false when it gets interrupted, and have no useful post condition in that case. - - - - - 4659b159 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add interruptIOManager support for select I/O manager Uses the FdWakup mechanism. - - - - - b0f46dcf by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add interruptIOManager support for poll I/O manager Uses the FdWakup mechanism. A quirk we have to cope with is that we now need to poll one more fd -- the wakeup_fd_r -- but this fd has no corresponding entry in the aiop_table. This is awkward since we have set up our aiop_poll_table to be an auxilliary table with matching indicies. The solution this patch uses (and described in the comments) is to have two tables: struct pollfd *aiop_poll_table, *full_poll_table; and to have the aiop_poll_table alias the tail of the full_poll_table. The head entry in the full_poll_table is the extra fd. So we poll the full_poll_table, while the aiop_poll_table still has matching indicies with the aiop_table. Hurrah for C aliasing rules. - - - - - 5ea6c966 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Add interruptIOManager support for win32 legacy I/O manager And remove unused related helper resetAbandonRequestWait. It is not called because the event is created in auto-reset mode, so never needs to be reset manually. - - - - - ebe037fd by Duncan Coutts at 2026-07-17T23:56:24-04:00 Note lack of interruptIOManager support for WinIO I/O manager Though there's a plausible design, we can't sanely test it at the moment due to related WinIO bugs. Filed as issue #27403. - - - - - e0ecc6c7 by Duncan Coutts at 2026-07-17T23:56:24-04:00 Be more explicit about enum IOReadOrWrite values, and type within cmm Belt and braces. - - - - - 44 changed files: - + changelog.d/T27374 - compiler/GHC/Core/Coercion/Opt.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Event/Manager.hs - libraries/ghc-internal/src/GHC/Internal/Event/TimerManager.hs - rts/Capability.c - rts/Capability.h - rts/IOManager.c - rts/IOManager.h - rts/IOManagerInternals.h - rts/PrimOps.cmm - rts/RaiseAsync.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/Schedule.c - rts/Schedule.h - rts/include/rts/IOInterface.h - rts/include/rts/storage/Closures.h - rts/include/rts/storage/TSO.h - rts/posix/FdWakeup.h - + rts/posix/MIO.c - + rts/posix/MIO.h - rts/posix/Poll.c - rts/posix/Poll.h - rts/posix/Select.c - rts/posix/Select.h - rts/posix/Signals.c - rts/posix/Signals.h - rts/posix/Timeout.c - rts/posix/Timeout.h - rts/rts.cabal - rts/win32/AsyncMIO.c - rts/win32/AsyncMIO.h - rts/win32/AsyncWinIO.h - rts/win32/AwaitEvent.c - rts/win32/AwaitEvent.h - rts/win32/ConsoleHandler.h - rts/win32/MIOManager.h - rts/win32/ThrIOManager.h - rts/win32/WorkQueue.h - rts/win32/veh_excn.h - + testsuite/tests/corelint/T27374.hs - testsuite/tests/corelint/all.T - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/be3c7b6baef7383564ba113cec1e4e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/be3c7b6baef7383564ba113cec1e4e… 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/T16720] ci: Preserve testsuite arguments when forcing colors
by Simon Jakobi (＠sjakobi2) 18 Jul '26

18 Jul '26

Simon Jakobi pushed to branch wip/sjakobi/T16720 at Glasgow Haskell Compiler / GHC Commits: d3883ecb by Simon Jakobi at 2026-07-18T02:17:03+02:00 ci: Preserve testsuite arguments when forcing colors Keep RUNTEST_ARGS consistently scalar so that adding CI colors does not hide the performance-failure policy argument. Assisted-by: gpt-5 via Codex CLI - - - - - 1 changed file: - .gitlab/ci.sh Changes: ===================================== .gitlab/ci.sh ===================================== @@ -1062,7 +1062,7 @@ if [ "${CI_COMMIT_BRANCH:-}" == "master" ] && [ "${CI_PROJECT_PATH:-}" == "ghc/ fi fi if [ -n "${IGNORE_PERF_FAILURES:-}" ]; then - RUNTEST_ARGS=( "${RUNTEST_ARGS[@]:-}" "--ignore-perf-failures=$IGNORE_PERF_FAILURES" ) + RUNTEST_ARGS="${RUNTEST_ARGS:-} --ignore-perf-failures=$IGNORE_PERF_FAILURES" fi if [[ -z ${BIGNUM_BACKEND:-} ]]; then BIGNUM_BACKEND=gmp; fi View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d3883ecb858b1d73322688307fb01cc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d3883ecb858b1d73322688307fb01cc… 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/T16720] 2 commits: testsuite: Style failure output summary header
by Simon Jakobi (＠sjakobi2) 17 Jul '26

17 Jul '26

Simon Jakobi pushed to branch wip/sjakobi/T16720 at Glasgow Haskell Compiler / GHC Commits: a976c52f by Simon Jakobi at 2026-07-18T01:37:59+02:00 testsuite: Style failure output summary header Match the opening of the unexpected failures output summary with its red directional closing marker. Assisted-by: gpt-5 via Codex CLI - - - - - 6c8aef22 by Simon Jakobi at 2026-07-18T01:54:41+02:00 testsuite: Handle unset result source directory Narrow the optional source directory before passing it to relpath, fixing the testsuite-driver mypy job while preserving the empty fallback for early framework failures. Assisted-by: gpt-5 via Codex CLI - - - - - 1 changed file: - testsuite/driver/testlib.py Changes: ===================================== testsuite/driver/testlib.py ===================================== @@ -1500,9 +1500,12 @@ def _newTestDir(name: TestName, opts: TestOptions, tempdir, dir): def _result_directory(opts: TestOptions) -> str: # The test's source directory, relative to the GHC source root, so it reads # the same regardless of which directory `make` was invoked from. + srcdir = opts.srcdir + if srcdir is None: + return '' try: - return os.path.relpath(opts.srcdir, config.top.parent) - except Exception: + return os.path.relpath(srcdir, config.top.parent) + except ValueError: return '' # ----------------------------------------------------------------------------- @@ -3563,7 +3566,6 @@ def summary(t: TestRun, file: TextIO, color=False, junit_path: Optional[Path]=No if t.unexpected_failures: if not too_many_failures: - file.write('Output of unexpected failures:\n\n') printTestOutputSummary(file, t.unexpected_failures, color, junit_path) else: where = '; see {}'.format(junit_path) if junit_path else '' @@ -3657,6 +3659,11 @@ def printTestOutputSummary(file: TextIO, testInfos, color: bool=False, junit_path: Optional[Path]=None) -> None: # Repeat failing tests' captured output in the summary, so one needn't # hunt for it earlier in a possibly very long log; see #16720. + header = '=====> Unexpected failures output summary' + if color: + header = colored(Color.RED, header) + file.write(header + '\n\n') + where = ', see {}'.format(junit_path) if junit_path else '' # Tests that fail identically in several ways (e.g. normal and g1) share one # output block, with the ways collected in the header. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f7d67acb79160bb5575b7697029ef7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f7d67acb79160bb5575b7697029ef7… 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/T27507] Infer EPT signatures for local functions
by Simon Jakobi (＠sjakobi2) 17 Jul '26

17 Jul '26

Simon Jakobi pushed to branch wip/sjakobi/T27507 at Glasgow Haskell Compiler / GHC Commits: 24bccaee by Simon Jakobi at 2026-07-17T13:04:46+02:00 Infer EPT signatures for local functions Extend parameter tag inference to local let-bound functions, with conservative handling for partial applications and escaping uses. See Note [EPT signatures for local function arguments]. Add regression coverage for #27507. - - - - - 6 changed files: - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - testsuite/tests/simplStg/should_run/T27507a.hs - + testsuite/tests/simplStg/should_run/T27507b.hs - + testsuite/tests/simplStg/should_run/T27507b.stdout - testsuite/tests/simplStg/should_run/all.T Changes: ===================================== compiler/GHC/Stg/EnforceEpt.hs ===================================== @@ -452,65 +452,12 @@ inferTagExpr _ (StgOpApp op args ty) inferTagExpr env (StgLet ext bind body) = (info, StgLet ext bind' body') where - (env', bind') = inferTagBind env bind - (info, body') = inferTagExpr env' body + (info, bind', body') = inferTagLet env (localFunsOfBind env False bind) bind body inferTagExpr env (StgLetNoEscape ext bind body) - | all (isJust . lookupJoinArgInfo env . fst) root_joins - = (plain_info, StgLetNoEscape ext plain_bind plain_body) - | otherwise - = go initial_arg_infos + = (info, StgLetNoEscape ext bind' body') where - (plain_body_env, plain_bind) = inferTagBind env bind - (plain_info, plain_body) = inferTagExpr plain_body_env body - - joins = root_joins ++ joinsInBind bind ++ joinsInExpr body - join_ids = map fst joins - initial_arg_infos = [replicate arity TagEPT | (_, arity) <- joins] - - go arg_infos - | arg_infos == new_arg_infos - = (info, StgLetNoEscape ext bind' body') - | otherwise - = go new_arg_infos - where - join_env = extendJoinArgEnv env (zipEqual join_ids arg_infos) - (body_env, bind') = inferTagBind join_env bind - (info, body') = inferTagExpr body_env body - calls = collectJoinCalls (makeTagged join_env) join_ids bind' body' - new_arg_infos = - [ maybe initial_infos (combineArgs initial_infos) (lookupVarEnv calls join_id) - | (join_id, initial_infos) <- zipEqual join_ids initial_arg_infos ] - - combineArgs = zipWithEqual combineAltInfo - - root_joins = joinsOf bind - - joinsOf (StgNonRec bndr rhs) = [joinOf bndr rhs] - joinsOf (StgRec pairs) = [joinOf bndr rhs | (bndr, rhs) <- pairs] - - joinOf bndr (StgRhsClosure _ _ _ bndrs _ _) - = (getBinderId env bndr, length bndrs) - joinOf bndr (StgRhsCon {}) - = (getBinderId env bndr, idArity (getBinderId env bndr)) - - joinsInBind (StgNonRec _ rhs) = joinsInRhs rhs - joinsInBind (StgRec pairs) = concatMap (joinsInRhs . snd) pairs - - joinsInRhs (StgRhsClosure _ _ _ _ rhs _) = joinsInExpr rhs - joinsInRhs (StgRhsCon {}) = [] - - joinsInExpr (StgApp {}) = [] - joinsInExpr (StgConApp {}) = [] - joinsInExpr (StgLit {}) = [] - joinsInExpr (StgTick _ expr) = joinsInExpr expr - joinsInExpr (StgOpApp {}) = [] - joinsInExpr (StgLet _ let_bind expr) - = joinsInBind let_bind ++ joinsInExpr expr - joinsInExpr (StgLetNoEscape _ let_bind expr) - = joinsOf let_bind ++ joinsInBind let_bind ++ joinsInExpr expr - joinsInExpr (StgCase scrut _ _ alts) - = joinsInExpr scrut ++ concatMap (joinsInExpr . alt_rhs) alts + (info, bind', body') = inferTagLet env (localFunsOfBind env True bind) bind body inferTagExpr in_env (StgCase scrut bndr ty alts) -- Unboxed tuples get their info from the expression we scrutinise if any @@ -564,28 +511,108 @@ inferTagExpr in_env (StgCase scrut bndr ty alts) (scrut_info, scrut') = inferTagExpr in_env scrut bndr' = (getBinderId in_env bndr, TagVal TagEPT) --- See Note [EPT signatures for join point arguments]. -collectJoinCalls +localFunsOfBind + :: TagEnv p -> Bool -> GenStgBinding p -> [(Id, Int)] +localFunsOfBind env is_join (StgNonRec bndr rhs) + = localFunOf env is_join bndr rhs +localFunsOfBind env is_join (StgRec pairs) + = concatMap (uncurry (localFunOf env is_join)) pairs + +localFunOf + :: TagEnv p -> Bool -> BinderP p -> GenStgRhs p -> [(Id, Int)] +localFunOf env is_join bndr (StgRhsClosure _ _ _ bndrs _ _) + | is_join || notNull bndrs + = [(getBinderId env bndr, length bndrs)] +localFunOf _ _ _ (StgRhsClosure {}) = [] +localFunOf env is_join bndr (StgRhsCon {}) + | is_join + = [(getBinderId env bndr, idArity (getBinderId env bndr))] +localFunOf _ _ _ (StgRhsCon {}) = [] + +-- See Note [EPT signatures for local function arguments]. +inferTagLet + :: forall p. (OutputableInferPass p, InferExtEq p) + => TagEnv p + -> [(Id, Int)] + -> GenStgBinding p + -> GenStgExpr p + -> (TagInfo, InferStgBinding, InferStgExpr) +inferTagLet env root_funs bind body + | null root_funs + = (plain_info, plain_bind, plain_body) + | all (isJust . lookupFunArgInfo env . fst) root_funs + = (plain_info, plain_bind, plain_body) + | otherwise + = go initial_arg_infos + where + (plain_body_env, plain_bind) = inferTagBind env bind + (plain_info, plain_body) = inferTagExpr plain_body_env body + + funs = root_funs ++ funsInBind bind ++ funsInExpr body + fun_ids = map fst funs + initial_arg_infos = [replicate arity TagEPT | (_, arity) <- funs] + + go arg_infos + | arg_infos == new_arg_infos + = (info, bind', body') + | otherwise + = go new_arg_infos + where + fun_env = extendFunArgEnv env (zipEqual fun_ids arg_infos) + (body_env, bind') = inferTagBind fun_env bind + (info, body') = inferTagExpr body_env body + calls = collectFunCalls (makeTagged fun_env) funs bind' body' + new_arg_infos = + [ maybe initial_infos (combineArgs initial_infos) (lookupVarEnv calls fun_id) + | (fun_id, initial_infos) <- zipEqual fun_ids initial_arg_infos ] + + combineArgs = zipWithEqual combineAltInfo + + funsInBind (StgNonRec _ rhs) = funsInRhs rhs + funsInBind (StgRec pairs) = concatMap (funsInRhs . snd) pairs + + funsInRhs (StgRhsClosure _ _ _ _ rhs _) = funsInExpr rhs + funsInRhs (StgRhsCon {}) = [] + + funsInExpr (StgApp {}) = [] + funsInExpr (StgConApp {}) = [] + funsInExpr (StgLit {}) = [] + funsInExpr (StgTick _ expr) = funsInExpr expr + funsInExpr (StgOpApp {}) = [] + funsInExpr (StgLet _ let_bind expr) + = localFunsOfBind env False let_bind ++ funsInBind let_bind ++ funsInExpr expr + funsInExpr (StgLetNoEscape _ let_bind expr) + = localFunsOfBind env True let_bind ++ funsInBind let_bind ++ funsInExpr expr + funsInExpr (StgCase scrut _ _ alts) + = funsInExpr scrut ++ concatMap (funsInExpr . alt_rhs) alts + +-- See Note [EPT signatures for local function arguments]. +collectFunCalls :: TagEnv 'InferTaggedBinders - -> [Id] + -> [(Id, Int)] -> InferStgBinding -> InferStgExpr -> IdEnv [TagInfo] -collectJoinCalls in_env join_ids bind body +collectFunCalls in_env funs bind body = bind_calls `plusCalls` collectExpr body_env body where - join_env = mkVarEnv [(join_id, ()) | join_id <- join_ids] + fun_env = mkVarEnv funs (bind_calls, body_env) = collectBind in_env bind collectExpr env (StgApp fun args) - | elemVarEnv fun join_env - = unitVarEnv fun (map (lookupInfo env) args) - | otherwise - = emptyVarEnv - collectExpr _ (StgConApp {}) = emptyVarEnv + = direct_call `plusCalls` collectArgs args + where + direct_call + | Just arity <- lookupVarEnv fun_env fun + = unitVarEnv fun + (take arity (map (lookupInfo env) args) ++ + replicate (arity - length args) TagDunno) + | otherwise + = emptyVarEnv + collectExpr _ (StgConApp _ _ args _) = collectArgs args collectExpr _ (StgLit {}) = emptyVarEnv collectExpr env (StgTick _ expr) = collectExpr env expr - collectExpr _ (StgOpApp {}) = emptyVarEnv + collectExpr _ (StgOpApp _ args _) = collectArgs args collectExpr env (StgLet _ let_bind expr) = let_calls `plusCalls` collectExpr let_env expr where @@ -610,39 +637,57 @@ collectJoinCalls in_env join_ids bind body collectRhs env (StgRhsClosure _ _ _ bndrs rhs _) = collectExpr (extendSigEnv env bndrs) rhs - collectRhs _ (StgRhsCon {}) = emptyVarEnv + collectRhs _ (StgRhsCon _ _ _ _ args _) = collectArgs args + + collectArgs = plusCallList . map collectArg + + collectArg (StgVarArg var) + | Just arity <- lookupVarEnv fun_env var + = unitVarEnv var (replicate arity TagDunno) + collectArg _ = emptyVarEnv plusCalls = plusVarEnv_C (zipWithEqual combineAltInfo) plusCallList = foldr plusCalls emptyVarEnv -{- Note [EPT signatures for join point arguments] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Join points are local, non-escaping functions, and every occurrence is a -saturated tail call. Consequently we can infer EPT information for their -arguments by treating them like SSA block parameters: an argument is EPT when -the corresponding actual argument is EPT at every jump to the join point. - -At each outermost StgLetNoEscape we optimistically start every argument of that -join group and all nested join groups at TagEPT, infer tags for the binding and -its body, and collect the argument tags at all calls to those join points. +{- Note [EPT signatures for local function arguments] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +For local functions we can inspect every use and infer that a parameter is EPT +when the corresponding actual argument is EPT at every call. Join points are +the particularly simple case: they never escape and every occurrence is a +saturated tail call, so their parameters behave like SSA block parameters. + +Ordinary let-bound functions can escape or be applied to too few arguments. +We therefore track their parameters independently. A direct call contributes +the tag of each supplied argument; an undersaturated call contributes TagDunno +for the missing suffix. If the function occurs as a value (for example as an +argument or constructor field), every parameter becomes TagDunno because a +later call is outside the analysis. Arguments beyond the function's arity do +not describe its parameters and are ignored. We still inspect every argument +for escaping occurrences of other tracked functions. + +At each outermost local function binding we optimistically start every argument +of that function group and all nested function and join groups at TagEPT, infer +tags for the binding and its body, and collect the argument tags at all uses. Combining those call-site tags gives the next, no more optimistic approximation -for the join arguments. Iterating reaches the greatest fixed point, including -for recursive and mutually recursive joins. Using the greatest fixed point is -important for recursive calls such as @jump j x@, where @x@ is itself a -parameter of @j@: such a back edge preserves EPTness rather than providing an -independent reason to reject it. - -Solving all nested join groups simultaneously is important for compile-time -performance. Independently solving a nested join group on every iteration of -each enclosing group causes exponential re-analysis in deeply nested code. -Nested StgLetNoEscapes therefore merely use the argument information installed -by the outer solver. +for the function arguments. Iterating reaches the greatest fixed point, +including for recursive and mutually recursive functions. Using the greatest +fixed point is important for recursive calls such as @jump j x@, where @x@ is +itself a parameter of @j@: such a back edge preserves EPTness rather than +providing an independent reason to reject it. + +Solving all nested function and join groups simultaneously is important for +compile-time performance. Independently solving a nested group on every +iteration of each enclosing group causes exponential re-analysis in deeply +nested code. +Nested bindings therefore merely use the argument information installed by the +outer solver. A dead local function has no call-site evidence against the +optimistic approximation, which is sound because it cannot be entered. This is tag inference, not strictness inference. It does not evaluate an argument or change the calling convention. It merely records that every path -which enters the join point already supplies an EPT value. Existing CBV marks -remain authoritative in inferTagRhs, since the rewriter enforces their EPT -precondition at call sites. +which enters the local function already supplies an EPT value. Existing CBV +marks remain authoritative in inferTagRhs, since the rewriter enforces their +EPT precondition at call sites. -} -- Compute binder sigs based on the constructors strict fields. @@ -787,7 +832,7 @@ inferTagRhs bnd_id in_env (StgRhsClosure ext cc upd bndrs body typ) = repeat NotMarkedCbv inferred_arg_infos = - fromMaybe (repeat TagDunno) (lookupJoinArgInfo in_env bnd_id) + fromMaybe (repeat TagDunno) (lookupFunArgInfo in_env bnd_id) env' = extendSigEnv in_env out_bndrs (info, body') = inferTagExpr env' body ===================================== compiler/GHC/Stg/EnforceEpt/Types.hs ===================================== @@ -54,9 +54,9 @@ combineAltInfo (TagTuple {}) TagEPT = TagDunno combineAltInfo (TagTuple is1) (TagTuple is2) = TagTuple (zipWithEqual combineAltInfo is1 is2) type TagSigEnv = IdEnv TagSig -type JoinArgEnv = IdEnv [TagInfo] +type FunArgEnv = IdEnv [TagInfo] data TagEnv p = TE { te_env :: TagSigEnv - , te_join_args :: JoinArgEnv + , te_fun_args :: FunArgEnv , te_get :: BinderP p -> Id , te_bytecode :: !Bool } @@ -73,7 +73,7 @@ getBinderId = te_get initEnv :: Bool -> TagEnv 'CodeGen initEnv for_bytecode = TE { te_env = emptyVarEnv - , te_join_args = emptyVarEnv + , te_fun_args = emptyVarEnv , te_get = \x -> x , te_bytecode = for_bytecode } @@ -81,7 +81,7 @@ initEnv for_bytecode = TE { te_env = emptyVarEnv -- with no other changes. makeTagged :: TagEnv p -> TagEnv 'InferTaggedBinders makeTagged env = TE { te_env = te_env env - , te_join_args = te_join_args env + , te_fun_args = te_fun_args env , te_get = fst , te_bytecode = te_bytecode env } @@ -159,9 +159,9 @@ extendSigEnv :: TagEnv p -> [(Id,TagSig)] -> TagEnv p extendSigEnv env@(TE { te_env = sig_env }) bndrs = env { te_env = extendVarEnvList sig_env bndrs } -lookupJoinArgInfo :: TagEnv p -> Id -> Maybe [TagInfo] -lookupJoinArgInfo env join_id = lookupVarEnv (te_join_args env) join_id +lookupFunArgInfo :: TagEnv p -> Id -> Maybe [TagInfo] +lookupFunArgInfo env fun_id = lookupVarEnv (te_fun_args env) fun_id -extendJoinArgEnv :: TagEnv p -> [(Id, [TagInfo])] -> TagEnv p -extendJoinArgEnv env@(TE { te_join_args = join_env }) joins - = env { te_join_args = extendVarEnvList join_env joins } +extendFunArgEnv :: TagEnv p -> [(Id, [TagInfo])] -> TagEnv p +extendFunArgEnv env@(TE { te_fun_args = fun_env }) funs + = env { te_fun_args = extendVarEnvList fun_env funs } ===================================== testsuite/tests/simplStg/should_run/T27507a.hs ===================================== @@ -12,10 +12,7 @@ data Box a = Box !a foo :: Bool -> Int -> (Int, Box Int) foo b !x = case x of - x' -> let -- Keep fun_exit monomorphic so that it can become a join point. - -- Without this signature its polymorphic result type prevents contification. - fun_exit :: Int -> Int -> (Int, Box Int) - fun_exit x_f i = (i, Box x_f) + x' -> let fun_exit x_f i = (i, Box x_f) {-# NOINLINE fun_exit #-} in if b then fun_exit x' 0 else fun_exit x' 1 {-# NOINLINE foo #-} ===================================== testsuite/tests/simplStg/should_run/T27507b.hs ===================================== @@ -0,0 +1,82 @@ +{-# LANGUAGE BangPatterns #-} + +-- Keep the local functions local and their boxed results visible. +{-# OPTIONS_GHC -fno-cpr-anal -fno-full-laziness #-} + +module Main where + +import GHC.Exts (noinline) +import GHC.Exts.Heap (GenClosure(..), getClosureData) +import System.Exit (exitFailure) + +data Box a = Box !a + +recursive :: Int -> Int -> (Int, Box Int) +recursive !x n = + let go y i + | i == 0 = (i, Box y) + | otherwise = go y (i - 1) + {-# NOINLINE go #-} + in go x n +{-# NOINLINE recursive #-} + +mixed :: Bool -> Int -> Int -> (Box Int, Box Int) +mixed b !x z = + let fun a c = (Box a, Box c) + {-# NOINLINE fun #-} + in if b then fun x x else fun x z +{-# NOINLINE mixed #-} + +apply :: (a -> b) -> a -> b +apply fun x = fun x +{-# NOINLINE apply #-} + +partial :: Int -> Int -> (Box Int, Box Int) +partial !x z = + let fun a c = (Box a, Box c) + {-# NOINLINE fun #-} + pap = fun x + in apply pap z +{-# NOINLINE partial #-} + +escaping :: Int -> (Int, Box Int) +escaping !x = + let fun a = (0, Box a) + {-# NOINLINE fun #-} + in case noinline Just fun of + Just escaped -> escaped x + Nothing -> (0, Box x) +{-# NOINLINE escaping #-} + +checkConstr :: String -> a -> IO () +checkConstr label value = do + closure <- getClosureData value + case closure of + ConstrClosure{} -> pure () + _ -> putStrLn ("FAIL: " ++ label ++ " was not a constructor") >> exitFailure + +checkThunk :: String -> a -> IO () +checkThunk label value = do + closure <- getClosureData value + case closure of + ThunkClosure{} -> pure () + _ -> putStrLn ("FAIL: " ++ label ++ " was not a thunk") >> exitFailure + +main :: IO () +main = do + case recursive 42 1 of + (_, value) -> checkConstr "recursive local function" value + + case mixed False 42 undefined of + (known, unknown) -> do + checkConstr "mixed known parameter" known + checkThunk "mixed unknown parameter" unknown + + case partial 42 undefined of + (known, unknown) -> do + checkConstr "partial known prefix" known + checkThunk "partial unknown suffix" unknown + + case escaping 42 of + (_, value) -> checkThunk "escaping local function" value + putStrLn "OK" ===================================== testsuite/tests/simplStg/should_run/T27507b.stdout ===================================== @@ -0,0 +1 @@ +OK ===================================== testsuite/tests/simplStg/should_run/all.T ===================================== @@ -25,3 +25,4 @@ test('unpack_enum', normal, compile_and_run, ['']) test('T27005a', normal, compile_and_run, ['']) test('T27507', normal, compile_and_run, ['']) test('T27507a', normal, compile_and_run, ['']) +test('T27507b', normal, compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/24bccaeef4f9d4ff9a9e7b6fd5273b1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/24bccaeef4f9d4ff9a9e7b6fd5273b1… 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/io-manager-selectbis] 30 commits: ci: add missing docker permission workaround in abi-test job
by Duncan Coutts (＠dcoutts) 17 Jul '26

17 Jul '26

Duncan Coutts pushed to branch wip/dcoutts/io-manager-selectbis at Glasgow Haskell Compiler / GHC Commits: 0f64f348 by Cheng Shao at 2026-07-16T15:41:08+00:00 ci: add missing docker permission workaround in abi-test job - - - - - 660cb239 by Cheng Shao at 2026-07-16T19:37:48+00:00 bindist: Fix make install -j race condition on macos/freebsd This patch fixes make install -j race condition on macos/freebsd. BSD install fails with EEXIST when multiple install processes concurrently create the same prefix directory. So we add an `install_dirs` prerequisite job that sequentially creates the directories for subsequent jobs to work with. Fixes #27499. Co-authored-by: Codex <codex(a)openai.com> - - - - - 08130257 by Cheng Shao at 2026-07-16T19:37:48+00:00 ci: run bindist make install with -j This patch makes the ci scripts run `make install` with `-j` to reduce wall clock time when installing the bindist, see related issue for benchmark numbers. This only affects ghc ci logic, the user-facing default is up to distributors and is still `-j1`. Closes #27029. - - - - - d5ae6906 by Adam Gundry at 2026-07-17T04:57:43-04:00 Mark various language extension flags as deprecated (see #27329) The following language extensions are now deprecated: - AlternativeLayoutRule - AlternativeLayoutRuleTransitional - ParallelArrays - PolymorphicComponents - Rank2Types In addition, the warning `-Walternative-layout-rule-transitional` has been marked as deprecated, as it is emitted only under the deprecated extension `XAlternativeLayoutRuleTransitional`. - - - - - fe3b059c by Andrew Lelechenko at 2026-07-17T04:58:26-04:00 base: re-export GHC.Environment.getFullArgs from System.Environment CLC proposal https://github.com/haskell/core-libraries-committee/issues/431 - - - - - bb368efa by Duncan Coutts at 2026-07-17T10:43:19+01:00 Move THREADED_RTS-conditional struct members to end of Capability Accessing members of the Capability struct from CMM code rely on accessor macros. (The macros are generated by deriveConstants). These macros have a single definition. This means that the offsets of all struct members must *not* vary based on THREADED_RTS vs !THREADED_RTS. This requires that any struct members that are conditional on THREADED_RTS must occur after the unconditional struct members. Hence we move all the ones that are conditional on THREADED_RTS to the end. Add a deriveConstants entry for the iomgr member of the Capability struct, which was the motivation for this change. Add warning messages to help our future selves. Debugging this took me a couple hours in gdb! - - - - - 35c97fb0 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Make the IOManager API use CapIOManager rather than Capability This makes the API somewhat more self-contained and more consistent. Now the IOManager API and each of the backends takes just the I/O manager structure. Previously we had a bit of a mixture, depending on whether the function needed access to the Capability or just the CapIOManager. We still need access to the cap, so we introduce a back reference to reach the capability, via iomgr->cap. Convert all uses in select and poll backends, but not win32 ones. Convert callers in the scheduler and elsewhere. Also convert the three CMM primops that call IOManager APIs. They just need to use Capability_iomgr(MyCapability()). - - - - - 4a89aee4 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Split posix/MIO.c out of posix/Signals.c The MIO I/O manager was secretly living inside the Signals file. Now it gets its own file, like any other self-respecting I/O manager. - - - - - 3c4536c9 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Rationalise some scheduler run queue utilities Move them all to the same place in the file. Make some static that were used only internally. Also remove a redundant assignment after calling truncateRunQueue that is already done within truncateRunQueue. - - - - - 1e02b5a8 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Rename initIOManager{AfterFork} to {re}startIOManager These are more accurate names, since these actions happen after initialisation and are really about starting (or restarting) background threads. - - - - - 27e0aa4f by Duncan Coutts at 2026-07-17T10:43:19+01:00 Free per-cap I/O managers during shutdown and forkProcess Historically this was not strictly necessary. The select and win32 legacy I/O managers did not maintain any dynamically allocated resources. The new poll one does (an auxillary table), and so this should be freed. After forkProcess, all threads get deleted. This includes threads waiting on I/O or timers. So as of this patch, resetting the I/O manager is just about tidying things up. For example, for the poll I/O manager this will reset the size of the AIOP table (which otherwise grows but never shrinks). In future however the re-initialising will become neeecessary for functionality, since some I/O managers will need to re-initialise wakeup fds that are set CLOEXEC. - - - - - 4a70715e by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add a TODO to the MIO I/O manager The direction of travel is to make I/O managers per-capability and have all their state live in the struct CapIOManager. The MIO I/O manager however still has a number of global variables. It's not obvious how handle these globals however. - - - - - 36232b96 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add a FIXME note in the Poll I/O manager - - - - - 9e17d6f5 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add missing updateRemembSetPushClosure in poll I/O manager For the non-moving GC. - - - - - acd2b67c by Duncan Coutts at 2026-07-17T10:43:19+01:00 Minor doc improvement to struct StgAsyncIOOp member outcome Mention the enumeration names, as well as their numeric values. The rest of the code uses the enum names. - - - - - 0cc3a3f0 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Minor doc improvements for StgTSOBlockInfo Clarify that certain union members are used only by certain legacy I/O managers. Hopefully we will be able to remove these at some point. - - - - - f912bc5b by Duncan Coutts at 2026-07-17T10:43:19+01:00 Avoid exporting various win32-specific rts symbols The BeginPrivate.h / EndPrivate.h scheme works perfectly well on Windows, but all of the rts/win32/*.h files were not using it. - - - - - a6b000ba by Duncan Coutts at 2026-07-17T10:43:19+01:00 Remove wakeupIOManager, ioManagerWakeup and setIOManagerWakeupFd We no longer need wakeupIOManager for the threaded RTS case, so we can remove it and the bits only needed to support it. This includes the pipe/eventfd fd shared between the RTS and the in-library I/O manager used for waking up the I/O manager thread. The pipe/eventfd still exists, but it no longer has to be communicated to the RTS, since the RTS no longer needs to use it. So we remove the RTS API export setIOManagerWakeupFd, and remove uses of it within the I/O managers in ghc-internal. - - - - - 737d71cc by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add a new interruptIOManager API for the I/O managers It will be used to interrupt awaitCompletedTimeoutsOrIO. Also update the return type and docs for awaitCompletedTimeoutsOrIO to have it return false when it gets interrupted, and have no useful post condition in that case. - - - - - 0f2fb3fd by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add interruptIOManager support for select I/O manager Uses the FdWakup mechanism. - - - - - f7e46e9c by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add interruptIOManager support for poll I/O manager Uses the FdWakup mechanism. A quirk we have to cope with is that we now need to poll one more fd -- the wakeup_fd_r -- but this fd has no corresponding entry in the aiop_table. This is awkward since we have set up our aiop_poll_table to be an auxilliary table with matching indicies. The solution this patch uses (and described in the comments) is to have two tables: struct pollfd *aiop_poll_table, *full_poll_table; and to have the aiop_poll_table alias the tail of the full_poll_table. The head entry in the full_poll_table is the extra fd. So we poll the full_poll_table, while the aiop_poll_table still has matching indicies with the aiop_table. Hurrah for C aliasing rules. - - - - - 81f5bc3a by Duncan Coutts at 2026-07-17T10:43:19+01:00 Add interruptIOManager support for win32 legacy I/O manager And remove unused related helper resetAbandonRequestWait. It is not called because the event is created in auto-reset mode, so never needs to be reset manually. - - - - - a357b29b by Duncan Coutts at 2026-07-17T10:43:19+01:00 Note lack of interruptIOManager support for WinIO I/O manager Though there's a plausible design, we can't sanely test it at the moment due to related WinIO bugs. Filed as issue #27403. - - - - - 04703995 by Duncan Coutts at 2026-07-17T10:43:19+01:00 Be more explicit about enum IOReadOrWrite values, and type within cmm Belt and braces. - - - - - e218c111 by Duncan Coutts at 2026-07-17T21:29:11+01:00 Add a new I/O manager based on select() Yes, this is the second such I/O manager, but it is a modern re-implementation based on the new in-RTS I/O manager infrastructure. So it is cleaner and faster than the old select I/O manager. Why do we need another I/O manager based on select? Why isn't the poll() one good enough as a baseline portable unix I/O manager? Because macOS. Apple Inc. is why we cannot have nice things. The man page for poll on macOS documents the fact that it does not work. At least, it does not work for all files. Specifically, it does not work for device files. Whereas macOS select() does work for device files. Aaaaarg! We _do_ want to deprecate and remove the old select I/O manager, but due to macOS we cannot do that until we have a replacement. This is that replacement. Until of course a nice new k-queue I/O manager arrives, which could become the new default for macOS and FreeBSD. Interestingly, this select I/O manager is actually faster than the poll one, on Linix, in some circumstances: specifically when many Haskell threads are waiting on the same fd. The poll I/O manager does O(n) work for n threads waiting on I/O, whereas the select one does O(fds) work for the number of fds that threads are waiting on. Usually this is 1:1, so it's not noticable, but one can concoct extreme benchmarks to show the difference. - - - - - a0909191 by Duncan Coutts at 2026-07-17T21:29:11+01:00 Add the new select I/O manager to the user guide in the RTS section about I/O managers. And add a changelog entry. - - - - - 9dfad42b by Duncan Coutts at 2026-07-17T21:29:11+01:00 fixup Add the new select I/O manager to the user guide - - - - - f14cbd54 by Duncan Coutts at 2026-07-17T21:29:11+01:00 Update the "location" for blockedOnBadFD exception This exception is thrown by the select, selectbis and poll I/O managers in rare circumstances. The existing location for the error was "awaitEvent" which is an old name that was internal to the RTS. The Haskell functions which this gets thrown from are the functions threadWaitRead / threadWaitWrite. So this is a more appropriate loction string. - - - - - c1603ba5 by Duncan Coutts at 2026-07-17T21:29:11+01:00 Minor updates in the poll I/O manager to keep in sync with select one, based on code review when implementing the new select I/O manager. The two are so similar that it makes sense to try to minimise the diff between them. - - - - - c3af2a9d by Duncan Coutts at 2026-07-17T21:29:11+01:00 Use selectbis I/O manager by default for CI coverage This should not be committed to master. It would be nice however to get better CI coverage of non-default I/O managers. - - - - - 108 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - + changelog.d/T27329 - + changelog.d/fix-make-install-j - + changelog.d/select-io-manager - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Tc/Types/Rank.hs - docs/users_guide/expected-undocumented-flags.txt - docs/users_guide/exts/rank_polymorphism.rst - docs/users_guide/exts/static_pointers.rst - docs/users_guide/runtime_control.rst - hadrian/bindist/Makefile - libraries/base/changelog.md - libraries/base/src/GHC/RTS/Flags.hs - libraries/base/src/System/Environment.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Event/Manager.hs - libraries/ghc-internal/src/GHC/Internal/Event/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Event/TimerManager.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - rts/Capability.c - rts/Capability.h - rts/IOManager.c - rts/IOManager.h - rts/IOManagerInternals.h - rts/PrimOps.cmm - rts/RaiseAsync.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/Schedule.c - rts/Schedule.h - rts/configure.ac - rts/include/rts/Flags.h - rts/include/rts/IOInterface.h - rts/include/rts/storage/Closures.h - rts/include/rts/storage/TSO.h - rts/posix/FdWakeup.h - + rts/posix/MIO.c - + rts/posix/MIO.h - rts/posix/Poll.c - rts/posix/Poll.h - rts/posix/Select.c - rts/posix/Select.h - + rts/posix/SelectBis.c - + rts/posix/SelectBis.h - rts/posix/Signals.c - rts/posix/Signals.h - rts/posix/Timeout.c - rts/posix/Timeout.h - rts/rts.cabal - rts/win32/AsyncMIO.c - rts/win32/AsyncMIO.h - rts/win32/AsyncWinIO.h - rts/win32/AwaitEvent.c - rts/win32/AwaitEvent.h - rts/win32/ConsoleHandler.h - rts/win32/MIOManager.h - rts/win32/ThrIOManager.h - rts/win32/WorkQueue.h - rts/win32/veh_excn.h - testsuite/tests/backpack/should_compile/T13149.bkp - testsuite/tests/determinism/determ017/A.hs - testsuite/tests/ghci/scripts/T12005.script - testsuite/tests/haddock/perf/Fold.hs - testsuite/tests/indexed-types/should_fail/T7354.hs - 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/ghc-experimental-exports.stdout - testsuite/tests/layout/layout001.stdout - testsuite/tests/layout/layout002.stdout - testsuite/tests/layout/layout003.stdout - testsuite/tests/layout/layout004.stdout - testsuite/tests/layout/layout005.stdout - testsuite/tests/layout/layout006.stdout - testsuite/tests/layout/layout007.stdout - testsuite/tests/layout/layout008.stdout - testsuite/tests/layout/layout009.stdout - testsuite/tests/linear/should_compile/T1735Min.hs - + testsuite/tests/parser/should_compile/T13087.stderr - testsuite/tests/parser/should_fail/T8431.stderr - testsuite/tests/parser/should_fail/readFail038.stderr - testsuite/tests/perf/compiler/T3064.hs - testsuite/tests/polykinds/T7594.hs - testsuite/tests/programs/thurston-modular-arith/Main.hs - testsuite/tests/rts/ipe/IpeStats/Fold.hs - testsuite/tests/simplCore/should_compile/T11562.hs - testsuite/tests/simplCore/should_run/T3591.hs - testsuite/tests/typecheck/should_compile/DeepSubsumption02.hs - testsuite/tests/typecheck/should_compile/T12507.hs - testsuite/tests/typecheck/should_compile/T13951.hs - testsuite/tests/typecheck/should_compile/T18920.hs - testsuite/tests/typecheck/should_compile/T2595.hs - testsuite/tests/typecheck/should_compile/T7541.hs - testsuite/tests/typecheck/should_fail/T6069.stderr - testsuite/tests/typecheck/should_fail/T7368a.hs - testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs - testsuite/tests/typecheck/should_run/T3731-short.hs - testsuite/tests/typecheck/should_run/T3731.hs - testsuite/tests/typecheck/should_run/church.hs - testsuite/tests/typecheck/should_run/tcrun008.hs - testsuite/tests/typecheck/should_run/tcrun017.hs - testsuite/tests/typecheck/should_run/tcrun026.hs - testsuite/tests/typecheck/should_run/tcrun035.hs - testsuite/tests/typecheck/should_run/tcrun036.hs - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ddaede066c617886433795cc5c14b8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ddaede066c617886433795cc5c14b8… 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/jeltsch/textual-bytecode-output] 3 commits: Add missing import of `(>=)`
by Wolfgang Jeltsch (＠jeltsch) 17 Jul '26

17 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: d1436c99 by Wolfgang Jeltsch at 2026-07-17T21:35:57+03:00 Add missing import of `(>=)` - - - - - f3a7a06a by Wolfgang Jeltsch at 2026-07-17T21:37:40+03:00 Improve and correct the terminology around `Maybe` values - - - - - 26550866 by Wolfgang Jeltsch at 2026-07-17T21:48:08+03:00 Make it explicit where enclosing modules are expected - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -9,6 +9,7 @@ import Prelude ((+), (-), Integral, div) import Control.Arrow ((>>>)) import Control.Exception (assert) import Data.Eq ((==)) +import Data.Ord ((>=)) import Data.Bits (FiniteBits, finiteBitSize) import Data.Function (($), id, (.)) import Data.Tuple (fst, uncurry) @@ -106,7 +107,9 @@ pprOnDiskModuleByteCodeHash :: Fingerprint -> SDoc pprOnDiskModuleByteCodeHash = entry (text "hash") . ppr -- | Constructs textual information about bytecode. -pprCompiledByteCode :: Module -> CompiledByteCode -> SDoc +pprCompiledByteCode :: Module -- ^ The enclosing module + -> CompiledByteCode -- ^ The bytecode + -> SDoc -- ^ The textual information pprCompiledByteCode currentModule CompiledByteCode {..} = vcat [ pprByteCodeObjects currentModule $ bc_bcos, @@ -118,14 +121,18 @@ pprCompiledByteCode currentModule CompiledByteCode {..} ] -- | Constructs textual information about bytecode objects. -pprByteCodeObjects :: Module -> FlatBag UnlinkedBCO -> SDoc +pprByteCodeObjects :: Module -- ^ The enlosing module + -> FlatBag UnlinkedBCO -- ^ The bytecode objects + -> SDoc -- ^ The textual information pprByteCodeObjects currentModule = entry (text "objects") . vcatOrNone . map (pprByteCodeObject currentModule) . elemsFlatBag -- | Constructs textual information about a single bytecode object. -pprByteCodeObject :: Module -> UnlinkedBCO -> SDoc +pprByteCodeObject :: Module -- ^ The enclosing module + -> UnlinkedBCO -- ^ The bytecode object + -> SDoc -- ^ The textual information pprByteCodeObject currentModule byteCodeObject = case byteCodeObject of UnlinkedBCO {..} -> entry (text "ordinary object" <+> quotes (ppr unlinkedBCOName)) $ @@ -163,14 +170,18 @@ pprLiftedness :: Bool -> SDoc pprLiftedness = entry (text "lifted") . noOrYes -- | Constructs textual information about literals. -pprLiterals :: Module -> FlatBag BCONPtr -> SDoc +pprLiterals :: Module -- ^ The enclosing module + -> FlatBag BCONPtr -- ^ The literals + -> SDoc -- ^ The textual information pprLiterals currentModule = entry (text "literals") . vcatOrNone . map (pprLiteral currentModule) . elemsFlatBag -- | Constructs textual information about a single literal. -pprLiteral :: Module -> BCONPtr -> SDoc +pprLiteral :: Module -- ^ The enclosing module + -> BCONPtr -- ^ The literal + -> SDoc -- ^ The textual information pprLiteral currentModule literal = case literal of BCONPtrWord word -> text "word" <+> @@ -197,7 +208,7 @@ pprLiteral currentModule literal = case literal of -> text "cost center of breakpoint" <+> pprInternalBreakpointID currentModule breakpointID --- | Constructs textual information about some FFI info. +-- | Constructs textual information about FFI info. pprFFIInfo :: FFIInfo -> SDoc pprFFIInfo FFIInfo {..} = hsep (map (pprFFIType >>> (<+> text "->")) ffiInfoArgs) <+> @@ -211,7 +222,10 @@ pprFFIType ffiType = assert (take 3 ident == "FFI") $ text (drop 3 ident) where ident = show ffiType -- | Constructs textual information about the ID of a bytecode breakpoint. -pprInternalBreakpointID :: Module -> InternalBreakpointId -> SDoc +pprInternalBreakpointID + :: Module -- ^ The enclosing module + -> InternalBreakpointId -- ^ The ID of the bytecode breakpoint + -> SDoc -- ^ The textual information pprInternalBreakpointID currentModule InternalBreakpointId {..} | ibi_info_mod == currentModule = indexDoc | otherwise = indexDoc <+> @@ -223,14 +237,18 @@ pprInternalBreakpointID currentModule InternalBreakpointId {..} indexDoc = ppr ibi_info_index -- | Constructs textual information about pointers. -pprPointers :: Module -> FlatBag BCOPtr -> SDoc +pprPointers :: Module -- ^ The enclosing module + -> FlatBag BCOPtr -- ^ The pointers + -> SDoc -- ^ The textual information pprPointers currentModule = entry (text "utilized items") . vcatOrNone . map (pprPointer currentModule) . elemsFlatBag -- | Constructs textual information about a single pointer. -pprPointer :: Module -> BCOPtr -> SDoc +pprPointer :: Module -- ^ The enclosing module + -> BCOPtr -- ^ The pointer + -> SDoc -- ^ The textual information pprPointer currentModule pointer = case pointer of BCOPtrName name -> text "item named" <+> quotes (ppr name) @@ -279,21 +297,27 @@ pprTopLevelString stringName encodedString = entry (ppr stringName) $ encodedString -- | Constructs textual information about breakpoints. -pprBreakpoints :: Module -> Maybe InternalModBreaks -> SDoc +pprBreakpoints :: Module -- ^ The enclosing module + -> Maybe InternalModBreaks -- ^ The breakpoints + -> SDoc -- ^ The textual information pprBreakpoints currentModule = entry (text "breakpoints") . - maybe (text "<none>") (pprBreakpointsData currentModule) + maybe (text "<none>") (pprActualBreakpoints currentModule) --- | Constructs textual information about a single breakpoint. -pprBreakpointsData :: Module -> InternalModBreaks -> SDoc -pprBreakpointsData currentModule InternalModBreaks {..} +-- | Constructs textual information about actual breakpoints. +pprActualBreakpoints :: Module -- ^ The enclosing module + -> InternalModBreaks -- ^ The actual breakpoints + -> SDoc -- ^ The textual information +pprActualBreakpoints currentModule InternalModBreaks {..} = vcat [ pprSourceBreakpoints currentModule $ imodBreaks_modBreaks, pprByteCodeBreakpoints currentModule $ imodBreaks_breakInfo ] -- | Constructs textual information about source breakpoints. -pprSourceBreakpoints :: Module -> ModBreaks -> SDoc +pprSourceBreakpoints :: Module -- ^ The enclosing module + -> ModBreaks -- ^ The source breakpoints + -> SDoc -- ^ The textual information pprSourceBreakpoints currentModule ModBreaks {..} = entry (text "source breakpoints") $ assert (modBreaks_module == currentModule) $ @@ -336,7 +360,9 @@ pprFreeVariables :: [OccName] -> SDoc pprFreeVariables = entry (text "free variables") . vcatOrNone . map ppr -- | Constructs textual information about bytecode breakpoints. -pprByteCodeBreakpoints :: Module -> IntMap CgBreakInfo -> SDoc +pprByteCodeBreakpoints :: Module -- ^ The enclosing module + -> IntMap CgBreakInfo -- ^ The bytecode breakpoints + -> SDoc -- ^ The textual information pprByteCodeBreakpoints currentModule = entry (text "bytecode breakpoints") . vcatOrNone . @@ -344,7 +370,10 @@ pprByteCodeBreakpoints currentModule IntMap.toList -- | Constructs textual information about a single bytecode breakpoint. -pprByteCodeBreakpoint :: Module -> Int -> CgBreakInfo -> SDoc +pprByteCodeBreakpoint :: Module -- ^ The enclosing module + -> Int -- ^ The index of the bytecode breakpoint + -> CgBreakInfo -- ^ The bytecode breakpoint + -> SDoc -- ^ The textual information pprByteCodeBreakpoint currentModule ix CgBreakInfo {..} = entry (text "bytecode breakpoint" <+> ppr ix) $ vcat [ @@ -392,15 +421,20 @@ pprVariableBinder (multiplicity, name, type_) -- | Constructs textual information about a source breakpoint corresponding to a -- bytecode breakpoint. pprCorrespondingSourceBreakpoint :: Module + -- ^ The enclosing module -> Either InternalBreakLoc BreakpointId + -- ^ A reference to the source breakpoint -> SDoc + -- ^ The textual information pprCorrespondingSourceBreakpoint currentModule = entry (text "corresponding source breakpoint") . pprBreakpointID currentModule . either internalBreakLoc id -- | Constructs textual information about the ID of a source breakpoint. -pprBreakpointID :: Module -> BreakpointId -> SDoc +pprBreakpointID :: Module -- ^ The enclosing module + -> BreakpointId -- ^ The ID of the source breakpoint + -> SDoc -- ^ The textual information pprBreakpointID currentModule BreakpointId {..} | bi_tick_mod == currentModule = indexDoc | otherwise = indexDoc <+> @@ -422,14 +456,14 @@ pprStaticPointerTableEntry :: SptEntry -> SDoc pprStaticPointerTableEntry (SptEntry name fingerprint) = ppr fingerprint <> text ":" <+> ppr name --- | Constructs textual information about some HPC info. +-- | Constructs textual information about HPC info. pprHPCInfo :: Strict.Maybe ByteCodeHpcInfo -> SDoc pprHPCInfo = entry (text "HPC information") . - Strict.maybe (text "<none>") pprHPCInfoData + Strict.maybe (text "<none>") pprActualHPCInfo --- | Constructs textual information about data that makes up some HPC info. -pprHPCInfoData :: ByteCodeHpcInfo -> SDoc -pprHPCInfoData ByteCodeHpcInfo {..} +-- | Constructs textual information about actual HPC info. +pprActualHPCInfo :: ByteCodeHpcInfo -> SDoc +pprActualHPCInfo ByteCodeHpcInfo {..} = vcat [ pprHPCInfoHash $ bchi_hash, pprModuleName $ bchi_module_name, @@ -438,7 +472,7 @@ pprHPCInfoData ByteCodeHpcInfo {..} ] where --- | Constructs textual information about the hash of some HPC info. +-- | Constructs textual information about the hash of HPC info. pprHPCInfoHash :: Int -> SDoc pprHPCInfoHash = entry (text "hash") . pprFixedSizeNatural View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2f58c3a2d3c0e6f3738865a01ace68… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2f58c3a2d3c0e6f3738865a01ace68… 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