March 2026 - ghc-commits

[Git][ghc/ghc] Pushed new branch wip/T27056
by Teo Camarasu (＠teo) 26 Mar '26

26 Mar '26

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

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T27096
by Simon Jakobi (＠sjakobi2) 26 Mar '26

26 Mar '26

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

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T27098
by Simon Jakobi (＠sjakobi2) 26 Mar '26

26 Mar '26

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

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 24 commits: Check that shift values are valid
by Marge Bot (＠marge-bot) 26 Mar '26

26 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 718cd063 by Sylvain Henry at 2026-03-25T16:37:08-04:00 Check that shift values are valid In GHC's codebase in non-DEBUG builds we silently substitute shiftL/R with unsafeShiftL/R for performance reasons. However we were not checking that the shift value was valid for unsafeShiftL/R, leading to wrong computations, but only in non-DEBUG builds. This patch adds the necessary checks and reports an error when a wrong shift value is passed. - - - - - 2ce1fcf2 by Sylvain Henry at 2026-03-25T16:37:08-04:00 Implement basic value range analysis (#25718) Perform basic value range analysis to try to determine at compile time the result of the application of some comparison primops (ltWord#, etc.). This subsumes the built-in rewrite rules used previously to check if one of the comparison argument was a bound (e.g. (x :: Word8) <= 255 is always True). Our analysis is more powerful and handles type conversions: e.g. word8ToWord x <= 255 is now detected as always True too. We also use value range analysis to filter unreachable alternatives in case-expressions. To support this, we had to allow case-expressions for primitive types to not have a DEFAULT alternative (as was assumed before and checked in Core lint). - - - - - 1351253e by ARATA Mizuki at 2026-03-25T16:37:15-04:00 rts: Align stack to 64-byte boundary in StgRun on x86 When LLVM spills AVX/AVX-512 vector registers to the stack, it requires 32-byte (__m256) or 64-byte (__m512) alignment. If the stack is not sufficiently aligned, LLVM inserts a realignment prologue that reserves %rbp as a frame pointer, conflicting with GHC's use of %rbp as an STG callee-saved register and breaking the tail-call-based calling convention. Previously, GHC worked around this by lying to LLVM about the stack alignment and rewriting aligned vector loads/stores (VMOVDQA, VMOVAPS) to unaligned ones (VMOVDQU, VMOVUPS) in the LLVM Mangler. This had two problems: - It did not extend to AVX-512, which requires 64-byte alignment. (#26595) - When Haskell calls a C function that takes __m256/__m512 arguments on the stack, the callee requires genuine alignment, which could cause a segfault. (#26822) This patch genuinely aligns the stack to 64 bytes in StgRun by saving the original stack pointer before alignment and restoring it in StgReturn. We now unconditionally advertise 64-byte stack alignment to LLVM for all x86 targets, making rewriteAVX in the LLVM Mangler unnecessary. STG_RUN_STACK_FRAME_SIZE is increased from 48 to 56 bytes on non-Windows x86-64 to store the saved stack pointer. Closes #26595 and #26822 Co-Authored-By: Claude Opus 4.5 <noreply(a)anthropic.com> - - - - - b923e82f by Teo Camarasu at 2026-03-25T16:37:16-04:00 ghc-internal: Float Generics to near top of module graph We remove GHC.Internal.Generics from the critical path of the `ghc-internal` module graph. GHC.Internal.Generics used to be in the middle of the module graph, but now it is nearer the top (built later). This change thins out the module graph and allows us to get rid of the ByteOrder hs-boot file. We implement this by moving Generics instances from the module where the datatype is defined to the GHC.Internal.Generics module. This trades off increasing the compiled size of GHC.Internal.Generics with reducing the dependency footprint of datatype modules. Not all instances are moved to GHC.Internal.Generics. For instance, `GHC.Internal.Control.Monad.Fix` keeps its instance as it is one of the very last modules compiled in `ghc-internal` and so inverting the relationship here would risk adding GHC.Internal.Generics back onto the critical path. We also don't change modules that are re-exported from the `template-haskell` or `ghc-heap`. This is done to make it easy to eventually move `Generics` to `base` once something like #26657 is implemented. Resolves #26930 Metric Decrease: T21839c - - - - - 080c82a0 by sheaf at 2026-03-25T16:37:22-04:00 Avoid infinite loop in deep subsumption This commit ensures we only unify after we recur in the deep subsumption code in the FunTy vs non-FunTy case of GHC.Tc.Utils.Unify.tc_sub_type_deep, to avoid falling into an infinite loop. See the new Wrinkle [Avoiding a loop in tc_sub_type_deep] in Note [FunTy vs non-FunTy case in tc_sub_type_deep] in GHC.Tc.Utils.Unify. Fixes #26823 Co-authored-by: simonpj <simon.peytonjones(a)gmail.com> - - - - - 96f303dc by Ian Duncan at 2026-03-25T16:37:25-04:00 AArch64: fix MOVK regUsageOfInstr to mark dst as both read and written MOVK (move with keep) modifies only a 16-bit slice of the destination register, so the destination is both read and written. The register allocator must know this to avoid clobbering live values. Update regUsageOfInstr to list the destination in both src and dst sets. No regression test: triggering the misallocation requires specific register pressure around a MOVK sequence, which is difficult to reliably provoke from Haskell source. - - - - - eacbdde9 by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #12002 Closes #12002. - - - - - 0284522c by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #12046 Closes #12046. Co-authored-by: Andreas Klebinger <klebinger.andreas(a)gmx.at> - - - - - 3421f0d0 by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #13180 Closes #13180. - - - - - 42fc7427 by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #11141 Closes #11141. - - - - - 4914e16e by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #11505 Closes #11505. - - - - - 3ba65fb9 by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression perf test for #13820 Closes #13820. - - - - - 14cdb5ef by Simon Jakobi at 2026-03-25T16:37:26-04:00 Add regression test for #10381 Closes #10381. - - - - - fc0fdb99 by Benjamin Maurer at 2026-03-25T16:37:32-04:00 Generate assembly on x86 for word2float (#22252) We used to emit C function call for MO_UF_Conv primitive. Now emits direct assembly instead. Co-Authored-By: Sylvain Henry <sylvain(a)haskus.fr> Co-Authored-By: Claude Sonnet 4.6 <noreply(a)anthropic.com> - - - - - 9ad37b90 by Matthew Pickering at 2026-03-25T16:37:34-04:00 rts: forward clone-stack messages after TSO migration MSG_CLONE_STACK assumed that the target TSO was still owned by the capability that received the message. This is not always true: the TSO can migrate before the inbox entry is handled. When that happened, handleCloneStackMessage could clone a live stack from the wrong capability and use the wrong capability for allocation and performTryPutMVar, leading to stack sanity failures such as checkStackFrame: weird activation record found on stack. Fix this by passing the current capability into handleCloneStackMessage, rechecking msg->tso->cap at handling time, and forwarding the message if the TSO has migrated. Once ownership matches, use the executing capability consistently for cloneStack, rts_apply, and performTryPutMVar. Fixes #27008 - - - - - 2e7fcfc4 by mangoiv at 2026-03-25T16:37:35-04:00 release tracking: adopt release tracking ticket from #16816 - - - - - 84221fc1 by mangoiv at 2026-03-25T16:37:35-04:00 release tracking: add a release tracking ticket Brings the information in the release tracking ticket up to date with https://gitlab.haskell.org/ghc/ghc-hq/-/blob/main/release-management.mkd Resolves #26691 - - - - - 16de84df by Teo Camarasu at 2026-03-25T16:37:37-04:00 Revert "Set default eventlog-flush-interval to 5s" Flushing the eventlog forces a synchronisation of all the capabilities and there was a worry that this might lead to a performance cost for some highly parallel workloads. This reverts commit 66b96e2a591d8e3d60e74af3671344dfe4061cf2. - - - - - c7e85ba3 by Cheng Shao at 2026-03-25T16:37:38-04:00 ghc-boot: move GHC.Data.SmallArray to ghc-boot This commit moves `GHC.Data.SmallArray` from the `ghc` library to `ghc-boot`, so that it can be used by `ghci` as well: - The `Binary` (from `ghc`) instance of `SmallArray` is moved to `GHC.Utils.Binary` - Util functions `replicateSmallArrayIO`, `mapSmallArrayIO`, `mapSmallArrayM_`, `imapSmallArrayM_` , `smallArrayFromList` and `smallArrayToList` are added - The `Show` instance is added - The `Binary` (from `binary`) instance is added - - - - - 4b4999e3 by Cheng Shao at 2026-03-25T16:37:38-04:00 compiler: use `Binary` instance of `BCOByteArray` for bytecode objects This commit defines `Binary` (from `compiler`) instance of `BCOByteArray` which serializes the underlying buffer directly, and uses it directly in bytecode object serialization. Previously we reuse the `Binary` (from `binary`) instance, and this change allows us to avoid double-copying via an intermediate `ByteString` when using `put`/`get` in `binnary`. Also see added comment for explanation. - - - - - 9fb2fe15 by Cheng Shao at 2026-03-25T16:37:38-04:00 ghci: use SmallArray directly in ResolvedBCO This patch makes ghci use `SmallArray` directly in `ResolvedBCO` when applicable, making the memory representation more compact and reducing marshaling overhead. Closes #27058. - - - - - 2c1d9a30 by Wen Kokke at 2026-03-25T16:37:41-04:00 Fix race condition between flushEventLog and start/endEventLogging. This commit changes `flushEventLog` to acquire/release the `state_change` mutex to prevent interleaving with `startEventLogging` and `endEventLogging`. In the current RTS, `flushEventLog` _does not_ acquire this mutex, which may lead to eventlog corruption on the following interleaving: - `startEventLogging` writes the new `EventLogWriter` to `event_log_writer`. - `flushEventLog` flushes some events to `event_log_writer`. - `startEventLogging` writes the eventlog header to `event_log_writer`. This causes the eventlog to be written out in an unreadable state, with one or more events preceding the eventlog header. This commit renames the old function to `flushEventLog_` and defines `flushEventLog` simply as: ```c void flushEventLog(Capability **cap USED_IF_THREADS) { ACQUIRE_LOCK(&state_change_mutex); flushEventLog_(cap); RELEASE_LOCK(&state_change_mutex); } ``` The old function is still needed internally within the compilation unit, where it is used in `endEventLogging` in a context where the `state_change` mutex has already been acquired. I've chosen to mark `flushEventLog_` as static and let other uses of `flushEventLog` within the RTS refer to the new version. There is one use in `hs_init_ghc` via `flushTrace`, where the new locking behaviour should be harmless, and one use in `handle_tick`, which I believe was likely vulnerable to the same race condition, so the new locking behaviour is desirable. I have not added a test. The behaviour is highly non-deterministic and requires a program that concurrently calls `flushEventLog` and `startEventLogging`/`endEventLogging`. I encountered the issue while developing `eventlog-socket` and within that context have verified that my patch likely addresses the issue: a test that used to fail within the first dozen or so runs now has been running on repeat for several hours. - - - - - 8b83825f by Phil Hazelden at 2026-03-25T16:37:42-04:00 Fix build with werror on glibc 2.43. We've been defining `_XOPEN_SOURCE` and `_POSIX_C_SOURCE` to the same values as defined in glibc prior to 2.43. But in 2.43, glibc changes them to new values, which means we get a warning when redefining them. By `#undef`ing them first, we no longer get a warning. Closes #27076. - - - - - f3fe26e8 by Tobias Haslop at 2026-03-25T16:37:47-04:00 Fix broken Haddock link to Bifunctor class in description of Functor class - - - - - 109 changed files: - + .gitlab/issue_templates/release_tracking.md - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/Cmm/Node.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToLlvm.hs - compiler/GHC/CmmToLlvm/Config.hs - compiler/GHC/CmmToLlvm/Mangler.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/ConstantFold.hs - + compiler/GHC/Core/Opt/Range.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Driver/Config/CmmToLlvm.hs - compiler/GHC/Prelude/Basic.hs - compiler/GHC/StgToCmm/Expr.hs - compiler/GHC/StgToCmm/Utils.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Utils/Binary.hs - compiler/ghc.cabal.in - docs/users_guide/9.16.1-notes.rst - compiler/GHC/Data/SmallArray.hs → libraries/ghc-boot/GHC/Data/SmallArray.hs - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs - − libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs-boot - libraries/ghc-internal/src/GHC/Internal/Char.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs - libraries/ghc-internal/src/GHC/Internal/Data/Semigroup/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghc-internal/src/GHC/Internal/Read.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Bits.hs - libraries/ghci/GHCi/CreateBCO.hs - libraries/ghci/GHCi/ResolvedBCO.hs - rts/CloneStack.c - rts/CloneStack.h - rts/Messages.c - rts/RtsFlags.c - rts/StgCRun.c - rts/eventlog/EventLog.c - rts/include/rts/Constants.h - rts/include/rts/PosixSource.h - testsuite/tests/codeGen/should_run/Word2Float32.hs - testsuite/tests/codeGen/should_run/Word2Float32.stdout - testsuite/tests/codeGen/should_run/Word2Float64.hs - testsuite/tests/codeGen/should_run/Word2Float64.stdout - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghci/scripts/ListTuplePunsPpr.stdout - testsuite/tests/ghci/scripts/T10963.stderr - testsuite/tests/ghci/scripts/ghci064.stdout - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - + testsuite/tests/parser/should_compile/T12002.hs - + testsuite/tests/parser/should_compile/T12002.stderr - testsuite/tests/parser/should_compile/all.T - + testsuite/tests/perf/compiler/T13820.hs - testsuite/tests/perf/compiler/all.T - + testsuite/tests/rebindable/T10381.hs - testsuite/tests/rebindable/all.T - testsuite/tests/rts/all.T - + testsuite/tests/rts/cloneThreadStackMigrating.hs - + testsuite/tests/simd/should_run/StackAlignment32.hs - + testsuite/tests/simd/should_run/StackAlignment32.stdout - + testsuite/tests/simd/should_run/StackAlignment32_main.c - + testsuite/tests/simd/should_run/StackAlignment64.hs - + testsuite/tests/simd/should_run/StackAlignment64.stdout - + testsuite/tests/simd/should_run/StackAlignment64_main.c - testsuite/tests/simd/should_run/all.T - + testsuite/tests/simplCore/should_compile/T19166.hs - + testsuite/tests/simplCore/should_compile/T19166.stderr - + testsuite/tests/simplCore/should_compile/T25718.hs - + testsuite/tests/simplCore/should_compile/T25718.stderr - + testsuite/tests/simplCore/should_compile/T25718a.hs - + testsuite/tests/simplCore/should_compile/T25718a.stderr - + testsuite/tests/simplCore/should_compile/T25718b.hs - + testsuite/tests/simplCore/should_compile/T25718b.stderr - + testsuite/tests/simplCore/should_compile/T25718c.hs - + testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-32 - + testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-64 - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/typecheck/T13180/T13180.hs - + testsuite/tests/typecheck/T13180/T13180.hs-boot - + testsuite/tests/typecheck/T13180/T13180.stderr - + testsuite/tests/typecheck/T13180/T13180A.hs - + testsuite/tests/typecheck/T13180/all.T - + testsuite/tests/typecheck/should_compile/T11141.hs - + testsuite/tests/typecheck/should_compile/T11141.stderr - + testsuite/tests/typecheck/should_compile/T11505Bar.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs-boot - + testsuite/tests/typecheck/should_compile/T12046.hs - testsuite/tests/typecheck/should_compile/T26225.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T26823.hs - + testsuite/tests/typecheck/should_fail/T26823.stderr - testsuite/tests/typecheck/should_fail/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dab85a9a2788d6bca120781cac8704… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dab85a9a2788d6bca120781cac8704… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/supersven/correctly_propagate_host-build-target] Revert "Only add flags if they are new"
by Sven Tennie (＠supersven) 26 Mar '26

26 Mar '26

Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC Commits: f93c3056 by Sven Tennie at 2026-03-25T19:45:50+01:00 Revert "Only add flags if they are new" This reverts commit 312deb98d69a80a3b1183188c92bf83c86644021. - - - - - 2 changed files: - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs Changes: ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs ===================================== @@ -61,7 +61,7 @@ findHsCpp progOpt cc = checking "for Haskell C preprocessor" $ do let rawHsCppProgram = addFlagIfNew "-E" foundHsCppProg -- Always try to add the Haskell-specific CPP flags, regardless of the user options hppArgs <- findHsCppArgs rawHsCppProgram - let hsCppProgram = foldr addFlagIfNew rawHsCppProgram (reverse hppArgs) + let hsCppProgram = over _prgFlags (++hppArgs) rawHsCppProgram return HsCpp{hsCppProgram} -- | Given a C preprocessor, figure out how it should be invoked to preprocess ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs ===================================== @@ -345,30 +345,30 @@ addPlatformDepLinkFlags archOs cc ccLink0 = do -- -- On OpenSolaris uses gnu ld whereas SmartOS appears to use the Solaris -- implementation, which rather uses the -64 flag. - return $ addFlagIfNew "-m64" ccLink2 + return $ ccLink2 & _prgFlags %++ "-m64" ArchOS ArchAlpha _ -> -- For now, to suppress the gcc warning "call-clobbered -- register used for global register variable", we simply -- disable all warnings altogether using the -w flag. Oh well. - return $ foldr addFlagIfNew ccLink2 (reverse ["-w","-mieee","-D_REENTRANT"]) + return $ ccLink2 & over _prgFlags (++["-w","-mieee","-D_REENTRANT"]) -- ArchOS ArchHPPA? _ -> ArchOS ArchARM{} OSFreeBSD -> -- On arm/freebsd, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 + return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" ArchOS ArchARM{} OSLinux -> -- On arm/linux and arm/android, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 + return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" ArchOS ArchAArch64 OSFreeBSD -> - return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 + return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" ArchOS ArchAArch64 OSLinux -> - return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 + return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" ArchOS ArchAArch64 OSNetBSD -> - return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 + return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" ArchOS ArchPPC OSAIX -> -- We need `-D_THREAD_SAFE` to unlock the thread-local `errno`. - return $ foldr addFlagIfNew ccLink2 (reverse ["-D_THREAD_SAFE","-Wl,-bnotextro"]) + return $ ccLink2 & over _prgFlags (++["-D_THREAD_SAFE","-Wl,-bnotextro"]) _ -> return ccLink2 @@ -383,7 +383,7 @@ addOSMinGW32CcFlags archOs cc link -- See Note [Windows stack allocations]. checkFStackCheck :: Cc -> Program -> M Program checkFStackCheck cc link = checking "that -fstack-check works" $ do - let link' = addFlagIfNew "-fstack-check" link + let link' = link & _prgFlags %++ "-fstack-check" checkLinkWorks cc link' return link' @@ -393,7 +393,7 @@ addNoAsNeeded archOs cc ccLink | os <- archOS_OS archOs , osElfTarget os = checking "that --no-as-needed works" $ do - let ccLink' = addFlagIfNew "-Wl,--no-as-needed" ccLink + let ccLink' = over _prgFlags (++["-Wl,--no-as-needed"]) ccLink checkLinkWorks cc ccLink' return ccLink' | otherwise = return ccLink View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f93c3056a1f46874a501915e05cbcc1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f93c3056a1f46874a501915e05cbcc1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/linker_fix] 4 commits: Add debug tracing things.
by Andreas Klebinger (＠AndreasK) 26 Mar '26

26 Mar '26

Andreas Klebinger pushed to branch wip/andreask/linker_fix at Glasgow Haskell Compiler / GHC Commits: 25e881a4 by Andreas Klebinger at 2026-03-25T08:38:33+00:00 Add debug tracing things. - - - - - b262ea83 by Andreas Klebinger at 2026-03-25T08:38:53+00:00 check for mac sections - - - - - c76691b7 by Andreas Klebinger at 2026-03-25T09:14:11+00:00 Make invalid machO entries a failure condition for now. - - - - - bbb9a677 by Andreas Klebinger at 2026-03-25T17:58:07+00:00 Rip out old macOS misalignment code. Best I can tell it is no longer needed as we now *always* align individual sections. The handling was already very inconsistent with very few code paths actually doing this alignment. So I'm letting it go and will see if anything falls over. - - - - - 7 changed files: - rts/Linker.c - rts/LinkerInternals.h - rts/linker/LoadArchive.c - rts/linker/LoadNativeObjPosix.c - rts/linker/MachO.c - rts/linker/MachO.h - rts/linker/SymbolExtras.c Changes: ===================================== rts/Linker.c ===================================== @@ -1240,7 +1240,7 @@ void freeObjectCode (ObjectCode *oc) ObjectCode* mkOc( ObjectType type, pathchar *path, char *image, int imageSize, - bool mapped, pathchar *archiveMemberName, int misalignment ) { + bool mapped, pathchar *archiveMemberName ) { ObjectCode* oc; @@ -1294,7 +1294,6 @@ mkOc( ObjectType type, pathchar *path, char *image, int imageSize, oc->bssEnd = NULL; oc->imageMapped = mapped; - oc->misalignment = misalignment; oc->cxa_finalize = NULL; oc->extraInfos = NULL; @@ -1352,7 +1351,6 @@ preloadObjectFile (pathchar *path) int r; void *image; ObjectCode *oc; - int misalignment = 0; r = pathstat(path, &st); if (r == -1) { @@ -1410,29 +1408,8 @@ preloadObjectFile (pathchar *path) return NULL; } -# if defined(darwin_HOST_OS) - - // In a Mach-O .o file, all sections can and will be misaligned - // if the total size of the headers is not a multiple of the - // desired alignment. This is fine for .o files that only serve - // as input for the static linker, but it's not fine for us, - // as SSE (used by gcc for floating point) and Altivec require - // 16-byte alignment. - // We calculate the correct alignment from the header before - // reading the file, and then we misalign image on purpose so - // that the actual sections end up aligned again. - machoGetMisalignment(f, &misalignment); - //machoGetMisalignment might fail to parse the header, but in that - //case so will verifyAndInitOc so we leave cleanup to after verifyAndInitOc. - image = stgMallocBytes(fileSize + misalignment, "loadObj(image)"); - image += misalignment; - -# else /* !defined(darwin_HOST_OS) */ - image = stgMallocBytes(fileSize, "loadObj(image)"); -#endif /* !defined(darwin_HOST_OS) */ - int n; n = fread ( image, 1, fileSize, f ); fclose(f); @@ -1447,9 +1424,10 @@ preloadObjectFile (pathchar *path) IF_DEBUG(linker, debugBelch("loadObj: preloaded image at %p\n", (void *) image)); /* FIXME (AP): =mapped= parameter unconditionally set to true */ - oc = mkOc(STATIC_OBJECT, path, image, fileSize, true, NULL, misalignment); + oc = mkOc(STATIC_OBJECT, path, image, fileSize, true, NULL); if (!verifyAndInitOc(oc)) { + freePreloadObjectFile(oc); freeObjectCode(oc); debugBelch("loadObj: Failed to verify oc.\n"); return NULL; @@ -1510,7 +1488,7 @@ HsInt loadObj (pathchar *path) return r; } -// Call the relevant VeriffyImage_* and ocInit_* functions. +// Call the relevant VerifyImage_* and ocInit_* functions. // Return 1 on success. HsInt verifyAndInitOc (ObjectCode* oc) { @@ -1536,6 +1514,7 @@ HsInt verifyAndInitOc (ObjectCode* oc) #endif if (!r) { IF_DEBUG(linker, ocDebugBelch(oc, "ocVerifyImage_* failed\n")); + ocDebugBelch(oc, "ocVerifyImage_* failed\n"); return r; } return 1; @@ -1571,6 +1550,7 @@ HsInt loadOc (ObjectCode* oc) if (!r) { IF_DEBUG(linker, ocDebugBelch(oc, "ocAllocateExtras_MachO failed\n")); + ocDebugBelch(oc, "ocAllocateExtras_MachO failed\n"); return r; } # elif defined(OBJFORMAT_ELF) @@ -1595,6 +1575,7 @@ HsInt loadOc (ObjectCode* oc) # endif if (!r) { IF_DEBUG(linker, ocDebugBelch(oc, "ocGetNames_* failed\n")); + ocDebugBelch(oc, "ocGetNames_* failed\n"); return r; } ===================================== rts/LinkerInternals.h ===================================== @@ -264,10 +264,6 @@ struct _ObjectCode { /* non-zero if the object file was mmap'd, otherwise malloc'd */ int imageMapped; - /* record by how much image has been deliberately misaligned - after allocation, so that we can use realloc */ - int misalignment; - /* The address of __cxa_finalize; set when at least one finalizer was * register and therefore we must call __cxa_finalize before unloading. * See Note [Resolving __dso_handle]. */ @@ -385,7 +381,7 @@ extern Elf_Word shndx_table_uninit_label; ) #define ocDebugBelch(oc, s, ...) \ - debugBelch("%s(%" PATH_FMT ": " s, \ + errorBelch("%s(%" PATH_FMT ": " s, \ __func__, \ OC_INFORMATIVE_FILENAME(oc), \ ##__VA_ARGS__) @@ -494,8 +490,7 @@ HsInt verifyAndInitOc( ObjectCode *oc ); //Expects the oc to be verified already. HsInt loadOc( ObjectCode* oc ); ObjectCode* mkOc( ObjectType type, pathchar *path, char *image, int imageSize, - bool mapped, pathchar *archiveMemberName, - int misalignment + bool mapped, pathchar *archiveMemberName ); ===================================== rts/linker/LoadArchive.c ===================================== @@ -26,6 +26,7 @@ #include <ctype.h> #include <sys/types.h> #include <fs_rts.h> +#include <stdio.h> #define FAIL(...) do {\ errorBelch("loadArchive: "__VA_ARGS__); \ @@ -33,6 +34,7 @@ } while (0) #define DEBUG_LOG(...) IF_DEBUG(linker, debugBelch("loadArchive: " __VA_ARGS__)) +#define DEBUG_LOG_ALWAYS(...) (fprintf(stderr, "loadArchive: " __VA_ARGS__)) #if defined(darwin_HOST_OS) || defined(ios_HOST_OS) @@ -111,11 +113,8 @@ static bool loadFatArchive(char input[static 20], FILE* f, pathchar* path) } #endif -static bool readThinArchiveMember(int memberSize, pathchar* path, - char* fileName, char* image) +static pathchar* thinArchiveMemberPath(pathchar* path, char* fileName) { - bool has_succeeded = false; - FILE* member = NULL; pathchar *pathCopy, *dirName, *memberPath, *objFileName; memberPath = NULL; /* Allocate and setup the dirname of the archive. We'll need @@ -129,8 +128,22 @@ static bool readThinArchiveMember(int memberSize, pathchar* path, objFileName = mkPath(fileName); pathprintf(memberPath, memberLen, WSTR("%" PATH_FMT "%" PATH_FMT), dirName, objFileName); - stgFree(objFileName); + + stgFree(pathCopy); stgFree(dirName); + stgFree(objFileName); + return memberPath; +} + +static bool readThinArchiveMember(int memberSize, pathchar* path, + char* fileName, char* image) +{ + bool has_succeeded = false; + FILE* member = NULL; + pathchar *memberPath; + //Fully resolved path. + memberPath = thinArchiveMemberPath(path, fileName); + member = pathopen(memberPath, WSTR("rb")); if (!member) { errorBelch("loadObj: can't read thin archive `%" PATH_FMT "'", @@ -148,7 +161,6 @@ static bool readThinArchiveMember(int memberSize, pathchar* path, inner_fail: fclose(member); stgFree(memberPath); - stgFree(pathCopy); return has_succeeded; } @@ -335,7 +347,7 @@ HsInt loadArchive_ (pathchar *path) int memberIdx = 0; FILE *f = NULL; size_t thisFileNameSize = (size_t) -1; /* shut up bogus GCC warning */ - int misalignment = 0; + int macho_misalignment = 0; DEBUG_LOG("start\n"); DEBUG_LOG("Loading archive `%" PATH_FMT "'\n", path); @@ -344,7 +356,7 @@ HsInt loadArchive_ (pathchar *path) Ignore requests to load multiple times */ if (isAlreadyLoaded(path)) { IF_DEBUG(linker, - debugBelch("ignoring repeated load of %" PATH_FMT "\n", path)); + DEBUG_LOG("ignoring repeated load of %" PATH_FMT "\n", path)); return 1; /* success */ } @@ -365,6 +377,7 @@ HsInt loadArchive_ (pathchar *path) bool isThin = archive_fmt == ThinArchive; if(isThin) { DEBUG_LOG("Found thin archive.\n"); + DEBUG_LOG_ALWAYS("Found thin archive.\n"); } DEBUG_LOG("loading archive contents\n"); @@ -507,6 +520,17 @@ HsInt loadArchive_ (pathchar *path) DEBUG_LOG("Found member file `%s'\n", fileName); bool is_symbol_table = strcmp("", fileName) == 0; +#if defined(OBJFORMAT_MACHO) + if (!is_symbol_table) { + /* Darwin ranlib symbol tables are named __.SYMDEF* */ + if (strncmp(fileName, "__.SYMDEF", sizeof("__.SYMDEF")) == 0 || + strncmp(fileName, "__.SYMDEF SORTED", sizeof("__.SYMDEF SORTED")) == 0 || + strncmp(fileName, "__.SYMDEF_64", sizeof("__.SYMDEF_64")) == 0 || + strncmp(fileName, "__.SYMDEF_64 SORTED", sizeof("__.SYMDEF_64 SORTED")) == 0) { + is_symbol_table = true; + } + } +#endif ///////////////////////////////////////////////// // We found the member file. Load it into memory. @@ -571,27 +595,21 @@ HsInt loadArchive_ (pathchar *path) #endif ) { + ASSERT(!isGnuIndex); DEBUG_LOG("Member might be an object file...loading...\n"); #if defined(darwin_HOST_OS) || defined(ios_HOST_OS) - if (RTS_LINKER_USE_MMAP) - image = mmapAnonForLinker(memberSize); - else { - /* See loadObj() */ - if(!machoGetMisalignment(f, &misalignment)) { - DEBUG_LOG("Failed to load member as mach-o file. Skipping.\n"); - continue; - } - image = stgMallocBytes(memberSize + misalignment, - "loadArchive(image)"); - image += misalignment; - } +#if defined(RTS_LINKER_USE_MMAP) + image = mmapAnonForLinker(memberSize); +#else +#error "Only MMAP based loading supported on Apple platforms" +#endif // defined(RTS_LINKER_USE_MMAP) #else // not darwin image = stgMallocBytes(memberSize, "loadArchive(image)"); #endif if (isThin) { if (!readThinArchiveMember(memberSize, path, fileName, image)) { - goto fail; + FAIL("Failed to read thin member %" PATH_FMT"\n", path); } } else @@ -616,20 +634,23 @@ HsInt loadArchive_ (pathchar *path) /////////////////////////////////////////////////////////////// // Prepare headers, doesn't load any data yet. - ObjectCode *oc = mkOc(STATIC_OBJECT, path, image, memberSize, false, archiveMemberName, - misalignment); + ObjectCode *oc = mkOc(STATIC_OBJECT, path, image, memberSize, false, archiveMemberName); stgFree(archiveMemberName); if(!verifyAndInitOc( oc )) { - freeObjectCode( oc ); IF_DEBUG(linker, ocDebugBelch(oc, "Faild to verify ... skipping.")); + errorBelch("Faild to verify ... skipping."); + freeObjectCode( oc ); + //TODO: Unmap or free image continue; } if (0 == loadOc(oc)) { + errorBelch("Failed to load OC %" PATH_FMT " , aborting.\n", path); stgFree(fileName); + freeObjectCode( oc ); fclose(f); return 0; } else { @@ -744,4 +765,3 @@ bool isArchive (pathchar *path) } return strncmp(ARCHIVE_HEADER, buffer, sizeof(ARCHIVE_HEADER)-1) == 0; } - ===================================== rts/linker/LoadNativeObjPosix.c ===================================== @@ -134,7 +134,7 @@ void * loadNativeObj_POSIX (pathchar *path, char **errmsg) goto dlopen_fail; } - nc = mkOc(DYNAMIC_OBJECT, path, NULL, 0, false, NULL, 0); + nc = mkOc(DYNAMIC_OBJECT, path, NULL, 0, false, NULL); // If we HAVE_DLINFO, we use RTLD_NOW rather than RTLD_LAZY because we want // to learn eagerly about all external functions. Otherwise, there is no ===================================== rts/linker/MachO.c ===================================== @@ -1,4 +1,5 @@ #include "Rts.h" +#include "rts/Linker.h" #if defined(darwin_HOST_OS) || defined(ios_HOST_OS) @@ -200,6 +201,10 @@ int ocVerifyImage_MachO(ObjectCode * oc) { char *image = (char*) oc->image; + if (oc->fileSize < (int) sizeof(MachOHeader)) { + errorBelch("Tried loading machO smaller than header size.\n"); + return 0; + } MachOHeader *header = (MachOHeader*) image; IF_DEBUG(linker, debugBelch("ocVerifyImage_MachO: start\n")); @@ -1774,44 +1779,4 @@ ocRunFini_MachO ( ObjectCode *oc ) return 1; } -/* - * Figure out by how much to shift the entire Mach-O file in memory - * when loading so that its single segment ends up 16-byte-aligned - * - * Returns 1 and sets misalignment_out to the detected misalignment if - * we successfully parsed the file. - * - * If we can't parse the file we set misalignment_out to 0 and return 0 - */ -int -machoGetMisalignment( FILE * f, int* misalignment_out ) -{ - MachOHeader header; - int misalignment; - *misalignment_out = 0; - - { - size_t n = fread(&header, sizeof(header), 1, f); - if (n != 1) { - debugBelch("machoGetMisalignment: can't read the Mach-O header"); - return 0; - } - } - fseek(f, -sizeof(header), SEEK_CUR); - - if(header.magic != MH_MAGIC_64) { - debugBelch("Bad magic. Expected: %08x, got: %08x.", - MH_MAGIC_64, header.magic); - return 0; - } - - misalignment = (header.sizeofcmds + sizeof(header)) - & 0xF; - - IF_DEBUG(linker, debugBelch("mach-o misalignment %d\n", misalignment)); - misalignment = misalignment ? (16 - misalignment) : 0; - *misalignment_out = misalignment; - return 1; -} - #endif /* darwin_HOST_OS || ios_HOST_OS */ ===================================== rts/linker/MachO.h ===================================== @@ -13,7 +13,6 @@ int ocGetNames_MachO ( ObjectCode* oc ); int ocResolve_MachO ( ObjectCode* oc ); int ocRunInit_MachO ( ObjectCode* oc ); int ocRunFini_MachO ( ObjectCode* oc ); -int machoGetMisalignment ( FILE *, int* ); int ocAllocateExtras_MachO ( ObjectCode* oc ); SectionKind getSectionKind_MachO ( MachOSection *macho ); ===================================== rts/linker/SymbolExtras.c ===================================== @@ -63,14 +63,10 @@ int ocAllocateExtras(ObjectCode* oc, int count, int first, int bssSize) // round up to the nearest 4 int aligned = (oc->fileSize + 3) & ~3; - int misalignment = oc->misalignment; - oc->image -= misalignment; oc->image = stgReallocBytes( oc->image, - misalignment + aligned + extras_size, "ocAllocateExtras" ); - oc->image += misalignment; oc->symbol_extras = (SymbolExtra *) (oc->image + aligned); } else if (USE_CONTIGUOUS_MMAP || RtsFlags.MiscFlags.linkerAlwaysPic) { View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fbef162a39d46295fea24cd6c3b1eb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fbef162a39d46295fea24cd6c3b1eb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 23 commits: Check that shift values are valid
by Marge Bot (＠marge-bot) 26 Mar '26

26 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 9c893d01 by Sylvain Henry at 2026-03-25T12:44:19-04:00 Check that shift values are valid In GHC's codebase in non-DEBUG builds we silently substitute shiftL/R with unsafeShiftL/R for performance reasons. However we were not checking that the shift value was valid for unsafeShiftL/R, leading to wrong computations, but only in non-DEBUG builds. This patch adds the necessary checks and reports an error when a wrong shift value is passed. - - - - - 2d066cc7 by Sylvain Henry at 2026-03-25T12:44:19-04:00 Implement basic value range analysis (#25718) Perform basic value range analysis to try to determine at compile time the result of the application of some comparison primops (ltWord#, etc.). This subsumes the built-in rewrite rules used previously to check if one of the comparison argument was a bound (e.g. (x :: Word8) <= 255 is always True). Our analysis is more powerful and handles type conversions: e.g. word8ToWord x <= 255 is now detected as always True too. We also use value range analysis to filter unreachable alternatives in case-expressions. To support this, we had to allow case-expressions for primitive types to not have a DEFAULT alternative (as was assumed before and checked in Core lint). - - - - - 24a785ad by ARATA Mizuki at 2026-03-25T12:44:23-04:00 rts: Align stack to 64-byte boundary in StgRun on x86 When LLVM spills AVX/AVX-512 vector registers to the stack, it requires 32-byte (__m256) or 64-byte (__m512) alignment. If the stack is not sufficiently aligned, LLVM inserts a realignment prologue that reserves %rbp as a frame pointer, conflicting with GHC's use of %rbp as an STG callee-saved register and breaking the tail-call-based calling convention. Previously, GHC worked around this by lying to LLVM about the stack alignment and rewriting aligned vector loads/stores (VMOVDQA, VMOVAPS) to unaligned ones (VMOVDQU, VMOVUPS) in the LLVM Mangler. This had two problems: - It did not extend to AVX-512, which requires 64-byte alignment. (#26595) - When Haskell calls a C function that takes __m256/__m512 arguments on the stack, the callee requires genuine alignment, which could cause a segfault. (#26822) This patch genuinely aligns the stack to 64 bytes in StgRun by saving the original stack pointer before alignment and restoring it in StgReturn. We now unconditionally advertise 64-byte stack alignment to LLVM for all x86 targets, making rewriteAVX in the LLVM Mangler unnecessary. STG_RUN_STACK_FRAME_SIZE is increased from 48 to 56 bytes on non-Windows x86-64 to store the saved stack pointer. Closes #26595 and #26822 Co-Authored-By: Claude Opus 4.5 <noreply(a)anthropic.com> - - - - - 24d83e24 by Teo Camarasu at 2026-03-25T12:44:24-04:00 ghc-internal: Float Generics to near top of module graph We remove GHC.Internal.Generics from the critical path of the `ghc-internal` module graph. GHC.Internal.Generics used to be in the middle of the module graph, but now it is nearer the top (built later). This change thins out the module graph and allows us to get rid of the ByteOrder hs-boot file. We implement this by moving Generics instances from the module where the datatype is defined to the GHC.Internal.Generics module. This trades off increasing the compiled size of GHC.Internal.Generics with reducing the dependency footprint of datatype modules. Not all instances are moved to GHC.Internal.Generics. For instance, `GHC.Internal.Control.Monad.Fix` keeps its instance as it is one of the very last modules compiled in `ghc-internal` and so inverting the relationship here would risk adding GHC.Internal.Generics back onto the critical path. We also don't change modules that are re-exported from the `template-haskell` or `ghc-heap`. This is done to make it easy to eventually move `Generics` to `base` once something like #26657 is implemented. Resolves #26930 Metric Decrease: T21839c - - - - - 8f64bb3e by sheaf at 2026-03-25T12:44:41-04:00 Avoid infinite loop in deep subsumption This commit ensures we only unify after we recur in the deep subsumption code in the FunTy vs non-FunTy case of GHC.Tc.Utils.Unify.tc_sub_type_deep, to avoid falling into an infinite loop. See the new Wrinkle [Avoiding a loop in tc_sub_type_deep] in Note [FunTy vs non-FunTy case in tc_sub_type_deep] in GHC.Tc.Utils.Unify. Fixes #26823 Co-authored-by: simonpj <simon.peytonjones(a)gmail.com> - - - - - e9a15fe5 by Ian Duncan at 2026-03-25T12:44:45-04:00 AArch64: fix MOVK regUsageOfInstr to mark dst as both read and written MOVK (move with keep) modifies only a 16-bit slice of the destination register, so the destination is both read and written. The register allocator must know this to avoid clobbering live values. Update regUsageOfInstr to list the destination in both src and dst sets. No regression test: triggering the misallocation requires specific register pressure around a MOVK sequence, which is difficult to reliably provoke from Haskell source. - - - - - 3d069672 by Simon Jakobi at 2026-03-25T12:44:45-04:00 Add regression test for #12002 Closes #12002. - - - - - 3a415e32 by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression test for #12046 Closes #12046. Co-authored-by: Andreas Klebinger <klebinger.andreas(a)gmx.at> - - - - - d09855b5 by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression test for #13180 Closes #13180. - - - - - f68cf1ab by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression test for #11141 Closes #11141. - - - - - 2512a033 by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression test for #11505 Closes #11505. - - - - - be367209 by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression perf test for #13820 Closes #13820. - - - - - bde1a9a3 by Simon Jakobi at 2026-03-25T12:44:46-04:00 Add regression test for #10381 Closes #10381. - - - - - d6877173 by Matthew Pickering at 2026-03-25T12:44:47-04:00 rts: forward clone-stack messages after TSO migration MSG_CLONE_STACK assumed that the target TSO was still owned by the capability that received the message. This is not always true: the TSO can migrate before the inbox entry is handled. When that happened, handleCloneStackMessage could clone a live stack from the wrong capability and use the wrong capability for allocation and performTryPutMVar, leading to stack sanity failures such as checkStackFrame: weird activation record found on stack. Fix this by passing the current capability into handleCloneStackMessage, rechecking msg->tso->cap at handling time, and forwarding the message if the TSO has migrated. Once ownership matches, use the executing capability consistently for cloneStack, rts_apply, and performTryPutMVar. Fixes #27008 - - - - - a8795d04 by fendor at 2026-03-25T12:44:49-04:00 Extract Binary instances to `GHC.ByteCode.Binary` - - - - - b5f55256 by fendor at 2026-03-25T12:44:49-04:00 Add `seqNonEmpty` for evaluating `NonEmpty a` - - - - - be29dad6 by fendor at 2026-03-25T12:44:49-04:00 Record `LinkableUsage` instead of `Linkable` in `LoaderState` Retaining a ByteCode `Linkable` after it has been loaded retains its `UnlinkedBCO`, keeping it alive for the remainder of the program. This starts accumulating a lot of `UnlinkedBCO` and memory over time. However, the `Linkable` is merely used to later record its usage in `mkObjectUsage`, which is used for recompilation checking. However, this is incorrect, as the interface file and bytecode objects could be in different states, e.g. the interface changes, but the bytecode library hasn't changed so we don't need to recompile and vice versa. By computing a `Fingerprint` for the `ModuleByteCode`, and recording it in the `LinkableUsage`, we know precisely whether the `ByteCode` object on disk is outdated. Thus, parts of this commit just makes sure that we efficiently compute a `Fingerprint` for `ModuleByteCode` and store it in the on-disk representation of `ModuleByteCode`. We change the `LoaderState` to retain `LinkableUsage`, which is smaller representation of a `Linkable`. This allows us to free the unneeded fields of `Linkable` after linking them. We declare the following memory invariants that this commit implements: * No `LinkablePart` should be retained from `LoaderState`. * `Linkable`s should be unloaded after they have been loaded. These invariants are unfortunately tricky to automatically uphold, so we are simply documenting our assumptions for now. We introduce the `linkable-space` test which makes sure that after loading, no `DotGBC` or `UnlinkedBCO` is retained. ------------------------- Metric Increase: MultiLayerModulesTH_OneShot ------------------------- We allocate a bit more, but the peak number of bytes doesn't change. While a bit unfortunate, accepting the metric increase. We add multiple new performance measurements where we were able to observe the desired memory invariants. Further, we add regression tests to validate that the recompilation checker behaves more correct than before. - - - - - 92a183e5 by mangoiv at 2026-03-25T12:44:50-04:00 release tracking: adopt release tracking ticket from #16816 - - - - - 676b5fa6 by mangoiv at 2026-03-25T12:44:50-04:00 release tracking: add a release tracking ticket Brings the information in the release tracking ticket up to date with https://gitlab.haskell.org/ghc/ghc-hq/-/blob/main/release-management.mkd Resolves #26691 - - - - - 4f97c2c5 by Teo Camarasu at 2026-03-25T12:44:51-04:00 Revert "Set default eventlog-flush-interval to 5s" Flushing the eventlog forces a synchronisation of all the capabilities and there was a worry that this might lead to a performance cost for some highly parallel workloads. This reverts commit 66b96e2a591d8e3d60e74af3671344dfe4061cf2. - - - - - 17aad2d5 by Wen Kokke at 2026-03-25T12:44:56-04:00 Fix race condition between flushEventLog and start/endEventLogging. This commit changes `flushEventLog` to acquire/release the `state_change` mutex to prevent interleaving with `startEventLogging` and `endEventLogging`. In the current RTS, `flushEventLog` _does not_ acquire this mutex, which may lead to eventlog corruption on the following interleaving: - `startEventLogging` writes the new `EventLogWriter` to `event_log_writer`. - `flushEventLog` flushes some events to `event_log_writer`. - `startEventLogging` writes the eventlog header to `event_log_writer`. This causes the eventlog to be written out in an unreadable state, with one or more events preceding the eventlog header. This commit renames the old function to `flushEventLog_` and defines `flushEventLog` simply as: ```c void flushEventLog(Capability **cap USED_IF_THREADS) { ACQUIRE_LOCK(&state_change_mutex); flushEventLog_(cap); RELEASE_LOCK(&state_change_mutex); } ``` The old function is still needed internally within the compilation unit, where it is used in `endEventLogging` in a context where the `state_change` mutex has already been acquired. I've chosen to mark `flushEventLog_` as static and let other uses of `flushEventLog` within the RTS refer to the new version. There is one use in `hs_init_ghc` via `flushTrace`, where the new locking behaviour should be harmless, and one use in `handle_tick`, which I believe was likely vulnerable to the same race condition, so the new locking behaviour is desirable. I have not added a test. The behaviour is highly non-deterministic and requires a program that concurrently calls `flushEventLog` and `startEventLogging`/`endEventLogging`. I encountered the issue while developing `eventlog-socket` and within that context have verified that my patch likely addresses the issue: a test that used to fail within the first dozen or so runs now has been running on repeat for several hours. - - - - - 9a4c68ee by Phil Hazelden at 2026-03-25T12:44:57-04:00 Fix build with werror on glibc 2.43. We've been defining `_XOPEN_SOURCE` and `_POSIX_C_SOURCE` to the same values as defined in glibc prior to 2.43. But in 2.43, glibc changes them to new values, which means we get a warning when redefining them. By `#undef`ing them first, we no longer get a warning. Closes #27076. - - - - - dab85a9a by Tobias Haslop at 2026-03-25T12:45:02-04:00 Fix broken Haddock link to Bifunctor class in description of Functor class - - - - - 136 changed files: - + .gitlab/issue_templates/release_tracking.md - + compiler/GHC/ByteCode/Binary.hs - + compiler/GHC/ByteCode/Recomp/Binary.hs - compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToLlvm.hs - compiler/GHC/CmmToLlvm/Config.hs - compiler/GHC/CmmToLlvm/Mangler.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/ConstantFold.hs - + compiler/GHC/Core/Opt/Range.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Driver/Config/CmmToLlvm.hs - compiler/GHC/Driver/Hooks.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Plugins.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Iface/Recomp/Types.hs - compiler/GHC/Linker/ByteCode.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Prelude/Basic.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/StgToCmm/Expr.hs - compiler/GHC/StgToCmm/Utils.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Unit/Home/ModInfo.hs - compiler/GHC/Unit/Module/Deps.hs - compiler/GHC/Unit/Module/Status.hs - compiler/GHC/Utils/Misc.hs - compiler/ghc.cabal.in - docs/users_guide/9.16.1-notes.rst - ghc/GHCi/Leak.hs - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs - − libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs-boot - libraries/ghc-internal/src/GHC/Internal/Char.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs - libraries/ghc-internal/src/GHC/Internal/Data/Semigroup/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghc-internal/src/GHC/Internal/Read.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Bits.hs - rts/CloneStack.c - rts/CloneStack.h - rts/Messages.c - rts/RtsFlags.c - rts/StgCRun.c - rts/eventlog/EventLog.c - rts/include/rts/Constants.h - rts/include/rts/PosixSource.h - + testsuite/tests/bytecode/TLinkable/BCOTemplate.hs - + testsuite/tests/bytecode/TLinkable/LinkableUsage01.stderr - + testsuite/tests/bytecode/TLinkable/LinkableUsage02.stderr - + testsuite/tests/bytecode/TLinkable/Makefile - + testsuite/tests/bytecode/TLinkable/all.T - + testsuite/tests/bytecode/TLinkable/genLinkables.sh - + testsuite/tests/bytecode/TLinkable/linkable-space.hs - + testsuite/tests/bytecode/TLinkable/linkable-space.stdout - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/driver/multipleHomeUnits/multipleHomeUnits_recomp_th.stdout - + testsuite/tests/driver/recomp022/A1.hs - + testsuite/tests/driver/recomp022/A2.hs - + testsuite/tests/driver/recomp022/A3.hs - + testsuite/tests/driver/recomp022/B.hs - + testsuite/tests/driver/recomp022/C.hs - + testsuite/tests/driver/recomp022/Makefile - + testsuite/tests/driver/recomp022/all.T - + testsuite/tests/driver/recomp022/recomp022a.stdout - + testsuite/tests/driver/recomp022/recomp022b.stdout - testsuite/tests/ghci/scripts/ListTuplePunsPpr.stdout - testsuite/tests/ghci/scripts/T10963.stderr - testsuite/tests/ghci/scripts/ghci064.stdout - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - + testsuite/tests/parser/should_compile/T12002.hs - + testsuite/tests/parser/should_compile/T12002.stderr - testsuite/tests/parser/should_compile/all.T - + testsuite/tests/perf/compiler/T13820.hs - testsuite/tests/perf/compiler/all.T - + testsuite/tests/rebindable/T10381.hs - testsuite/tests/rebindable/all.T - testsuite/tests/rts/all.T - + testsuite/tests/rts/cloneThreadStackMigrating.hs - + testsuite/tests/simd/should_run/StackAlignment32.hs - + testsuite/tests/simd/should_run/StackAlignment32.stdout - + testsuite/tests/simd/should_run/StackAlignment32_main.c - + testsuite/tests/simd/should_run/StackAlignment64.hs - + testsuite/tests/simd/should_run/StackAlignment64.stdout - + testsuite/tests/simd/should_run/StackAlignment64_main.c - testsuite/tests/simd/should_run/all.T - + testsuite/tests/simplCore/should_compile/T19166.hs - + testsuite/tests/simplCore/should_compile/T19166.stderr - + testsuite/tests/simplCore/should_compile/T25718.hs - + testsuite/tests/simplCore/should_compile/T25718.stderr - + testsuite/tests/simplCore/should_compile/T25718a.hs - + testsuite/tests/simplCore/should_compile/T25718a.stderr - + testsuite/tests/simplCore/should_compile/T25718b.hs - + testsuite/tests/simplCore/should_compile/T25718b.stderr - + testsuite/tests/simplCore/should_compile/T25718c.hs - + testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-32 - + testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-64 - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/typecheck/T13180/T13180.hs - + testsuite/tests/typecheck/T13180/T13180.hs-boot - + testsuite/tests/typecheck/T13180/T13180.stderr - + testsuite/tests/typecheck/T13180/T13180A.hs - + testsuite/tests/typecheck/T13180/all.T - + testsuite/tests/typecheck/should_compile/T11141.hs - + testsuite/tests/typecheck/should_compile/T11141.stderr - + testsuite/tests/typecheck/should_compile/T11505Bar.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs-boot - + testsuite/tests/typecheck/should_compile/T12046.hs - testsuite/tests/typecheck/should_compile/T26225.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T26823.hs - + testsuite/tests/typecheck/should_fail/T26823.stderr - testsuite/tests/typecheck/should_fail/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75c79c03a0d3f72c86999fda861eb6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75c79c03a0d3f72c86999fda861eb6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/supersven/correctly_propagate_host-build-target] 2 commits: Respect user set CFLAGS, CXXFLAGS and LDFLAGS
by Sven Tennie (＠supersven) 26 Mar '26

26 Mar '26

Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC Commits: 7bffb567 by Sven Tennie at 2026-03-25T17:30:29+01:00 Respect user set CFLAGS, CXXFLAGS and LDFLAGS These were ignored on installs. - - - - - 312deb98 by Sven Tennie at 2026-03-25T17:30:29+01:00 Only add flags if they are new This prevents duplicated when the user already set the arguments in CXXFLAGS or CFLAGS. - - - - - 3 changed files: - distrib/configure.ac.in - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs Changes: ===================================== distrib/configure.ac.in ===================================== @@ -159,6 +159,24 @@ AC_PROG_CXX([c++ g++ clang++]) MOVE_TO_FLAGS([CC],[CFLAGS]) MOVE_TO_FLAGS([CXX],[CXXFLAGS]) +dnl Save the original user-provided environment variables immediately +dnl before any m4 macros modify them. These will be passed to ghc-toolchain +dnl so it can make independent decisions and reach the same conclusions as autoconf. +USER_CONF_CC_OPTS_STAGE2="$CFLAGS" +USER_CONF_CXX_OPTS_STAGE2="$CXXFLAGS" +USER_CONF_GCC_LINKER_OPTS_STAGE2="$LDFLAGS" +USER_CPP_ARGS="$CPPFLAGS" +USER_HS_CPP_ARGS="$HaskellCPPArgs" +USER_JS_CPP_ARGS="$JavaScriptCPPArgs" +USER_CMM_CPP_ARGS="$CmmCPPArgs" + +dnl Initialize CONF_* variables with user-provided environment variables +dnl so that subsequent configure checks modify them and both autoconf and +dnl ghc-toolchain see the same values +CONF_CC_OPTS_STAGE2="$CFLAGS" +CONF_CXX_OPTS_STAGE2="$CXXFLAGS" +CONF_GCC_LINKER_OPTS_STAGE2="$LDFLAGS" + dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`) AC_PROG_CPP ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs ===================================== @@ -61,7 +61,7 @@ findHsCpp progOpt cc = checking "for Haskell C preprocessor" $ do let rawHsCppProgram = addFlagIfNew "-E" foundHsCppProg -- Always try to add the Haskell-specific CPP flags, regardless of the user options hppArgs <- findHsCppArgs rawHsCppProgram - let hsCppProgram = over _prgFlags (++hppArgs) rawHsCppProgram + let hsCppProgram = foldr addFlagIfNew rawHsCppProgram (reverse hppArgs) return HsCpp{hsCppProgram} -- | Given a C preprocessor, figure out how it should be invoked to preprocess ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs ===================================== @@ -345,30 +345,30 @@ addPlatformDepLinkFlags archOs cc ccLink0 = do -- -- On OpenSolaris uses gnu ld whereas SmartOS appears to use the Solaris -- implementation, which rather uses the -64 flag. - return $ ccLink2 & _prgFlags %++ "-m64" + return $ addFlagIfNew "-m64" ccLink2 ArchOS ArchAlpha _ -> -- For now, to suppress the gcc warning "call-clobbered -- register used for global register variable", we simply -- disable all warnings altogether using the -w flag. Oh well. - return $ ccLink2 & over _prgFlags (++["-w","-mieee","-D_REENTRANT"]) + return $ foldr addFlagIfNew ccLink2 (reverse ["-w","-mieee","-D_REENTRANT"]) -- ArchOS ArchHPPA? _ -> ArchOS ArchARM{} OSFreeBSD -> -- On arm/freebsd, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchARM{} OSLinux -> -- On arm/linux and arm/android, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSFreeBSD -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSLinux -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSNetBSD -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchPPC OSAIX -> -- We need `-D_THREAD_SAFE` to unlock the thread-local `errno`. - return $ ccLink2 & over _prgFlags (++["-D_THREAD_SAFE","-Wl,-bnotextro"]) + return $ foldr addFlagIfNew ccLink2 (reverse ["-D_THREAD_SAFE","-Wl,-bnotextro"]) _ -> return ccLink2 @@ -383,7 +383,7 @@ addOSMinGW32CcFlags archOs cc link -- See Note [Windows stack allocations]. checkFStackCheck :: Cc -> Program -> M Program checkFStackCheck cc link = checking "that -fstack-check works" $ do - let link' = link & _prgFlags %++ "-fstack-check" + let link' = addFlagIfNew "-fstack-check" link checkLinkWorks cc link' return link' @@ -393,7 +393,7 @@ addNoAsNeeded archOs cc ccLink | os <- archOS_OS archOs , osElfTarget os = checking "that --no-as-needed works" $ do - let ccLink' = over _prgFlags (++["-Wl,--no-as-needed"]) ccLink + let ccLink' = addFlagIfNew "-Wl,--no-as-needed" ccLink checkLinkWorks cc ccLink' return ccLink' | otherwise = return ccLink View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9ce6620f4254da92b848af3e1a3c75… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9ce6620f4254da92b848af3e1a3c75… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/26039] Bump default language edition to GHC2024
by Rodrigo Mesquita (＠alt-romes) 26 Mar '26

26 Mar '26

Rodrigo Mesquita pushed to branch wip/romes/26039 at Glasgow Haskell Compiler / GHC Commits: 9fb7c2cb by Rodrigo Mesquita at 2026-03-25T16:02:12+00:00 Bump default language edition to GHC2024 As per the accepted ghc-proposal#632 Fixes #26039 - - - - - 122 changed files: - .gitlab/ci.sh - compiler/GHC/Driver/Flags.hs - docs/users_guide/exts/control.rst - testsuite/tests/ado/ado004.hs - testsuite/tests/annotations/should_fail/annfail02.hs - testsuite/tests/annotations/should_fail/annfail02.stderr - testsuite/tests/array/should_run/arr020.hs - testsuite/tests/core-to-stg/T19700.hs - testsuite/tests/deSugar/should_fail/DsStrictFail.hs - testsuite/tests/deriving/should_compile/T15798b.hs - testsuite/tests/deriving/should_compile/T15798c.hs - testsuite/tests/deriving/should_compile/T15798c.stderr - testsuite/tests/deriving/should_compile/T24955a.hs - testsuite/tests/deriving/should_compile/T24955a.stderr - testsuite/tests/deriving/should_compile/T24955b.hs - testsuite/tests/deriving/should_compile/T24955c.hs - testsuite/tests/deriving/should_fail/T10598_fail4.hs - testsuite/tests/deriving/should_fail/T10598_fail4.stderr - testsuite/tests/deriving/should_fail/T10598_fail5.hs - testsuite/tests/deriving/should_fail/T10598_fail5.stderr - testsuite/tests/dmdanal/sigs/T22241.hs - testsuite/tests/gadt/T20485.hs - testsuite/tests/ghci.debugger/scripts/all.T - testsuite/tests/ghci.debugger/scripts/break012.hs - testsuite/tests/ghci.debugger/scripts/break012.stdout - testsuite/tests/ghci/prog-mhu002/all.T - testsuite/tests/ghci/scripts/Makefile - testsuite/tests/ghci/should_run/all.T - testsuite/tests/indexed-types/should_compile/T15322.hs - testsuite/tests/indexed-types/should_compile/T15322.stderr - testsuite/tests/linear/should_fail/T18888.hs - testsuite/tests/module/T20007.hs - testsuite/tests/module/T20007.stderr - testsuite/tests/module/mod90.hs - testsuite/tests/module/mod90.stderr - testsuite/tests/overloadedrecflds/should_fail/NoFieldSelectorsFail.hs - testsuite/tests/overloadedrecflds/should_fail/T18999_NoDisambiguateRecordFields.hs - testsuite/tests/overloadedrecflds/should_fail/all.T - testsuite/tests/parser/should_fail/ParserNoLambdaCase.hs - testsuite/tests/parser/should_fail/ParserNoLambdaCase.stderr - testsuite/tests/parser/should_fail/T16270h.hs - testsuite/tests/parser/should_fail/T16270h.stderr - testsuite/tests/parser/should_fail/readFail001.hs - testsuite/tests/parser/should_fail/readFail001.stderr - testsuite/tests/partial-sigs/should_compile/SomethingShowable.hs - testsuite/tests/plugins/late-plugin/LatePlugin.hs - testsuite/tests/polykinds/T7151.hs - testsuite/tests/polykinds/T7151.stderr - testsuite/tests/polykinds/T7433.hs - testsuite/tests/polykinds/T7433.stderr - testsuite/tests/programs/andy_cherry/test.T - testsuite/tests/rename/should_fail/T10668.hs - testsuite/tests/rename/should_fail/T10668.stderr - testsuite/tests/rename/should_fail/T12681.hs - testsuite/tests/rename/should_fail/T12681.stderr - testsuite/tests/rename/should_fail/T13568.hs - testsuite/tests/rename/should_fail/T13568.stderr - testsuite/tests/rename/should_fail/T13644.hs - testsuite/tests/rename/should_fail/T13644.stderr - testsuite/tests/rename/should_fail/T13847.hs - testsuite/tests/rename/should_fail/T13847.stderr - testsuite/tests/rename/should_fail/T14032c.hs - testsuite/tests/rename/should_fail/T19843l.hs - testsuite/tests/rename/should_fail/T19843l.stderr - testsuite/tests/rename/should_fail/T25901_imp_hq_fail_5.stderr - testsuite/tests/rename/should_fail/T25901_imp_sq_fail_2.stderr - testsuite/tests/rename/should_fail/T5385.hs - testsuite/tests/rename/should_fail/T5385.stderr - testsuite/tests/roles/should_fail/Roles5.hs - testsuite/tests/roles/should_fail/Roles5.stderr - testsuite/tests/showIface/DocsInHiFile.hs - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/DocsInHiFileTH.hs - testsuite/tests/showIface/DocsInHiFileTH.stdout - testsuite/tests/showIface/DocsInHiFileTHExternal.hs - testsuite/tests/showIface/HaddockIssue849.hs - testsuite/tests/showIface/HaddockIssue849.stdout - testsuite/tests/showIface/HaddockOpts.hs - testsuite/tests/showIface/HaddockOpts.stdout - testsuite/tests/showIface/HaddockSpanIssueT24378.hs - testsuite/tests/showIface/HaddockSpanIssueT24378.stdout - testsuite/tests/showIface/MagicHashInHaddocks.hs - testsuite/tests/showIface/MagicHashInHaddocks.stdout - testsuite/tests/showIface/Makefile - testsuite/tests/showIface/NoExportList.hs - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/showIface/PragmaDocs.stdout - testsuite/tests/showIface/ReExports.stdout - testsuite/tests/simplCore/T9646/test.T - testsuite/tests/simplCore/should_compile/T21960.hs - testsuite/tests/simplCore/should_compile/T26709.stderr - testsuite/tests/th/TH_Promoted1Tuple.hs - testsuite/tests/th/TH_Roles1.hs - testsuite/tests/typecheck/should_compile/MutRec.hs - testsuite/tests/typecheck/should_compile/T10770a.hs - testsuite/tests/typecheck/should_compile/T11339.hs - testsuite/tests/typecheck/should_compile/T11397.hs - testsuite/tests/typecheck/should_compile/T13526.hs - testsuite/tests/typecheck/should_compile/T18467.hs - testsuite/tests/typecheck/should_compile/T18467.stderr - testsuite/tests/typecheck/should_compile/tc081.hs - testsuite/tests/typecheck/should_compile/tc141.hs - testsuite/tests/typecheck/should_fail/T23427.hs - testsuite/tests/typecheck/should_fail/T6078.hs - testsuite/tests/typecheck/should_fail/T7453.hs - testsuite/tests/typecheck/should_fail/T7453.stderr - testsuite/tests/typecheck/should_fail/T8570.hs - testsuite/tests/typecheck/should_fail/T8570.stderr - testsuite/tests/typecheck/should_fail/tcfail083.hs - testsuite/tests/typecheck/should_fail/tcfail083.stderr - testsuite/tests/typecheck/should_fail/tcfail084.hs - testsuite/tests/typecheck/should_fail/tcfail084.stderr - testsuite/tests/typecheck/should_fail/tcfail094.hs - testsuite/tests/typecheck/should_fail/tcfail094.stderr - testsuite/tests/typecheck/should_run/T1735.hs - testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs - testsuite/tests/typecheck/should_run/T3731.hs - testsuite/tests/vdq-rta/should_fail/T24159_type_syntax_th_fail.script - testsuite/tests/warnings/should_fail/CaretDiagnostics1.hs - testsuite/tests/warnings/should_fail/CaretDiagnostics1.stderr - testsuite/tests/warnings/should_fail/T24396c.hs - testsuite/tests/warnings/should_fail/T24396c.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fb7c2cb95e3fed41edc57cd5dd9dbe… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fb7c2cb95e3fed41edc57cd5dd9dbe… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/supersven/correctly_propagate_host-build-target] Only add flags if they are new
by Sven Tennie (＠supersven) 26 Mar '26

26 Mar '26

Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC Commits: 9ce6620f by Sven Tennie at 2026-03-25T17:01:40+01:00 Only add flags if they are new This prevents duplicated when the user already set the arguments in CXXFLAGS or CFLAGS. - - - - - 2 changed files: - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs Changes: ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs ===================================== @@ -61,7 +61,7 @@ findHsCpp progOpt cc = checking "for Haskell C preprocessor" $ do let rawHsCppProgram = addFlagIfNew "-E" foundHsCppProg -- Always try to add the Haskell-specific CPP flags, regardless of the user options hppArgs <- findHsCppArgs rawHsCppProgram - let hsCppProgram = over _prgFlags (++hppArgs) rawHsCppProgram + let hsCppProgram = foldr addFlagIfNew rawHsCppProgram (reverse hppArgs) return HsCpp{hsCppProgram} -- | Given a C preprocessor, figure out how it should be invoked to preprocess ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs ===================================== @@ -345,30 +345,30 @@ addPlatformDepLinkFlags archOs cc ccLink0 = do -- -- On OpenSolaris uses gnu ld whereas SmartOS appears to use the Solaris -- implementation, which rather uses the -64 flag. - return $ ccLink2 & _prgFlags %++ "-m64" + return $ addFlagIfNew "-m64" ccLink2 ArchOS ArchAlpha _ -> -- For now, to suppress the gcc warning "call-clobbered -- register used for global register variable", we simply -- disable all warnings altogether using the -w flag. Oh well. - return $ ccLink2 & over _prgFlags (++["-w","-mieee","-D_REENTRANT"]) + return $ foldr addFlagIfNew ccLink2 (reverse ["-w","-mieee","-D_REENTRANT"]) -- ArchOS ArchHPPA? _ -> ArchOS ArchARM{} OSFreeBSD -> -- On arm/freebsd, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchARM{} OSLinux -> -- On arm/linux and arm/android, tell gcc to generate Arm -- instructions (ie not Thumb). - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSFreeBSD -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSLinux -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchAArch64 OSNetBSD -> - return $ ccLink2 & _prgFlags %++ "-Wl,-z,noexecstack" + return $ addFlagIfNew "-Wl,-z,noexecstack" ccLink2 ArchOS ArchPPC OSAIX -> -- We need `-D_THREAD_SAFE` to unlock the thread-local `errno`. - return $ ccLink2 & over _prgFlags (++["-D_THREAD_SAFE","-Wl,-bnotextro"]) + return $ foldr addFlagIfNew ccLink2 (reverse ["-D_THREAD_SAFE","-Wl,-bnotextro"]) _ -> return ccLink2 @@ -383,7 +383,7 @@ addOSMinGW32CcFlags archOs cc link -- See Note [Windows stack allocations]. checkFStackCheck :: Cc -> Program -> M Program checkFStackCheck cc link = checking "that -fstack-check works" $ do - let link' = link & _prgFlags %++ "-fstack-check" + let link' = addFlagIfNew "-fstack-check" link checkLinkWorks cc link' return link' @@ -393,7 +393,7 @@ addNoAsNeeded archOs cc ccLink | os <- archOS_OS archOs , osElfTarget os = checking "that --no-as-needed works" $ do - let ccLink' = over _prgFlags (++["-Wl,--no-as-needed"]) ccLink + let ccLink' = addFlagIfNew "-Wl,--no-as-needed" ccLink checkLinkWorks cc ccLink' return ccLink' | otherwise = return ccLink View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9ce6620f4254da92b848af3e1a3c750… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9ce6620f4254da92b848af3e1a3c750… You're receiving this email because of your account on gitlab.haskell.org.

1 0