- ghc-commits - Haskell.org

[Git][ghc/ghc][master] hadrian: remove the horrible i386 speedHack
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 41432d25 by Cheng Shao at 2026-01-18T10:05:13-05:00 hadrian: remove the horrible i386 speedHack When hadrian builds certain rts objects for i386, there's a horrible speedHack that forces -fno-PIC even for dynamic ways of those objects. This is not compatible with newer versions of gcc/binutils as well as clang/lld, and this patch removes it. Fixes #26792. - - - - - 1 changed file: - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -370,21 +370,6 @@ rtsPackageArgs = package rts ? do , inputs ["**/Evac.c", "**/Evac_thr.c"] ? arg "-funroll-loops" - , speedHack ? - inputs [ "**/Evac.c", "**/Evac_thr.c" - , "**/Scav.c", "**/Scav_thr.c" - , "**/Compact.c", "**/GC.c" ] ? arg "-fno-PIC" - -- @-static@ is necessary for these bits, as otherwise the NCG - -- generates dynamic references. - , speedHack ? - inputs [ "**/Updates.c", "**/StgMiscClosures.c" - , "**/Jumps_D.c", "**/Jumps_V16.c", "**/Jumps_V32.c", "**/Jumps_V64.c" - , "**/PrimOps.c", "**/Apply.c" - , "**/AutoApply.c" - , "**/AutoApply_V16.c" - , "**/AutoApply_V32.c" - , "**/AutoApply_V64.c" ] ? pure ["-fno-PIC", "-static"] - -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs , inputs ["**/AutoApply_V32.c"] ? pure [ "-mavx2" | x86 ] , inputs ["**/AutoApply_V64.c"] ? pure [ "-mavx512f" | x86 ] @@ -452,42 +437,6 @@ rtsPackageArgs = package rts ? do , builder HsCpp ? useLibdw ? arg "-DUSE_LIBDW" ] --- Compile various performance-critical pieces *without* -fPIC -dynamic --- even when building a shared library. If we don't do this, then the --- GC runs about 50% slower on x86 due to the overheads of PIC. The --- cost of doing this is a little runtime linking and less sharing, but --- not much. --- --- On x86_64 this doesn't work, because all objects in a shared library --- must be compiled with -fPIC (since the 32-bit relocations generated --- by the default small memory can't be resolved at runtime). So we --- only do this on i386. --- --- This apparently doesn't work on OS X (Darwin) nor on Solaris. --- On Darwin we get errors of the form --- --- ld: absolute addressing (perhaps -mdynamic-no-pic) used in _stg_ap_0_fast --- from rts/dist-install/build/Apply.dyn_o not allowed in slidable image --- --- and lots of these warnings: --- --- ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image --- from loading in dyld shared cache --- --- On Solaris we get errors like: --- --- Text relocation remains referenced --- against symbol offset in file --- .rodata (section) 0x11 rts/dist-install/build/Apply.dyn_o --- ... --- ld: fatal: relocations remain against allocatable but non-writable sections --- collect2: ld returned 1 exit status -speedHack :: Action Bool -speedHack = do - i386 <- anyTargetArch [ArchX86] - goodOS <- not <$> anyTargetOs [OSSolaris2] - return $ i386 && goodOS - -- See @rts/ghc.mk@. rtsWarnings :: Args rtsWarnings = mconcat View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/41432d25b7a66fa36a0e3def429fd98… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/41432d25b7a66fa36a0e3def429fd98… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] .gitmodules: use gitlab mirror for the libffi-clib submodule
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: f6af485d by Cheng Shao at 2026-01-18T10:03:19-05:00 .gitmodules: use gitlab mirror for the libffi-clib submodule This patch fixes .gitmodules to use the gitlab mirror for the libffi-clib submodule, to make it coherent with other submodules that allow ghc developers to experiment with wip branches in submodules for ghc patches. Fixes #26783. - - - - - 1 changed file: - .gitmodules Changes: ===================================== .gitmodules ===================================== @@ -122,4 +122,4 @@ url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git [submodule "libraries/libffi-clib"] path = libraries/libffi-clib - url = https://github.com/stable-haskell/libffi-clib.git + url = https://gitlab.haskell.org/ghc/libffi-clib.git View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f6af485d2583c4e629d8516c32e73bc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f6af485d2583c4e629d8516c32e73bc… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: remove unused .def files from rts/win32
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 8372e13d by Cheng Shao at 2026-01-18T10:02:12-05:00 rts: remove unused .def files from rts/win32 This patch removes unused .def files from `rts/win32`, given we don't build .dll files for rts/ghc-internal/ghc-prim at all. Even when we resurrect win32 dll support at some point in the future, these .def files still contain incorrect symbols anyway and won't be of any use. - - - - - 3 changed files: - − rts/win32/libHSffi.def - − rts/win32/libHSghc-internal.def - − rts/win32/libHSghc-prim.def Changes: ===================================== rts/win32/libHSffi.def deleted ===================================== @@ -1,19 +0,0 @@ - -LIBRARY "libHSffi-ghc@ProjectVersion@.dll" - -EXPORTS - - ffi_prep_cif - ffi_call - ffi_type_void - ffi_type_float - ffi_type_double - ffi_type_sint64 - ffi_type_uint64 - ffi_type_sint32 - ffi_type_uint32 - ffi_type_sint16 - ffi_type_uint16 - ffi_type_sint8 - ffi_type_uint8 - ffi_type_pointer ===================================== rts/win32/libHSghc-internal.def deleted ===================================== @@ -1,49 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - ghczminternal_GHCziInternalziInt_I8zh_con_info - ghczminternal_GHCziInternalziInt_I16zh_con_info - ghczminternal_GHCziInternalziInt_I32zh_con_info - ghczminternal_GHCziInternalziInt_I64zh_con_info - - ghczminternal_GHCziInternalziWord_W8zh_con_info - ghczminternal_GHCziInternalziWord_W16zh_con_info - ghczminternal_GHCziInternalziWord_W32zh_con_info - ghczminternal_GHCziInternalziWord_W64zh_con_info - - ghczminternal_GHCziInternalziStable_StablePtr_con_info - - ghczminternal_GHCziInternalziPack_unpackCString_closure - - ghczminternal_GHCziInternalziTopHandler_runIO_closure - ghczminternal_GHCziInternalziTopHandler_runNonIO_closure - - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_heapOverflow_closure - - ghczminternal_GHCziInternalziPtr_Ptr_con_info - ghczminternal_GHCziInternalziPtr_FunPtr_con_info - - ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure - ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure - ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure - ghczminternal_GHCziInternalziConcziSync_runSparks_closure - ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure - - ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure - - ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure - ghczminternal_GHCziInternalziPack_unpackCString_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure - ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure - ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure - ghczminternal_GHCziInternalziExceptionziType_underflowException_closure - ghczminternal_GHCziInternalziExceptionziType_overflowException_closure ===================================== rts/win32/libHSghc-prim.def deleted ===================================== @@ -1,14 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - - ghczminternal_GHCziInternalziTypes_True_closure - ghczminternal_GHCziInternalziTypes_False_closure - ghczminternal_GHCziInternalziTypes_Czh_con_info - ghczminternal_GHCziInternalziTypes_Izh_con_info - ghczminternal_GHCziInternalziTypes_Fzh_con_info - ghczminternal_GHCziInternalziTypes_Dzh_con_info - ghczminternal_GHCziInternalziTypes_Wzh_con_info - ghczminternal_GHCziInternalziTypes_Czh_static_info - ghczminternal_GHCziInternalziTypes_Izh_static_info View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8372e13d6a52ed8294539f407ddeecd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8372e13d6a52ed8294539f407ddeecd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] hadrian: replace default -H32m/-H64m with -O64M to improve mutator productivity
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 87d8f6c2 by Cheng Shao at 2026-01-18T10:01:30-05:00 hadrian: replace default -H32m/-H64m with -O64M to improve mutator productivity Most hadrian build flavours pass `-H32m`/`-H64m` to GHC as conventional wisdom to improve mutator productivity and reduce GC overhead. They were inherited from the legacy Make build system, and there used to be make flags to instrument a build process with `-Rghc-timing` option to collect GC stats of each GHC run from stderr. It's time to revisit whether there are better defaults for `-H32m`/`-H64m`, and this patch changes it to `-O64M` which indeed improves mutator productivity based on real statistics. `-O64M` is more aggressive than `-H64m`; it allows the old generation to grow to at least 64M before triggering major GC and reduces major GC runs. The stats of a clean build with `validate` flavour and `-H64m`: ``` h64m.log matched RTS stat lines: 5499 sum MUT cpu : 2400.808 s sum GC cpu : 1378.292 s sum MUT elapsed : 2788.253 s sum GC elapsed : 1389.233 s GC/MUT cpu ratio : 0.574 (GC is 57.4% of MUT) GC/MUT elapsed ratio : 0.498 (GC is 49.8% of MUT) GC fraction of (MUT+GC) cpu : 36.5% GC fraction of (MUT+GC) elapsed : 33.3% per-line GC/MUT cpu ratio: median 0.691, p90 1.777 per-line GC/MUT elapsed ratio: median 0.519, p90 1.081 ``` The stats of a clean build with `validate` flavour and `-O64M`: ``` o64m.log matched RTS stat lines: 5499 sum MUT cpu : 2377.383 s sum GC cpu : 1127.146 s sum MUT elapsed : 2758.857 s sum GC elapsed : 1135.587 s GC/MUT cpu ratio : 0.474 (GC is 47.4% of MUT) GC/MUT elapsed ratio : 0.412 (GC is 41.2% of MUT) GC fraction of (MUT+GC) cpu : 32.2% GC fraction of (MUT+GC) elapsed : 29.2% per-line GC/MUT cpu ratio: median 0.489, p90 1.099 per-line GC/MUT elapsed ratio: median 0.367, p90 0.806 ``` Mutator time is roughly in the same ballpark, but GC CPU time has reduced by 18.22%, and mutator productivity has increased from 63.5% to 67.8%. - - - - - 10 changed files: - hadrian/doc/flavours.md - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs Changes: ===================================== hadrian/doc/flavours.md ===================================== @@ -37,8 +37,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>default </td> <td> </td> - <td>-O -H32m </td> - <td>-O2 -H32m</td> + <td>-O +RTS -O64M -RTS </td> + <td>-O2 +RTS -O64M -RTS</td> <td></td> <td>-haddock</td> <td></td> @@ -49,8 +49,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick</td> <td> </td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -61,8 +61,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-validate</td> <td></td> - <td>-O0 -H64m -Werror</td> - <td>-O0 -H64m -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> <td></td> <td>-O</td> <td>-O2</td> @@ -73,8 +73,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-debug</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -85,8 +85,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quickest</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td></td> <td>-O</td> @@ -97,8 +97,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>perf</td> <td> Yes (on supported platforms) </td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -109,8 +109,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>release (same as perf with -haddock and +no_self_recomp+hash_unit_ids)</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -121,8 +121,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>bench</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -133,8 +133,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel1</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O0 -DDEBUG</td> @@ -145,8 +145,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel2</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O2</td> @@ -157,7 +157,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage -fcheck-prim-bounds</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -169,7 +169,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>slow-validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -181,8 +181,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>static</td> <td></td> - <td>-O -H64m -fPIC -static</td> - <td>-O -H64m -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> <td></td> <td>-O2</td> <td>-O2</td> ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -274,7 +274,7 @@ defaultSourceArgs :: SourceArgs defaultSourceArgs = SourceArgs { hsDefault = mconcat [ stage0 ? arg "-O" , notStage0 ? arg "-O2" - , arg "-H32m" ] + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-haddock" , hsCompiler = mempty , hsGhc = mempty } ===================================== hadrian/src/Settings/Flavours/Benchmark.hs ===================================== @@ -16,7 +16,7 @@ benchmarkFlavour = defaultFlavour benchmarkArgs :: Args benchmarkArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = pure ["-O2"] -- TODO: We should really pass -O2 when notStage0. Otherwise, we aren't -- really measuring the overhead of a potential new optimisation we want ===================================== hadrian/src/Settings/Flavours/Development.hs ===================================== @@ -26,7 +26,7 @@ developmentFlavour ghcStage = defaultFlavour developmentArgs :: Stage -> Args developmentArgs ghcStage = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O", "-H64m"], + { hsDefault = mconcat [ pure ["-O", "+RTS", "-O64M", "-RTS"], -- Disable optimization when building Cabal; -- this saves many minutes of build time. package cabal ? pure ["-O0"]] ===================================== hadrian/src/Settings/Flavours/GhcInGhci.hs ===================================== @@ -22,7 +22,7 @@ ghcInGhciFlavour = defaultFlavour ghciArgs :: Args ghciArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = mempty ===================================== hadrian/src/Settings/Flavours/Performance.hs ===================================== @@ -12,7 +12,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour performanceArgs :: Args performanceArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = orM [notStage0, cross] ? arg "-O2" , hsCompiler = pure ["-O2"] , hsGhc = mconcat ===================================== hadrian/src/Settings/Flavours/Quick.hs ===================================== @@ -34,7 +34,7 @@ quickFlavour = defaultFlavour quickArgs :: Args quickArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O0", "-H64m"] ] + { hsDefault = mconcat [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-O" , hsCompiler = stage0 ? arg "-O2" , hsGhc = stage0 ? arg "-O" } ===================================== hadrian/src/Settings/Flavours/QuickCross.hs ===================================== @@ -32,7 +32,7 @@ quickCrossFlavour = defaultFlavour quickCrossArgs :: Args quickCrossArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? mconcat [ arg "-O", arg "-fllvm" ] , hsCompiler = stage0 ? arg "-O2" ===================================== hadrian/src/Settings/Flavours/Quickest.hs ===================================== @@ -19,7 +19,7 @@ quickestFlavour = defaultFlavour quickestArgs :: Args quickestArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = stage0 ? arg "-O" ===================================== hadrian/src/Settings/Flavours/Validate.hs ===================================== @@ -16,11 +16,12 @@ validateFlavour = enableLinting $ quickValidateFlavour validateArgs :: Args validateArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ stage0 ? pure ["-O0", "-H64m"] + { hsDefault = mconcat [ stage0 ? pure ["-O0"] -- See #11487 , notStage0 ? arg "-fllvm-fill-undef-with-garbage" , notStage0 ? arg "-dno-debug-output" , notStage0 ? arg "-fcheck-prim-bounds" + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = pure ["-O"] , hsCompiler = mconcat [ stage0 ? pure ["-O2"] @@ -37,7 +38,7 @@ slowValidateFlavour = validateFlavour quickValidateArgs :: Args quickValidateArgs = sourceArgs SourceArgs - { hsDefault = mempty + { hsDefault = pure ["+RTS", "-O64M", "-RTS"] , hsLibrary = pure [ "-O" ] , hsCompiler = mconcat [ stage0 ? arg "-O2", notStage0 ? arg "-O"] , hsGhc = pure [ "-O", "-hide-all-packages" ] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/87d8f6c236996b228e758c5eab2a565… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/87d8f6c236996b228e758c5eab2a565… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] libraries: bump haskeline submodule to 0.8.4.1
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: eea2036b by Cheng Shao at 2026-01-18T10:00:49-05:00 libraries: bump haskeline submodule to 0.8.4.1 This patch bumps the haskeline submodule to 0.8.4.1 which includes an important fix for an ANSI handling bug on Windows (https://github.com/haskell/haskeline/pull/126) - - - - - 1 changed file: - libraries/haskeline Changes: ===================================== libraries/haskeline ===================================== @@ -1 +1 @@ -Subproject commit 991953cd5d3bb9e8057de4a0d8f2cae3455865d8 +Subproject commit d0d8902f88fde549f76771feeb40f16941a22a9f View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eea2036b7c367cc61cd5846379be109… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eea2036b7c367cc61cd5846379be109… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: libraries: bump haskeline submodule to 0.8.4.1
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: ba789a41 by Cheng Shao at 2026-01-18T04:10:22-05:00 libraries: bump haskeline submodule to 0.8.4.1 This patch bumps the haskeline submodule to 0.8.4.1 which includes an important fix for an ANSI handling bug on Windows (https://github.com/haskell/haskeline/pull/126) - - - - - 93a9cac5 by Cheng Shao at 2026-01-18T04:10:23-05:00 hadrian: replace default -H32m/-H64m with -O64M to improve mutator productivity Most hadrian build flavours pass `-H32m`/`-H64m` to GHC as conventional wisdom to improve mutator productivity and reduce GC overhead. They were inherited from the legacy Make build system, and there used to be make flags to instrument a build process with `-Rghc-timing` option to collect GC stats of each GHC run from stderr. It's time to revisit whether there are better defaults for `-H32m`/`-H64m`, and this patch changes it to `-O64M` which indeed improves mutator productivity based on real statistics. `-O64M` is more aggressive than `-H64m`; it allows the old generation to grow to at least 64M before triggering major GC and reduces major GC runs. The stats of a clean build with `validate` flavour and `-H64m`: ``` h64m.log matched RTS stat lines: 5499 sum MUT cpu : 2400.808 s sum GC cpu : 1378.292 s sum MUT elapsed : 2788.253 s sum GC elapsed : 1389.233 s GC/MUT cpu ratio : 0.574 (GC is 57.4% of MUT) GC/MUT elapsed ratio : 0.498 (GC is 49.8% of MUT) GC fraction of (MUT+GC) cpu : 36.5% GC fraction of (MUT+GC) elapsed : 33.3% per-line GC/MUT cpu ratio: median 0.691, p90 1.777 per-line GC/MUT elapsed ratio: median 0.519, p90 1.081 ``` The stats of a clean build with `validate` flavour and `-O64M`: ``` o64m.log matched RTS stat lines: 5499 sum MUT cpu : 2377.383 s sum GC cpu : 1127.146 s sum MUT elapsed : 2758.857 s sum GC elapsed : 1135.587 s GC/MUT cpu ratio : 0.474 (GC is 47.4% of MUT) GC/MUT elapsed ratio : 0.412 (GC is 41.2% of MUT) GC fraction of (MUT+GC) cpu : 32.2% GC fraction of (MUT+GC) elapsed : 29.2% per-line GC/MUT cpu ratio: median 0.489, p90 1.099 per-line GC/MUT elapsed ratio: median 0.367, p90 0.806 ``` Mutator time is roughly in the same ballpark, but GC CPU time has reduced by 18.22%, and mutator productivity has increased from 63.5% to 67.8%. - - - - - 331eb1c4 by Cheng Shao at 2026-01-18T04:10:24-05:00 rts: remove unused .def files from rts/win32 This patch removes unused .def files from `rts/win32`, given we don't build .dll files for rts/ghc-internal/ghc-prim at all. Even when we resurrect win32 dll support at some point in the future, these .def files still contain incorrect symbols anyway and won't be of any use. - - - - - 652c8e21 by Cheng Shao at 2026-01-18T04:10:25-05:00 .gitmodules: use gitlab mirror for the libffi-clib submodule This patch fixes .gitmodules to use the gitlab mirror for the libffi-clib submodule, to make it coherent with other submodules that allow ghc developers to experiment with wip branches in submodules for ghc patches. Fixes #26783. - - - - - e052213f by Cheng Shao at 2026-01-18T04:10:25-05:00 hadrian: remove the horrible i386 speedHack When hadrian builds certain rts objects for i386, there's a horrible speedHack that forces -fno-PIC even for dynamic ways of those objects. This is not compatible with newer versions of gcc/binutils as well as clang/lld, and this patch removes it. Fixes #26792. - - - - - 16 changed files: - .gitmodules - hadrian/doc/flavours.md - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - libraries/haskeline - − rts/win32/libHSffi.def - − rts/win32/libHSghc-internal.def - − rts/win32/libHSghc-prim.def Changes: ===================================== .gitmodules ===================================== @@ -122,4 +122,4 @@ url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git [submodule "libraries/libffi-clib"] path = libraries/libffi-clib - url = https://github.com/stable-haskell/libffi-clib.git + url = https://gitlab.haskell.org/ghc/libffi-clib.git ===================================== hadrian/doc/flavours.md ===================================== @@ -37,8 +37,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>default </td> <td> </td> - <td>-O -H32m </td> - <td>-O2 -H32m</td> + <td>-O +RTS -O64M -RTS </td> + <td>-O2 +RTS -O64M -RTS</td> <td></td> <td>-haddock</td> <td></td> @@ -49,8 +49,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick</td> <td> </td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -61,8 +61,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-validate</td> <td></td> - <td>-O0 -H64m -Werror</td> - <td>-O0 -H64m -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> <td></td> <td>-O</td> <td>-O2</td> @@ -73,8 +73,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-debug</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -85,8 +85,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quickest</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td></td> <td>-O</td> @@ -97,8 +97,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>perf</td> <td> Yes (on supported platforms) </td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -109,8 +109,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>release (same as perf with -haddock and +no_self_recomp+hash_unit_ids)</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -121,8 +121,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>bench</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -133,8 +133,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel1</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O0 -DDEBUG</td> @@ -145,8 +145,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel2</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O2</td> @@ -157,7 +157,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage -fcheck-prim-bounds</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -169,7 +169,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>slow-validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -181,8 +181,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>static</td> <td></td> - <td>-O -H64m -fPIC -static</td> - <td>-O -H64m -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> <td></td> <td>-O2</td> <td>-O2</td> ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -274,7 +274,7 @@ defaultSourceArgs :: SourceArgs defaultSourceArgs = SourceArgs { hsDefault = mconcat [ stage0 ? arg "-O" , notStage0 ? arg "-O2" - , arg "-H32m" ] + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-haddock" , hsCompiler = mempty , hsGhc = mempty } ===================================== hadrian/src/Settings/Flavours/Benchmark.hs ===================================== @@ -16,7 +16,7 @@ benchmarkFlavour = defaultFlavour benchmarkArgs :: Args benchmarkArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = pure ["-O2"] -- TODO: We should really pass -O2 when notStage0. Otherwise, we aren't -- really measuring the overhead of a potential new optimisation we want ===================================== hadrian/src/Settings/Flavours/Development.hs ===================================== @@ -26,7 +26,7 @@ developmentFlavour ghcStage = defaultFlavour developmentArgs :: Stage -> Args developmentArgs ghcStage = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O", "-H64m"], + { hsDefault = mconcat [ pure ["-O", "+RTS", "-O64M", "-RTS"], -- Disable optimization when building Cabal; -- this saves many minutes of build time. package cabal ? pure ["-O0"]] ===================================== hadrian/src/Settings/Flavours/GhcInGhci.hs ===================================== @@ -22,7 +22,7 @@ ghcInGhciFlavour = defaultFlavour ghciArgs :: Args ghciArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = mempty ===================================== hadrian/src/Settings/Flavours/Performance.hs ===================================== @@ -12,7 +12,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour performanceArgs :: Args performanceArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = orM [notStage0, cross] ? arg "-O2" , hsCompiler = pure ["-O2"] , hsGhc = mconcat ===================================== hadrian/src/Settings/Flavours/Quick.hs ===================================== @@ -34,7 +34,7 @@ quickFlavour = defaultFlavour quickArgs :: Args quickArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O0", "-H64m"] ] + { hsDefault = mconcat [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-O" , hsCompiler = stage0 ? arg "-O2" , hsGhc = stage0 ? arg "-O" } ===================================== hadrian/src/Settings/Flavours/QuickCross.hs ===================================== @@ -32,7 +32,7 @@ quickCrossFlavour = defaultFlavour quickCrossArgs :: Args quickCrossArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? mconcat [ arg "-O", arg "-fllvm" ] , hsCompiler = stage0 ? arg "-O2" ===================================== hadrian/src/Settings/Flavours/Quickest.hs ===================================== @@ -19,7 +19,7 @@ quickestFlavour = defaultFlavour quickestArgs :: Args quickestArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = stage0 ? arg "-O" ===================================== hadrian/src/Settings/Flavours/Validate.hs ===================================== @@ -16,11 +16,12 @@ validateFlavour = enableLinting $ quickValidateFlavour validateArgs :: Args validateArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ stage0 ? pure ["-O0", "-H64m"] + { hsDefault = mconcat [ stage0 ? pure ["-O0"] -- See #11487 , notStage0 ? arg "-fllvm-fill-undef-with-garbage" , notStage0 ? arg "-dno-debug-output" , notStage0 ? arg "-fcheck-prim-bounds" + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = pure ["-O"] , hsCompiler = mconcat [ stage0 ? pure ["-O2"] @@ -37,7 +38,7 @@ slowValidateFlavour = validateFlavour quickValidateArgs :: Args quickValidateArgs = sourceArgs SourceArgs - { hsDefault = mempty + { hsDefault = pure ["+RTS", "-O64M", "-RTS"] , hsLibrary = pure [ "-O" ] , hsCompiler = mconcat [ stage0 ? arg "-O2", notStage0 ? arg "-O"] , hsGhc = pure [ "-O", "-hide-all-packages" ] ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -370,21 +370,6 @@ rtsPackageArgs = package rts ? do , inputs ["**/Evac.c", "**/Evac_thr.c"] ? arg "-funroll-loops" - , speedHack ? - inputs [ "**/Evac.c", "**/Evac_thr.c" - , "**/Scav.c", "**/Scav_thr.c" - , "**/Compact.c", "**/GC.c" ] ? arg "-fno-PIC" - -- @-static@ is necessary for these bits, as otherwise the NCG - -- generates dynamic references. - , speedHack ? - inputs [ "**/Updates.c", "**/StgMiscClosures.c" - , "**/Jumps_D.c", "**/Jumps_V16.c", "**/Jumps_V32.c", "**/Jumps_V64.c" - , "**/PrimOps.c", "**/Apply.c" - , "**/AutoApply.c" - , "**/AutoApply_V16.c" - , "**/AutoApply_V32.c" - , "**/AutoApply_V64.c" ] ? pure ["-fno-PIC", "-static"] - -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs , inputs ["**/AutoApply_V32.c"] ? pure [ "-mavx2" | x86 ] , inputs ["**/AutoApply_V64.c"] ? pure [ "-mavx512f" | x86 ] @@ -452,42 +437,6 @@ rtsPackageArgs = package rts ? do , builder HsCpp ? useLibdw ? arg "-DUSE_LIBDW" ] --- Compile various performance-critical pieces *without* -fPIC -dynamic --- even when building a shared library. If we don't do this, then the --- GC runs about 50% slower on x86 due to the overheads of PIC. The --- cost of doing this is a little runtime linking and less sharing, but --- not much. --- --- On x86_64 this doesn't work, because all objects in a shared library --- must be compiled with -fPIC (since the 32-bit relocations generated --- by the default small memory can't be resolved at runtime). So we --- only do this on i386. --- --- This apparently doesn't work on OS X (Darwin) nor on Solaris. --- On Darwin we get errors of the form --- --- ld: absolute addressing (perhaps -mdynamic-no-pic) used in _stg_ap_0_fast --- from rts/dist-install/build/Apply.dyn_o not allowed in slidable image --- --- and lots of these warnings: --- --- ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image --- from loading in dyld shared cache --- --- On Solaris we get errors like: --- --- Text relocation remains referenced --- against symbol offset in file --- .rodata (section) 0x11 rts/dist-install/build/Apply.dyn_o --- ... --- ld: fatal: relocations remain against allocatable but non-writable sections --- collect2: ld returned 1 exit status -speedHack :: Action Bool -speedHack = do - i386 <- anyTargetArch [ArchX86] - goodOS <- not <$> anyTargetOs [OSSolaris2] - return $ i386 && goodOS - -- See @rts/ghc.mk@. rtsWarnings :: Args rtsWarnings = mconcat ===================================== libraries/haskeline ===================================== @@ -1 +1 @@ -Subproject commit 991953cd5d3bb9e8057de4a0d8f2cae3455865d8 +Subproject commit d0d8902f88fde549f76771feeb40f16941a22a9f ===================================== rts/win32/libHSffi.def deleted ===================================== @@ -1,19 +0,0 @@ - -LIBRARY "libHSffi-ghc@ProjectVersion@.dll" - -EXPORTS - - ffi_prep_cif - ffi_call - ffi_type_void - ffi_type_float - ffi_type_double - ffi_type_sint64 - ffi_type_uint64 - ffi_type_sint32 - ffi_type_uint32 - ffi_type_sint16 - ffi_type_uint16 - ffi_type_sint8 - ffi_type_uint8 - ffi_type_pointer ===================================== rts/win32/libHSghc-internal.def deleted ===================================== @@ -1,49 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - ghczminternal_GHCziInternalziInt_I8zh_con_info - ghczminternal_GHCziInternalziInt_I16zh_con_info - ghczminternal_GHCziInternalziInt_I32zh_con_info - ghczminternal_GHCziInternalziInt_I64zh_con_info - - ghczminternal_GHCziInternalziWord_W8zh_con_info - ghczminternal_GHCziInternalziWord_W16zh_con_info - ghczminternal_GHCziInternalziWord_W32zh_con_info - ghczminternal_GHCziInternalziWord_W64zh_con_info - - ghczminternal_GHCziInternalziStable_StablePtr_con_info - - ghczminternal_GHCziInternalziPack_unpackCString_closure - - ghczminternal_GHCziInternalziTopHandler_runIO_closure - ghczminternal_GHCziInternalziTopHandler_runNonIO_closure - - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_heapOverflow_closure - - ghczminternal_GHCziInternalziPtr_Ptr_con_info - ghczminternal_GHCziInternalziPtr_FunPtr_con_info - - ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure - ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure - ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure - ghczminternal_GHCziInternalziConcziSync_runSparks_closure - ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure - - ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure - - ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure - ghczminternal_GHCziInternalziPack_unpackCString_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure - ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure - ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure - ghczminternal_GHCziInternalziExceptionziType_underflowException_closure - ghczminternal_GHCziInternalziExceptionziType_overflowException_closure ===================================== rts/win32/libHSghc-prim.def deleted ===================================== @@ -1,14 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - - ghczminternal_GHCziInternalziTypes_True_closure - ghczminternal_GHCziInternalziTypes_False_closure - ghczminternal_GHCziInternalziTypes_Czh_con_info - ghczminternal_GHCziInternalziTypes_Izh_con_info - ghczminternal_GHCziInternalziTypes_Fzh_con_info - ghczminternal_GHCziInternalziTypes_Dzh_con_info - ghczminternal_GHCziInternalziTypes_Wzh_con_info - ghczminternal_GHCziInternalziTypes_Czh_static_info - ghczminternal_GHCziInternalziTypes_Izh_static_info View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/29b8a74d56e2bbc919a9a6d2d3306c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/29b8a74d56e2bbc919a9a6d2d3306c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: hadrian: replace default -H32m/-H64m with -O64M to improve mutator productivity
by Marge Bot (＠marge-bot) 18 Jan '26

18 Jan '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: c5d06f56 by Cheng Shao at 2026-01-18T00:19:19-05:00 hadrian: replace default -H32m/-H64m with -O64M to improve mutator productivity Most hadrian build flavours pass `-H32m`/`-H64m` to GHC as conventional wisdom to improve mutator productivity and reduce GC overhead. They were inherited from the legacy Make build system, and there used to be make flags to instrument a build process with `-Rghc-timing` option to collect GC stats of each GHC run from stderr. It's time to revisit whether there are better defaults for `-H32m`/`-H64m`, and this patch changes it to `-O64M` which indeed improves mutator productivity based on real statistics. `-O64M` is more aggressive than `-H64m`; it allows the old generation to grow to at least 64M before triggering major GC and reduces major GC runs. The stats of a clean build with `validate` flavour and `-H64m`: ``` h64m.log matched RTS stat lines: 5499 sum MUT cpu : 2400.808 s sum GC cpu : 1378.292 s sum MUT elapsed : 2788.253 s sum GC elapsed : 1389.233 s GC/MUT cpu ratio : 0.574 (GC is 57.4% of MUT) GC/MUT elapsed ratio : 0.498 (GC is 49.8% of MUT) GC fraction of (MUT+GC) cpu : 36.5% GC fraction of (MUT+GC) elapsed : 33.3% per-line GC/MUT cpu ratio: median 0.691, p90 1.777 per-line GC/MUT elapsed ratio: median 0.519, p90 1.081 ``` The stats of a clean build with `validate` flavour and `-O64M`: ``` o64m.log matched RTS stat lines: 5499 sum MUT cpu : 2377.383 s sum GC cpu : 1127.146 s sum MUT elapsed : 2758.857 s sum GC elapsed : 1135.587 s GC/MUT cpu ratio : 0.474 (GC is 47.4% of MUT) GC/MUT elapsed ratio : 0.412 (GC is 41.2% of MUT) GC fraction of (MUT+GC) cpu : 32.2% GC fraction of (MUT+GC) elapsed : 29.2% per-line GC/MUT cpu ratio: median 0.489, p90 1.099 per-line GC/MUT elapsed ratio: median 0.367, p90 0.806 ``` Mutator time is roughly in the same ballpark, but GC CPU time has reduced by 18.22%, and mutator productivity has increased from 63.5% to 67.8%. - - - - - 2a2450af by Simon Peyton Jones at 2026-01-18T00:19:19-05:00 Make the implicit-parameter class have representational role This MR addresses #26737, by making the built-in class IP have a representational role for its second parameter. See Note [IP: implicit parameter class] in ghc-internal:GHC.Internal.Classes.IP In fact, IP is (unfortunately, currently) exposed by base:GHC.Base, so we ran a quick CLC proposal to agree the change: https://github.com/haskell/core-libraries-committee/issues/385 Some (small) compilations get faster because they only need to load (small) interface file GHC.Internal.Classes.IP.hi, rather than (large) GHC.Internal.Classes.hi. Metric Decrease: T10421 T12150 T12425 T24582 T5837 - - - - - 50a96a82 by Cheng Shao at 2026-01-18T00:19:20-05:00 rts: remove unused .def files from rts/win32 This patch removes unused .def files from `rts/win32`, given we don't build .dll files for rts/ghc-internal/ghc-prim at all. Even when we resurrect win32 dll support at some point in the future, these .def files still contain incorrect symbols anyway and won't be of any use. - - - - - 29b8a74d by Cheng Shao at 2026-01-18T00:19:21-05:00 .gitmodules: use gitlab mirror for the libffi-clib submodule This patch fixes .gitmodules to use the gitlab mirror for the libffi-clib submodule, to make it coherent with other submodules that allow ghc developers to experiment with wip branches in submodules for ghc patches. Fixes #26783. - - - - - 27 changed files: - .gitmodules - compiler/GHC/Builtin/Names.hs - docs/users_guide/9.16.1-notes.rst - hadrian/doc/flavours.md - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/Classes.hs - + libraries/ghc-internal/src/GHC/Internal/Classes/IP.hs - − rts/win32/libHSffi.def - − rts/win32/libHSghc-internal.def - − rts/win32/libHSghc-prim.def - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/interface-stability/ghc-prim-exports.stdout - testsuite/tests/interface-stability/ghc-prim-exports.stdout-mingw32 - testsuite/tests/th/TH_implicitParams.stdout - + testsuite/tests/typecheck/should_compile/T26737.hs - testsuite/tests/typecheck/should_compile/all.T Changes: ===================================== .gitmodules ===================================== @@ -122,4 +122,4 @@ url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git [submodule "libraries/libffi-clib"] path = libraries/libffi-clib - url = https://github.com/stable-haskell/libffi-clib.git + url = https://gitlab.haskell.org/ghc/libffi-clib.git ===================================== compiler/GHC/Builtin/Names.hs ===================================== @@ -526,7 +526,7 @@ genericTyConNames = [ gHC_PRIM, gHC_PRIM_PANIC, gHC_TYPES, gHC_INTERNAL_DATA_DATA, gHC_MAGIC, gHC_MAGIC_DICT, - gHC_CLASSES, gHC_PRIMOPWRAPPERS :: Module + gHC_CLASSES, gHC_CLASSES_IP, gHC_PRIMOPWRAPPERS :: Module gHC_PRIM = mkGhcInternalModule (fsLit "GHC.Internal.Prim") -- Primitive types and values gHC_PRIM_PANIC = mkGhcInternalModule (fsLit "GHC.Internal.Prim.Panic") gHC_TYPES = mkGhcInternalModule (fsLit "GHC.Internal.Types") @@ -534,6 +534,7 @@ gHC_MAGIC = mkGhcInternalModule (fsLit "GHC.Internal.Magic") gHC_MAGIC_DICT = mkGhcInternalModule (fsLit "GHC.Internal.Magic.Dict") gHC_CSTRING = mkGhcInternalModule (fsLit "GHC.Internal.CString") gHC_CLASSES = mkGhcInternalModule (fsLit "GHC.Internal.Classes") +gHC_CLASSES_IP = mkGhcInternalModule (fsLit "GHC.Internal.Classes.IP") gHC_PRIMOPWRAPPERS = mkGhcInternalModule (fsLit "GHC.Internal.PrimopWrappers") gHC_INTERNAL_TUPLE = mkGhcInternalModule (fsLit "GHC.Internal.Tuple") @@ -1521,7 +1522,7 @@ fromLabelClassOpName -- Implicit Parameters ipClassName :: Name ipClassName - = clsQual gHC_CLASSES (fsLit "IP") ipClassKey + = clsQual gHC_CLASSES_IP (fsLit "IP") ipClassKey -- Overloaded record fields hasFieldClassName :: Name ===================================== docs/users_guide/9.16.1-notes.rst ===================================== @@ -30,6 +30,18 @@ Language - The extension :extension:`ExplicitNamespaces` now allows namespace-specified wildcards ``type ..`` and ``data ..`` in import and export lists. +- Implicit parameters and ``ImpredicativeTypes``. GHC now knows + that if ``?foo::S`` is coecible to ``?foo::T`` only if ``S`` is coercible to ``T``. + Example (from :ghc-ticket:`#26737`):: + + {-# LANGUAGE ImplicitParams, ImpredicativeTypes #-} + newtype N = MkN Int + test :: ((?foo::N) => Bool) -> ((?foo::Int) => Bool) + test = coerce + + This is achieved by arranging that ``?foo :: T`` has a representational + role for ``T``. + Compiler ~~~~~~~~ ===================================== hadrian/doc/flavours.md ===================================== @@ -37,8 +37,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>default </td> <td> </td> - <td>-O -H32m </td> - <td>-O2 -H32m</td> + <td>-O +RTS -O64M -RTS </td> + <td>-O2 +RTS -O64M -RTS</td> <td></td> <td>-haddock</td> <td></td> @@ -49,8 +49,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick</td> <td> </td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -61,8 +61,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-validate</td> <td></td> - <td>-O0 -H64m -Werror</td> - <td>-O0 -H64m -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> + <td>-O0 +RTS -O64M -RTS -Werror</td> <td></td> <td>-O</td> <td>-O2</td> @@ -73,8 +73,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quick-debug</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td>-O</td> <td>-O2</td> @@ -85,8 +85,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>quickest</td> <td></td> - <td>-O0 -H64m</td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> + <td>-O0 +RTS -O64M -RTS</td> <td></td> <td></td> <td>-O</td> @@ -97,8 +97,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>perf</td> <td> Yes (on supported platforms) </td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -109,8 +109,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>release (same as perf with -haddock and +no_self_recomp+hash_unit_ids)</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -121,8 +121,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>bench</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-O2</td> <td>-O2</td> @@ -133,8 +133,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel1</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O0 -DDEBUG</td> @@ -145,8 +145,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>devel2</td> <td></td> - <td>-O -H64m</td> - <td>-O -H64m</td> + <td>-O +RTS -O64M -RTS</td> + <td>-O +RTS -O64M -RTS</td> <td></td> <td>-dcore-lint</td> <td>-O2</td> @@ -157,7 +157,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage -fcheck-prim-bounds</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -169,7 +169,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>slow-validate</td> <td></td> - <td>-O0 -H64m</td> + <td>-O0 +RTS -O64M -RTS</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> <td>-O -dcore-lint -dno-debug-output</td> @@ -181,8 +181,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <tr> <th>static</td> <td></td> - <td>-O -H64m -fPIC -static</td> - <td>-O -H64m -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> + <td>-O +RTS -O64M -RTS -fPIC -static</td> <td></td> <td>-O2</td> <td>-O2</td> ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -274,7 +274,7 @@ defaultSourceArgs :: SourceArgs defaultSourceArgs = SourceArgs { hsDefault = mconcat [ stage0 ? arg "-O" , notStage0 ? arg "-O2" - , arg "-H32m" ] + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-haddock" , hsCompiler = mempty , hsGhc = mempty } ===================================== hadrian/src/Settings/Flavours/Benchmark.hs ===================================== @@ -16,7 +16,7 @@ benchmarkFlavour = defaultFlavour benchmarkArgs :: Args benchmarkArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = pure ["-O2"] -- TODO: We should really pass -O2 when notStage0. Otherwise, we aren't -- really measuring the overhead of a potential new optimisation we want ===================================== hadrian/src/Settings/Flavours/Development.hs ===================================== @@ -26,7 +26,7 @@ developmentFlavour ghcStage = defaultFlavour developmentArgs :: Stage -> Args developmentArgs ghcStage = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O", "-H64m"], + { hsDefault = mconcat [ pure ["-O", "+RTS", "-O64M", "-RTS"], -- Disable optimization when building Cabal; -- this saves many minutes of build time. package cabal ? pure ["-O0"]] ===================================== hadrian/src/Settings/Flavours/GhcInGhci.hs ===================================== @@ -22,7 +22,7 @@ ghcInGhciFlavour = defaultFlavour ghciArgs :: Args ghciArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = mempty ===================================== hadrian/src/Settings/Flavours/Performance.hs ===================================== @@ -12,7 +12,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour performanceArgs :: Args performanceArgs = sourceArgs SourceArgs - { hsDefault = pure ["-O", "-H64m"] + { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] , hsLibrary = orM [notStage0, cross] ? arg "-O2" , hsCompiler = pure ["-O2"] , hsGhc = mconcat ===================================== hadrian/src/Settings/Flavours/Quick.hs ===================================== @@ -34,7 +34,7 @@ quickFlavour = defaultFlavour quickArgs :: Args quickArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ pure ["-O0", "-H64m"] ] + { hsDefault = mconcat [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? arg "-O" , hsCompiler = stage0 ? arg "-O2" , hsGhc = stage0 ? arg "-O" } ===================================== hadrian/src/Settings/Flavours/QuickCross.hs ===================================== @@ -32,7 +32,7 @@ quickCrossFlavour = defaultFlavour quickCrossArgs :: Args quickCrossArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = notStage0 ? mconcat [ arg "-O", arg "-fllvm" ] , hsCompiler = stage0 ? arg "-O2" ===================================== hadrian/src/Settings/Flavours/Quickest.hs ===================================== @@ -19,7 +19,7 @@ quickestFlavour = defaultFlavour quickestArgs :: Args quickestArgs = sourceArgs SourceArgs { hsDefault = mconcat $ - [ pure ["-O0", "-H64m"] + [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ] , hsLibrary = mempty , hsCompiler = stage0 ? arg "-O" ===================================== hadrian/src/Settings/Flavours/Validate.hs ===================================== @@ -16,11 +16,12 @@ validateFlavour = enableLinting $ quickValidateFlavour validateArgs :: Args validateArgs = sourceArgs SourceArgs - { hsDefault = mconcat [ stage0 ? pure ["-O0", "-H64m"] + { hsDefault = mconcat [ stage0 ? pure ["-O0"] -- See #11487 , notStage0 ? arg "-fllvm-fill-undef-with-garbage" , notStage0 ? arg "-dno-debug-output" , notStage0 ? arg "-fcheck-prim-bounds" + , pure ["+RTS", "-O64M", "-RTS"] ] , hsLibrary = pure ["-O"] , hsCompiler = mconcat [ stage0 ? pure ["-O2"] @@ -37,7 +38,7 @@ slowValidateFlavour = validateFlavour quickValidateArgs :: Args quickValidateArgs = sourceArgs SourceArgs - { hsDefault = mempty + { hsDefault = pure ["+RTS", "-O64M", "-RTS"] , hsLibrary = pure [ "-O" ] , hsCompiler = mconcat [ stage0 ? arg "-O2", notStage0 ? arg "-O"] , hsGhc = pure [ "-O", "-hide-all-packages" ] ===================================== libraries/ghc-internal/ghc-internal.cabal.in ===================================== @@ -343,6 +343,7 @@ Library GHC.Internal.CString GHC.Internal.Classes + GHC.Internal.Classes.IP GHC.Internal.Debug GHC.Internal.Magic GHC.Internal.Magic.Dict ===================================== libraries/ghc-internal/src/GHC/Internal/Classes.hs ===================================== @@ -1,10 +1,9 @@ {-# LANGUAGE Trustworthy #-} {-# LANGUAGE NoImplicitPrelude, MagicHash, StandaloneDeriving, BangPatterns, KindSignatures, DataKinds, ConstraintKinds, - MultiParamTypeClasses, FunctionalDependencies #-} -{-# LANGUAGE UnboxedTuples #-} -{-# LANGUAGE AllowAmbiguousTypes #-} - -- ip :: IP x a => a is strictly speaking ambiguous, but IP is magic + MultiParamTypeClasses, FunctionalDependencies, + UnboxedTuples #-} + {-# LANGUAGE UndecidableSuperClasses #-} -- Because of the type-variable superclasses for tuples @@ -142,6 +141,7 @@ import GHC.Internal.Prim import GHC.Internal.Tuple import GHC.Internal.CString (unpackCString#) import GHC.Internal.Types +import GHC.Internal.Classes.IP infix 4 ==, /=, <, <=, >=, > infixr 3 && @@ -149,12 +149,6 @@ infixr 2 || default () -- Double isn't available yet --- | The syntax @?x :: a@ is desugared into @IP "x" a@ --- IP is declared very early, so that libraries can take --- advantage of the implicit-call-stack feature -class IP (x :: Symbol) a | x -> a where - ip :: a - {- $matching_overloaded_methods_in_rules Matching on class methods (e.g. @(==)@) in rewrite rules tends to be a bit ===================================== libraries/ghc-internal/src/GHC/Internal/Classes/IP.hs ===================================== @@ -0,0 +1,87 @@ +{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE NoImplicitPrelude, MagicHash, StandaloneDeriving, BangPatterns, + KindSignatures, DataKinds, ConstraintKinds, + MultiParamTypeClasses, FunctionalDependencies #-} + +{-# LANGUAGE AllowAmbiguousTypes, RoleAnnotations, IncoherentInstances #-} + -- LANGUAGE pragmas: see Note [IP: implicit parameter class] + +{-# OPTIONS_HADDOCK not-home #-} +----------------------------------------------------------------------------- +-- | +-- Module : GHC.Internal.Classes.IP +-- Copyright : (c) The University of Glasgow, 1992-2002 +-- License : see libraries/base/LICENSE +-- +-- Maintainer : ghc-devs(a)haskell.org +-- Stability : internal +-- Portability : non-portable (GHC extensions) +-- +-- Basic classes. +-- Do not import this module directly. It is an GHC internal only +-- module. Some of its contents are instead available from @Prelude@ +-- and @GHC.Int@. +-- +----------------------------------------------------------------------------- + +module GHC.Internal.Classes.IP( IP(..)) where + +import GHC.Internal.Types + + +default () -- Double isn't available yet + +-- | The syntax @?x :: a@ is desugared into @IP "x" a@ +-- IP is declared very early, so that libraries can take +-- advantage of the implicit-call-stack feature +type role IP nominal representational -- See (IPRoles) +class IP (x :: Symbol) a | x -> a where + ip :: a + +{- Note [IP: implicit parameter class] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +An implicit parameter constraint (?foo::ty) is just short for + + IP "foo" ty + +where ghc-internal:GHC.Internal.Classes.IP is a special class that +GHC knows about, defined in this module. + +* It is a unary type class, with one method `ip`, so it has no cost. + For example, (?foo::Int) is represented just by an Int. + +* Criticially, it has a functional dependency: + class IP (x :: Symbol) a | x -> a where ... + So if we have + [G] IP "foo" Int + [W] IP "foo" alpha + the fundep wil lgive us alpha ~ Int, as desired. + +* The solver has a number of special cases for implicit parameters, + mainly because a binding (let ?foo::Int = rhs in body) + is like a local instance declaration for IP. Search for uses + of `isIPClass`. + +Wrinkles + +(IPAmbiguity) The single method of IP has an ambiguous type + ip :: forall a. IP s a => a + Hence the LANGUAGE pragama AllowAmbiguousTypes. + The method `ip` is never called by the user, so ambiguity doesn't matter. + +(IPRoles) IP has a role annotation. Why? See #26737. We want + [W] IP "foo" t1 ~R# IP "foo" t2 + to decompose to give [W] IP t1 ~R# t2, using /representational/ + equality for (t1 ~R# t2) not nominal. + + This usually gives a complaint about incoherence, because in general + (t1 ~R# t2) does NOT imply (C t1) ~R# (C t2) for any normal class. + But it does for IP, because instance selection is controlled by the Symbol, + not the type of the payload. Hence LANGUAGE pragma IncoherentInstances. + (It is unfortunate that we need a module-wide IncoherentInstances here; + see #17167.) + + Side note: arguably this treatment could be applied to any class + with a functional dependency; but for now we restrict it to IP. +-} + ===================================== rts/win32/libHSffi.def deleted ===================================== @@ -1,19 +0,0 @@ - -LIBRARY "libHSffi-ghc@ProjectVersion@.dll" - -EXPORTS - - ffi_prep_cif - ffi_call - ffi_type_void - ffi_type_float - ffi_type_double - ffi_type_sint64 - ffi_type_uint64 - ffi_type_sint32 - ffi_type_uint32 - ffi_type_sint16 - ffi_type_uint16 - ffi_type_sint8 - ffi_type_uint8 - ffi_type_pointer ===================================== rts/win32/libHSghc-internal.def deleted ===================================== @@ -1,49 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - ghczminternal_GHCziInternalziInt_I8zh_con_info - ghczminternal_GHCziInternalziInt_I16zh_con_info - ghczminternal_GHCziInternalziInt_I32zh_con_info - ghczminternal_GHCziInternalziInt_I64zh_con_info - - ghczminternal_GHCziInternalziWord_W8zh_con_info - ghczminternal_GHCziInternalziWord_W16zh_con_info - ghczminternal_GHCziInternalziWord_W32zh_con_info - ghczminternal_GHCziInternalziWord_W64zh_con_info - - ghczminternal_GHCziInternalziStable_StablePtr_con_info - - ghczminternal_GHCziInternalziPack_unpackCString_closure - - ghczminternal_GHCziInternalziTopHandler_runIO_closure - ghczminternal_GHCziInternalziTopHandler_runNonIO_closure - - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_heapOverflow_closure - - ghczminternal_GHCziInternalziPtr_Ptr_con_info - ghczminternal_GHCziInternalziPtr_FunPtr_con_info - - ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure - ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure - ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure - ghczminternal_GHCziInternalziConcziSync_runSparks_closure - ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure - - ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure - - ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure - ghczminternal_GHCziInternalziPack_unpackCString_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure - ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure - ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure - ghczminternal_GHCziInternalziIOziException_stackOverflow_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure - ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure - ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure - ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure - ghczminternal_GHCziInternalziExceptionziType_underflowException_closure - ghczminternal_GHCziInternalziExceptionziType_overflowException_closure ===================================== rts/win32/libHSghc-prim.def deleted ===================================== @@ -1,14 +0,0 @@ - -LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll" - -EXPORTS - - ghczminternal_GHCziInternalziTypes_True_closure - ghczminternal_GHCziInternalziTypes_False_closure - ghczminternal_GHCziInternalziTypes_Czh_con_info - ghczminternal_GHCziInternalziTypes_Izh_con_info - ghczminternal_GHCziInternalziTypes_Fzh_con_info - ghczminternal_GHCziInternalziTypes_Dzh_con_info - ghczminternal_GHCziInternalziTypes_Wzh_con_info - ghczminternal_GHCziInternalziTypes_Czh_static_info - ghczminternal_GHCziInternalziTypes_Izh_static_info ===================================== testsuite/tests/interface-stability/base-exports.stdout ===================================== @@ -3293,6 +3293,7 @@ module GHC.Base where {-# MINIMAL fmap #-} type IO :: * -> * newtype IO a = IO (State# RealWorld -> (# State# RealWorld, a #)) + type role IP nominal representational type IP :: Symbol -> * -> Constraint class IP x a | x -> a where ip :: a ===================================== testsuite/tests/interface-stability/base-exports.stdout-mingw32 ===================================== @@ -3293,6 +3293,7 @@ module GHC.Base where {-# MINIMAL fmap #-} type IO :: * -> * newtype IO a = IO (State# RealWorld -> (# State# RealWorld, a #)) + type role IP nominal representational type IP :: Symbol -> * -> Constraint class IP x a | x -> a where ip :: a ===================================== testsuite/tests/interface-stability/base-exports.stdout-ws-32 ===================================== @@ -3293,6 +3293,7 @@ module GHC.Base where {-# MINIMAL fmap #-} type IO :: * -> * newtype IO a = IO (State# RealWorld -> (# State# RealWorld, a #)) + type role IP nominal representational type IP :: Symbol -> * -> Constraint class IP x a | x -> a where ip :: a ===================================== testsuite/tests/interface-stability/ghc-prim-exports.stdout ===================================== @@ -1171,6 +1171,7 @@ module GHC.Classes where (==) :: a -> a -> GHC.Internal.Types.Bool (/=) :: a -> a -> GHC.Internal.Types.Bool {-# MINIMAL (==) | (/=) #-} + type role IP nominal representational type IP :: GHC.Internal.Types.Symbol -> * -> Constraint class IP x a | x -> a where ip :: a ===================================== testsuite/tests/interface-stability/ghc-prim-exports.stdout-mingw32 ===================================== @@ -1171,6 +1171,7 @@ module GHC.Classes where (==) :: a -> a -> GHC.Internal.Types.Bool (/=) :: a -> a -> GHC.Internal.Types.Bool {-# MINIMAL (==) | (/=) #-} + type role IP nominal representational type IP :: GHC.Internal.Types.Symbol -> * -> Constraint class IP x a | x -> a where ip :: a ===================================== testsuite/tests/th/TH_implicitParams.stdout ===================================== @@ -1,5 +1,5 @@ -Main.funcToReify :: GHC.Internal.Classes.IP "z" - GHC.Internal.Types.Int => +Main.funcToReify :: GHC.Internal.Classes.IP.IP "z" + GHC.Internal.Types.Int => GHC.Internal.Types.Int 5 1 ===================================== testsuite/tests/typecheck/should_compile/T26737.hs ===================================== @@ -0,0 +1,10 @@ +{-# LANGUAGE ImpredicativeTypes, ImplicitParams #-} + +module T26737 where + +import Data.Coerce + +newtype Foo = MkFoo Int + +b :: ((?foo :: Foo) => Int) -> ((?foo :: Int) => Int) +b = coerce @(((?foo :: Foo) => Int)) @(((?foo :: Int) => Int)) ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -958,3 +958,4 @@ test('T14745', normal, compile, ['']) test('T26451', normal, compile, ['']) test('T26582', normal, compile, ['']) test('T26746', normal, compile, ['']) +test('T26737', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca0b66aebbb0d7c8852bf24854c788… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca0b66aebbb0d7c8852bf24854c788… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26503] 70 commits: GHC.Internal.Exception.Context: Fix comment
by Brandon Chinn (＠brandonchinn178) 18 Jan '26

18 Jan '26

Brandon Chinn pushed to branch wip/T26503 at Glasgow Haskell Compiler / GHC Commits: 6213bb57 by maralorn at 2026-01-02T16:30:32+01:00 GHC.Internal.Exception.Context: Fix comment on addExceptionAnnotation - - - - - b820ff50 by Janis Voigtlaender at 2026-01-05T02:43:18-05:00 GHC.Internal.Control.Monad.replicateM: Fix comment - - - - - a8a94aad by Cheng Shao at 2026-01-05T16:24:04-05:00 hadrian: drops unused PE linker script for windows This patch drops unused PE linker script for windows in the `MergeObjects` builder of hadrian. The linker script is used for merging object files into a single `HS*.o` object file and undoing the effect of split sections, when building the "ghci library" object file. However, we don't build the ghci library on windows, and this code path is actually unreachable. - - - - - 53038ea9 by Cheng Shao at 2026-01-05T16:24:04-05:00 hadrian: drop unused logic for building ghci libraries This patch drops the unused logic for building ghci libraries in hadrian: - The term "ghci library" refers to an optional object file per library `HS*.o`, which is merged from multiple object files in that library using the `MergeObjects` builder in hadrian. - The original rationale of having a ghci library object, in addition to normal archives, was to speedup ghci loading, since the combined object is linked with a linker script to undo the effects of `-fsplit-sections` to reduce section count and make it easier for the RTS linker to handle. - However, most GHC builds enable `dynamicGhcPrograms` by default, in such cases the ghci library would already not be built. - `dynamicGhcPrograms` is disabled on Windows, but still we don't build the ghci library due to lack of functioning merge objects command. - The only case that we actually build ghci library objects, are alpine fully static bindists. However, for other reasons, split sections is already disabled for fully static builds anyway! - There will not be any regression if the ghci library objects are absent from a GHC global libdir when `dynamicGhcPrograms` is disabled. The RTS linker can already load the archives without any issue. Hence the removal. We now forcibly disable ghci libraries for all Cabal components, and rip out all logic related to `MergeObjects` and ghci libraries in hadrian. This also nicely cleans up some old todos and fixmes that are no longer relevant. Note that MergeObjects in hadrian is not the same thing as merge objects in the GHC driver. The latter is not affected by this patch. ------------------------- Metric Decrease: libdir ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 8f209336 by Simon Jakobi at 2026-01-05T16:24:48-05:00 User's guide: Fix link to language extensions Instead of linking to haddocks, it seemed more useful to link to the extension overview in the user's guide. Closes #26614. - - - - - 0b7df6db by Simon Peyton Jones at 2026-01-06T09:32:23-05:00 Improved fundeps for closed type families The big payload of this commit is to execute the plan suggested in #23162, by improving the way that we generate functional dependencies for closed type families. It is all described in Note [Exploiting closed type families] Most of the changes are in GHC.Tc.Solver.FunDeps Other small changes * GHC.Tc.Solver.bumpReductionDepth. This function brings together the code that * Bumps the depth * Checks for overflow Previously the two were separated, sometimes quite widely. * GHC.Core.Unify.niFixSubst: minor improvement, removing an unnecessary itraetion in the base case. * GHC.Core.Unify: no need to pass an InScopeSet to tcUnifyTysForInjectivity. It can calculate one for itself; and it is never inspected anyway so it's free to do so. * GHC.Tc.Errors.Ppr: slight impovement to the error message for reduction-stack overflow, when a constraint (rather than a type) is involved. * GHC.Tc.Solver.Monad.wrapUnifier: small change to the API - - - - - fde8bd88 by Simon Peyton Jones at 2026-01-06T09:32:23-05:00 Add missing (KK4) to kick-out criteria There was a missing case in kick-out that meant we could fail to solve an eminently-solvable constraint. See the new notes about (KK4) - - - - - 00082844 by Simon Peyton Jones at 2026-01-06T09:32:23-05:00 Some small refactorings of error reporting in the typechecker This is just a tidy-up commit. * Add ei_insoluble to ErrorItem, to cache insolubility. Small tidy-up. * Remove `is_ip` and `mkIPErr` from GHC.Tc.Errors; instead enhance mkDictErr to handle implicit parameters. Small refactor. - - - - - fe4cb252 by Simon Peyton Jones at 2026-01-06T09:32:24-05:00 Improve recording of insolubility for fundeps This commit addresses #22652, by recording when the fundeps for a constraint are definitely insoluble. That in turn improves the perspicacity of the pattern-match overlap checker. See Note [Insoluble fundeps] - - - - - df0ffaa5 by Simon Peyton Jones at 2026-01-06T09:32:24-05:00 Fix a buglet in niFixSubst The MR of which this is part failed an assertion check extendTvSubst because we extended the TvSubst with a CoVar. Boo. This tiny patch fixes it, and adds the regression test from #13882 that showed it up. - - - - - 3d6aba77 by konsumlamm at 2026-01-06T09:33:16-05:00 Fix changelog formatting - - - - - 69e0ab59 by Cheng Shao at 2026-01-06T19:37:56-05:00 compiler: add targetHasRTSWays function This commit adds a `targetHasRTSWays` util function in `GHC.Driver.Session` to query if the target RTS has a given Ways (e.g. WayThreaded). - - - - - 25a0ab94 by Cheng Shao at 2026-01-06T19:37:56-05:00 compiler: link on-demand external interpreter with threaded RTS This commit makes the compiler link the on-demand external interpreter program with threaded RTS if it is available in the target RTS ways. This is a better default than the previous single-threaded RTS, and it enables the external interpreter to benefit from parallelism when deserializing CreateBCOs messages. - - - - - 92404a2b by Cheng Shao at 2026-01-06T19:37:56-05:00 hadrian: link iserv with threaded RTS This commit makes hadrian link iserv with threaded RTS if it's available in the RTS ways. Also cleans up the iserv main C program which can be replaced by the `-fkeep-cafs` link-time option. - - - - - a20542d2 by Cheng Shao at 2026-01-06T19:38:38-05:00 ghc-internal: remove unused GMP macros This patch removes unused GMP related macros from `ghc-internal`. The in-tree GMP version was hard coded and outdated, but it was not used anywhere anyway. - - - - - 4079dcd6 by Cheng Shao at 2026-01-06T19:38:38-05:00 hadrian: fix in-tree gmp configure error on newer c compilers Building in-tree gmp on newer c compilers that default to c23 fails at configure stage, this patch fixes it, see added comment for explanation. - - - - - 414d1fe1 by Cheng Shao at 2026-01-06T19:39:20-05:00 compiler: fix LLVM backend pdep/pext handling for i386 target This patch fixes LLVM backend's pdep/pext handling for i386 target, and also removes non-existent 128/256/512 bit hs_pdep/hs_pext callees. See amended note for more explanation. Fixes #26450. Co-authored-by: Codex <codex(a)openai.com> - - - - - c7f6fba3 by Cheng Shao at 2026-01-06T19:39:20-05:00 ci: remove allow_failure flag for i386 alpine job The LLVM codegen issue for i386 has been fixed, and the i386 alpine job should pass now. This commit removes the allow_failure flag so that other i386 regressions in the future are signaled more timely. - - - - - 52d00c05 by Simon Peyton Jones at 2026-01-07T10:24:21-05:00 Add missing InVar->OutVar lookup in SetLevels As #26681 showed, the SetLevels pass was failing to map an InVar to an OutVar. Very silly! I'm amazed it hasn't broken before now. I have improved the type singatures (to mention InVar and OutVar) so it's more obvious what needs to happen. - - - - - ab0a5594 by Cheng Shao at 2026-01-07T10:25:04-05:00 hadrian: drop deprecated pkgHashSplitObjs code path This patch drops deprecated `pkgHashSplitObjs` code path from hadrian, since GHC itself has removed split objs support many versions ago and this code path is unused. - - - - - bb3a2ba1 by Cheng Shao at 2026-01-07T10:25:44-05:00 hadrian: remove linting/assertion in quick-validate flavour The `quick-validate` flavour is meant for testing ghc and passing the testsuite locally with similar settings to `validate` but faster. This patch removes the linting/assertion overhead in `quick-validate` to improve developer experience. I also took the chance to simplify redundant logic of rts/library way definition in `validate` flavour. - - - - - 7971f5dd by Cheng Shao at 2026-01-07T10:26:26-05:00 deriveConstants: clean up unused constants This patch cleans up unused constants from `deriveConstants`, they are not used by C/Cmm code in the RTS, nor compiler-generated code. Co-authored-by: Codex <codex(a)openai.com> - - - - - 4df96993 by Cheng Shao at 2026-01-07T10:27:08-05:00 hadrian: pass -fno-omit-frame-pointer with +debug_info This patch adds `-fno-omit-frame-pointer` as C/C++ compilation flag when compiling with `+debug_info` flavour transformer. It's a sane default when you care about debugging and reliable backtraces, and makes debugging/profiling with bpf easier. - - - - - 8a3900a3 by Aaron Allen at 2026-01-07T10:27:57-05:00 [26705] Include TyCl instances in data fam iface entry Ensures dependent modules are recompiled when the class instances for a data family instance change. resolves #26705 - - - - - a0b980af by Cheng Shao at 2026-01-07T10:28:38-05:00 hadrian: remove unused Hp2Ps/Hpc builders This patch removes the Hp2Ps/Hpc builders from hadrian, they are unused in the build system. Note that the hp2ps/hpc programs are still built and not affected. - - - - - 50a58757 by Cheng Shao at 2026-01-07T10:29:20-05:00 hadrian: only install js files to libdir for wasm/js targets There are certain js files required for wasm/js targets to work, and previously hadrian would install those js files to libdir unconditionally on other targets as well. This could be a minor annoyance for packagers especially when the unused js files contain shebangs that interfere with the packaging process. This patch makes hadrian only selectively install the right js files for the right targets. Co-authored-by: Codex <codex(a)openai.com> - - - - - da40e553 by Simon Peyton Jones at 2026-01-07T10:30:00-05:00 Add flavour transformer assertions_stage1 This allows us to enable -DDEBUG assertions in the stage1 compiler - - - - - ec3cf767 by Cheng Shao at 2026-01-08T06:24:31-05:00 make: remove unused Makefiles from legacy make build system This patch removes unused Makefiles from legacy make build system; now they are never used by hadrian in any way, and they already include common boilerplate mk files that are long gone in the make build system removal, hence the housecleaning. Co-authored-by: Codex <codex(a)openai.com> - - - - - 04ea3f83 by Cheng Shao at 2026-01-08T06:25:13-05:00 compiler: use -O3 as LLVM optimization level for ghc -O2 The GHC driver clamps LLVM optimization level to `-O2` due to LLVM crashes, but those were historical issues many years ago that are no longer relevant for LLVM versions we support today. This patch changes the driver to use `-O3` as LLVM optimization level when compiling with `-O2`, which is a better default when we're willing to trade compilation time for faster generated code. - - - - - 472df471 by Peter Trommler at 2026-01-08T13:28:54-05:00 Use half-word literals in info tables With this commit info tables are mapped to the same assembler code on big-endian and little-endian platforms. Fixes #26579. - - - - - 393f9c51 by Simon Peyton Jones at 2026-01-08T13:29:35-05:00 Refactor srutOkForBinderSwap This MR does a small refactor: * Moves `scrutOkForBinderSwap` and `BinderSwapDecision` to GHC.Core.Utils * Inverts the sense of the coercion it returns, which makes more sense No effect on behaviour - - - - - ad76fb0f by Simon Peyton Jones at 2026-01-08T13:29:36-05:00 Improve case merging This small MR makes case merging happen a bit more often than it otherwise could, by getting join points out of the way. See #26709 and GHC.Core.Utils Note [Floating join points out of DEFAULT alternatives] - - - - - 4c9395f5 by Cheng Shao at 2026-01-08T13:30:16-05:00 hadrian: remove broken hsc2hs flag when cross compiling to windows This patch removes the `--via-asm` hsc2hs flag when cross compiling to windows. With recent llvm-mingw toolchain, it would fail with: ``` x86_64-w64-mingw32-hsc2hs: Cannot combine instructions: [Quad 8,Long 4,Long 241,Ref ".Ltmp1-.Ltmp0"] ``` The hsc2hs default `--cross-compile` logic is slower but works. - - - - - 71fdef55 by Simon Peyton Jones at 2026-01-08T13:30:57-05:00 Try harder to keep the substitution empty Avoid unnecessary cloning of variables in the Simplifier. Addresses #26724, See Note [Keeping the substitution empty] We get some big wins in compile time Metrics: compile_time/bytes allocated ------------------------------------- Baseline Test Metric value New value Change ---------------------------------------------------------------------------- CoOpt_Singletons(normal) ghc/alloc 721,544,088 692,174,216 -4.1% GOOD LargeRecord(normal) ghc/alloc 1,268,031,157 1,265,168,448 -0.2% T14766(normal) ghc/alloc 918,218,533 688,432,296 -25.0% GOOD T15703(normal) ghc/alloc 318,103,629 306,638,016 -3.6% GOOD T17836(normal) ghc/alloc 419,174,584 418,400,824 -0.2% T18478(normal) ghc/alloc 471,042,976 470,261,376 -0.2% T20261(normal) ghc/alloc 573,387,162 563,663,336 -1.7% T24984(normal) ghc/alloc 87,832,666 87,636,168 -0.2% T25196(optasm) ghc/alloc 1,103,284,040 1,101,376,992 -0.2% hard_hole_fits(normal) ghc/alloc 224,981,413 224,608,208 -0.2% geo. mean -0.3% minimum -25.0% maximum +0.1% Metric Decrease: CoOpt_Singletons T14766 T15703 - - - - - 30341168 by Simon Peyton Jones at 2026-01-08T13:31:38-05:00 Add regression test for #24867 - - - - - 1ac1a541 by Julian Ospald at 2026-01-09T02:48:53-05:00 Support statically linking executables properly Fixes #26434 In detail, this does a number of things: * Makes GHC aware of 'extra-libraries-static' (this changes the package database format). * Adds a switch '-static-external' that will honour 'extra-libraries-static' to link external system dependencies statically. * Adds a new field to settings/targets: "ld supports verbatim namespace". This field is used by '-static-external' to conditionally use '-l:foo.a' syntax during linking, which is more robust than trying to find the absolute path to an archive on our own. * Adds a switch '-fully-static' that is meant as a high-level interface for e.g. cabal. This also honours 'extra-libraries-static'. This also attempts to clean up the confusion around library search directories. At the moment, we have 3 types of directories in the package database format: * library-dirs * library-dirs-static * dynamic-library-dirs However, we only have two types of linking: dynamic or static. Given the existing logic in 'mungeDynLibFields', this patch assumes that 'library-dirs' is really just nothing but a fallback and always prefers the more specific variants if they exist and are non-empty. Conceptually, we should be ok with even just one search dirs variant. Haskell libraries are named differently depending on whether they're static or dynamic, so GHC can conveniently pick the right one depending on the linking needs. That means we don't really need to play tricks with search paths to convince the compiler to do linking as we want it. For system C libraries, the convention has been anyway to place static and dynamic libs next to each other, so we need to deal with that issue anyway and it is outside of our control. But this is out of the scope of this patch. This patch is backwards compatible with cabal. Cabal should however be patched to use the new '-fully-static' switch. - - - - - ad3c808d by Julian Ospald at 2026-01-09T02:48:53-05:00 Warn when "-dynamic" is mixed with "-staticlib" - - - - - 322dd672 by Matthew Pickering at 2026-01-09T02:49:35-05:00 rts: Use INFO_TABLE_CONSTR for stg_dummy_ret_closure Since the closure type is CONSTR_NOCAF, we need to use INFO_TABLE_CONSTR to populate the constructor description field (this crashes ghc-debug when decoding AP_STACK frames sometimes) Fixes #26745 - - - - - 039bac4c by Ben Gamari at 2026-01-09T20:22:16-05:00 ghc-internal: Move STM utilities out of GHC.Internal.Conc.Sync This is necessary to avoid an import cycle on Windows when importing `GHC.Internal.Exception.Context` in `GHC.Internal.Conc.Sync`. On the road to address #25365. - - - - - 8c389e8c by Ben Gamari at 2026-01-09T20:22:16-05:00 base: Capture backtrace from throwSTM Implements core-libraries-committee#297. Fixes #25365. - - - - - e1ce1fc3 by Ben Gamari at 2026-01-09T20:22:16-05:00 base: Annotate rethrown exceptions in catchSTM with WhileHandling Implements core-libraries-committee#298 - - - - - c4ebdbdf by Cheng Shao at 2026-01-09T20:23:06-05:00 compiler: make getPrim eagerly evaluate its result This commit makes `GHC.Utils.Binary.getPrim` eagerly evaluate its result, to avoid accidental laziness when future patches build other binary parsers using `getPrim`. - - - - - 66a0c4f7 by Cheng Shao at 2026-01-09T20:23:06-05:00 compiler: implement fast get/put for Word16/Word32/Word64 Previously, `GHC.Utils.Binary` contains `get`/`put` functions for `Word16`/`Word32`/`Word64` which always loads and stores them as big-endian words at a potentially unaligned address. The previous implementation is based on loads/stores of individual bytes and concatenating bytes with bitwise operations, which currently cannot be fused to a single load/store operation by GHC. This patch implements fast `get`/`put` functions for `Word16`/`Word32`/`Word64` based on a single memory load/store, with an additional `byteSwap` operation on little-endian hosts. It is based on unaligned load/store primops added since GHC 9.10, and we already require booting with at least 9.10, so it's about time to switch to this faster path. - - - - - 641ec3f0 by Simon Peyton Jones at 2026-01-09T20:23:55-05:00 Fix scoping errors in specialisation Using -fspecialise-aggressively in #26682 showed up a couple of subtle errors in the type-class specialiser. * dumpBindUDs failed to call `deleteCallsMentioning`, resulting in a call that mentioned a dictionary that was not in scope. This call has been missing since 2009! commit c43c981705ec33da92a9ce91eb90f2ecf00be9fe Author: Simon Peyton Jones <simonpj(a)microsoft.com> Date: Fri Oct 23 16:15:51 2009 +0000 Fixed by re-combining `dumpBindUDs` and `dumpUDs`. * I think there was another bug involving the quantified type variables in polymorphic specialisation. In any case I refactored `specHeader` and `spec_call` so that the former looks for the extra quantified type variables rather than the latter. This is quite a worthwhile simplification: less code, easier to grok. Test case in simplCore/should_compile/T26682, brilliantly minimised by @sheaf. - - - - - 2433e91d by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: change sectionProtection to take SectionType argument This commit changes `sectionProtection` to only take `SectionType` argument instead of whole `Section`, since it doesn't need the Cmm section content anyway, and it can then be called in parts of NCG where we only have a `SectionType` in scope. - - - - - e5926fbe by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: change isInitOrFiniSection to take SectionType argument This commit changes `isInitOrFiniSection` to only take `SectionType` argument instead of whole `Section`, since it doesn't need the Cmm section content anyway, and it can then be called in parts of NCG where we only have a `SectionType` in scope. Also marks it as exported. - - - - - 244d57d7 by Cheng Shao at 2026-01-09T20:24:43-05:00 compiler: fix split sections on windows This patch fixes split sections on windows by emitting the right COMDAT section header in NCG, see added comment for more explanation. Fix #26696 #26494. ------------------------- Metric Decrease: LargeRecord T9675 size_hello_artifact size_hello_artifact_gzip size_hello_unicode size_hello_unicode_gzip Metric Increase: T13035 ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 182f3d0f by Cheng Shao at 2026-01-09T20:25:28-05:00 iserv: add comment about -fkeep-cafs - - - - - 49675b69 by Matthew Craven at 2026-01-09T20:26:14-05:00 Account for "stupid theta" in demand sig for DataCon wrappers Fixes #26748. - - - - - f3c18890 by Samuel Thibault at 2026-01-10T15:48:22+01:00 hurd: Fix getExecutablePath build 3939a8bf93e27 ("GNU/Hurd: Add getExecutablePath support") added using /proc/self/exe for GNU/Hurd but missed adding the required imports for the corresponding code. - - - - - 7f15bd15 by Samuel Thibault at 2026-01-12T07:16:25-05:00 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - 1db2f240 by Andrew Lelechenko at 2026-01-12T07:17:06-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - 023c301c by sheaf at 2026-01-13T04:57:30-05:00 Don't re-use stack slots for growing registers This commit avoids re-using a stack slot for a register that has grown but already had a stack slot. For example, suppose we have stack slot assigments %v1 :: FF64 |-> StackSlot 0 %v2 :: FF64 |-> StackSlot 1 Later, we start using %v1 at a larger format (e.g. F64x2) and we need to spill it again. Then we **must not** use StackSlot 0, as a spill at format F64x2 would clobber the data in StackSlot 1. This can cause some fragmentation of the `StackMap`, but that's probably OK. Fixes #26668 - - - - - d0966e64 by fendor at 2026-01-13T04:58:11-05:00 Remove `traceId` from ghc-pkg executable - - - - - 20d7efec by Simon Peyton Jones at 2026-01-13T12:41:22-05:00 Make SpecContr rules fire a bit later See #26615 and Note [SpecConstr rule activation] - - - - - 8bc4eb8c by Andrew Lelechenko at 2026-01-13T12:42:03-05:00 Upgrade mtl submodule to 2.3.2 Fixes #26656 - - - - - c94aaacd by Cheng Shao at 2026-01-13T12:42:44-05:00 compiler: remove iserv and only use on-demand external interpreter This patch removes `iserv` from the tree completely. Hadrian would no longer build or distribute `iserv`, and the GHC driver would use the on-demand external interpreter by default when invoked with `-fexternal-interpreter`, without needing to specify `-pgmi ""`. This has multiple benefits: - It allows cleanup of a lot of legacy hacks in the hadrian codebase. - It paves the way for running cross ghc's iserv via cross emulator (#25523), fixing TH/ghci support for cross targets other than wasm/js. - - - - - c1fe0097 by Peter Trommler at 2026-01-14T03:54:49-05:00 PPC NCG: Fix shift right MO code The shift amount in shift right [arithmetic] MOs is machine word width. Therefore remove unnecessary zero- or sign-extending of shift amount. It looks harmless to extend the shift amount argument because the shift right instruction uses only the seven lowest bits (i. e. mod 128). But now we have a conversion operation from a smaller type to word width around a memory load at word width. The types are not matching up but there is no check done in CodeGen. The necessary conversion from word width down to the smaller width would be translated into a no-op on PowerPC anyway. So all seems harmless if it was not for a small optimisation in getRegister'. In getRegister' a load instruction with the smaller width of the conversion operation was generated. This loaded the most significant bits of the word in memory on a big-endian platform. These bits were zero and hence shift right was used with shift amount zero and not one as required in test Sized. Fixes #26519 - - - - - 2dafc65a by Cheng Shao at 2026-01-14T03:55:31-05:00 Tree-wide cleanup of cygwin logic GHC has not supported cygwin for quite a few years already, and will not resume support in the forseeable future. The only supported windows toolchain is clang64/clangarm64 of the msys2 project. This patch cleans up the unused cygwin logic in the tree. Co-authored-by: Codex <codex(a)openai.com> - - - - - 66b96e2a by Teo Camarasu at 2026-01-14T03:56:13-05:00 Set default eventlog-flush-interval to 5s Resolves #26707 - - - - - d0254579 by Andrew Lelechenko at 2026-01-14T03:56:53-05:00 Document when -maxN RTS option was added - - - - - f25e2b12 by Cheng Shao at 2026-01-14T11:10:39-05:00 testsuite: remove obsolete --ci option from the testsuite driver This patch removes the obsolete `--ci` option from the testsuite driver: neither the CI scripts nor hadrian ever invokes the testsuite driver with `--ci`, and the perf notes are always fetched to the `refs/notes/perf` local reference anyway. - - - - - 7964763b by Julian Ospald at 2026-01-14T11:11:31-05:00 Fix fetch_cabal * download cabal if the existing one is of an older version * fix FreeBSD download url * fix unpacking on FreeBSD - - - - - 6b0129c1 by Julian Ospald at 2026-01-14T11:11:31-05:00 Bump toolchain in CI - - - - - 0f53ccc6 by Julian Ospald at 2026-01-14T11:11:31-05:00 Use libffi-clib Previously, we would build libffi via hadrian and bundle it manually with the GHC bindist. This now moves all that logic out of hadrian and allows us to have a clean Haskell package to build and link against and ship it without extra logic. This patch still retains the ability to link against a system libffi. The main reason of bundling libffi was that on some platforms (e.g. FreeBSD and Mac), system libffi is not visible to the C toolchain by default, so users would require settings in e.g. cabal to be able to compile anything. This adds the submodule libffi-clib to the repository. - - - - - 5e1cd595 by Peng Fan at 2026-01-14T11:12:26-05:00 NCG/LA64: add support for la664 micro architecture Add '-mla664' flag to LA664, which has some new features: atomic instructions, dbar hints, etc. 'LA464' is the default so that unrecognized instructions are not generated. - - - - - 4cdd335b by Brandon Chinn at 2026-01-15T13:55:42-05:00 Unify HsString + HsMultilineString - - - - - 50a84326 by Brandon Chinn at 2026-01-15T13:55:42-05:00 Implement QualifiedStrings (#26503) - - - - - 945fb707 by Brandon Chinn at 2026-01-17T17:49:40-08:00 Address feedback - - - - - 358 changed files: - .gitignore - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitmodules - CODEOWNERS - cabal.project-reinstall - compiler/GHC.hs - compiler/GHC/Builtin/Types.hs - compiler/GHC/Cmm.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/InitFini.hs - compiler/GHC/Cmm/Utils.hs - compiler/GHC/CmmToAsm/AArch64/Ppr.hs - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/PPC/CodeGen.hs - compiler/GHC/CmmToAsm/Ppr.hs - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - compiler/GHC/CmmToC.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/CmmToLlvm/Data.hs - compiler/GHC/Core/FamInstEnv.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Subst.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/Core/Unfold/Make.hs - compiler/GHC/Core/Unify.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/Config/Interpreter.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Syn/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Executable.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/String.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Runtime/Interpreter/C.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Settings.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/StgToJS/Linker/Utils.hs - compiler/GHC/SysTools/Terminal.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/FunDeps.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Rewrite.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/CtLoc.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Id/Make.hs - + compiler/GHC/Types/StringMeta.hs - compiler/GHC/Types/TyThing.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Binary.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/ghc.cabal.in - configure.ac - distrib/configure.ac.in - − docs/Makefile - − docs/storage-mgt/Makefile - docs/users_guide/9.16.1-notes.rst - − docs/users_guide/Makefile - docs/users_guide/exts/pragmas.rst - + docs/users_guide/exts/qualified_strings.rst - docs/users_guide/exts/table.rst - docs/users_guide/ghci.rst - docs/users_guide/packages.rst - docs/users_guide/phases.rst - docs/users_guide/using-concurrent.rst - docs/users_guide/using.rst - docs/users_guide/win32-dlls.rst - − driver/Makefile - − driver/ghc/Makefile - − driver/ghci/Makefile - driver/ghci/ghci.c - − driver/haddock/Makefile - driver/utils/cwrapper.c - driver/utils/isMinTTY.c - − driver/utils/merge_sections.ld - − driver/utils/merge_sections_pe.ld - ghc/Main.hs - − ghc/Makefile - hadrian/bindist/cwrappers/cwrapper.c - hadrian/cfg/default.host.target.in - hadrian/cfg/default.target.in - hadrian/doc/flavours.md - hadrian/doc/user-settings.md - hadrian/hadrian.cabal - hadrian/src/Base.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Flavour.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Cabal/Type.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - − hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/SourceDist.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - − hadrian/src/Settings/Builders/MergeObjects.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - − libffi-tarballs - − libraries/Makefile - libraries/base/changelog.md - libraries/base/src/Data/Bifoldable1.hs - libraries/base/src/GHC/Conc.hs - libraries/base/src/GHC/Conc/Sync.hs - libraries/base/tests/IO/T12010/cbits/initWinSock.c - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-boot/GHC/Unit/Database.hs - libraries/ghc-internal/cbits/consUtils.c - libraries/ghc-internal/configure.ac - libraries/ghc-internal/ghc-internal.buildinfo.in - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/include/HsIntegerGmp.h.in - libraries/ghc-internal/src/GHC/Internal/Conc/IO.hs - libraries/ghc-internal/src/GHC/Internal/Conc/POSIX.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs-boot - libraries/ghc-internal/src/GHC/Internal/Conc/Windows.hs - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs - libraries/ghc-internal/src/GHC/Internal/Event/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Context.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - + libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs - + libraries/libffi-clib - libraries/mtl - linters/lint-codes/LintCodes/Static.hs - − linters/lint-codes/Makefile - − linters/lint-notes/Makefile - llvm-passes - + m4/fp_linker_supports_verbatim.m4 - m4/ghc_select_file_extensions.m4 - m4/prep_target_file.m4 - mk/system-cxx-std-lib-1.0.conf.in - packages - − rts/Makefile - rts/RtsFlags.c - rts/StgMiscClosures.cmm - rts/configure.ac - − rts/include/Makefile - rts/include/rts/ghc_ffi.h - rts/rts.buildinfo.in - rts/rts.cabal - + testsuite/driver/_elffile.py - testsuite/driver/perf_notes.py - testsuite/driver/runtests.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/ghc-config/ghc-config.hs - testsuite/mk/test.mk - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/dmdanal/should_run/T26748.hs - + testsuite/tests/dmdanal/should_run/T26748.stdout - testsuite/tests/dmdanal/should_run/all.T - − testsuite/tests/driver/T24731.hs - testsuite/tests/driver/T4437.hs - testsuite/tests/driver/all.T - + testsuite/tests/driver/fully-static/Hello.hs - + testsuite/tests/driver/fully-static/Makefile - + testsuite/tests/driver/fully-static/all.T - + testsuite/tests/driver/fully-static/fully-static.stdout - + testsuite/tests/driver/fully-static/test/Test.hs - + testsuite/tests/driver/fully-static/test/test.pkg - + testsuite/tests/driver/mostly-static/Hello.hs - + testsuite/tests/driver/mostly-static/Makefile - + testsuite/tests/driver/mostly-static/all.T - + testsuite/tests/driver/mostly-static/mostly-static.stdout - + testsuite/tests/driver/mostly-static/test/test.c - + testsuite/tests/driver/mostly-static/test/test.h - + testsuite/tests/driver/mostly-static/test/test.pkg - + testsuite/tests/driver/recomp26705/M.hs - + testsuite/tests/driver/recomp26705/M2A.hs - + testsuite/tests/driver/recomp26705/M2B.hs - + testsuite/tests/driver/recomp26705/Makefile - + testsuite/tests/driver/recomp26705/all.T - + testsuite/tests/driver/recomp26705/recomp26705.stderr - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghc-api/annotations-literals/parsed.stdout - testsuite/tests/indexed-types/should_compile/CEqCanOccursCheck.hs - testsuite/tests/indexed-types/should_fail/T12522a.hs - testsuite/tests/indexed-types/should_fail/T26176.stderr - 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/interface-stability/template-haskell-exports.stdout - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/T20654a.stderr - testsuite/tests/pmcheck/should_compile/T15753c.hs - + testsuite/tests/pmcheck/should_compile/T15753c.stderr - testsuite/tests/pmcheck/should_compile/T15753d.hs - + testsuite/tests/pmcheck/should_compile/T15753d.stderr - + testsuite/tests/pmcheck/should_compile/T22652.hs - + testsuite/tests/pmcheck/should_compile/T22652a.hs - + testsuite/tests/pmcheck/should_compile/T24867.hs - + testsuite/tests/pmcheck/should_compile/T24867.stderr - testsuite/tests/pmcheck/should_compile/all.T - + testsuite/tests/polykinds/T13882.hs - testsuite/tests/polykinds/all.T - libraries/doc/Makefile → testsuite/tests/qualified-strings/Makefile - + testsuite/tests/qualified-strings/should_fail/Example/Length.hs - + testsuite/tests/qualified-strings/should_fail/Makefile - + testsuite/tests/qualified-strings/should_fail/all.T - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_expr.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_expr.stderr - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_pat.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_pat.stderr - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.stderr - + testsuite/tests/qualified-strings/should_run/Example/ByteStringAscii.hs - + testsuite/tests/qualified-strings/should_run/Example/ByteStringUtf8.hs - + testsuite/tests/qualified-strings/should_run/Example/Text.hs - + testsuite/tests/qualified-strings/should_run/Makefile - + testsuite/tests/qualified-strings/should_run/all.T - + testsuite/tests/qualified-strings/should_run/qstrings_expr.hs - + testsuite/tests/qualified-strings/should_run/qstrings_expr.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_pat.hs - + testsuite/tests/qualified-strings/should_run/qstrings_pat.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_th.hs - + testsuite/tests/qualified-strings/should_run/qstrings_th.stdout - testsuite/tests/quantified-constraints/T15316A.stderr - testsuite/tests/quantified-constraints/T17267.stderr - testsuite/tests/quantified-constraints/T17267a.stderr - testsuite/tests/quantified-constraints/T17267b.stderr - testsuite/tests/quantified-constraints/T17267c.stderr - testsuite/tests/quantified-constraints/T17267e.stderr - testsuite/tests/quantified-constraints/T17458.stderr - testsuite/tests/rts/linker/rdynamic.hs - testsuite/tests/simplCore/should_compile/T14003.stderr - testsuite/tests/simplCore/should_compile/T19672.stderr - testsuite/tests/simplCore/should_compile/T21763.stderr - testsuite/tests/simplCore/should_compile/T21763a.stderr - + testsuite/tests/simplCore/should_compile/T26615.hs - + testsuite/tests/simplCore/should_compile/T26615.stderr - + testsuite/tests/simplCore/should_compile/T26615a.hs - + testsuite/tests/simplCore/should_compile/T26681.hs - + testsuite/tests/simplCore/should_compile/T26682.hs - + testsuite/tests/simplCore/should_compile/T26682a.hs - + testsuite/tests/simplCore/should_compile/T26709.hs - + testsuite/tests/simplCore/should_compile/T26709.stderr - testsuite/tests/simplCore/should_compile/T4908.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/simplCore/should_compile/spec-inline.stderr - testsuite/tests/typecheck/should_compile/T16188.hs - testsuite/tests/typecheck/should_fail/ContextStack1.stderr - testsuite/tests/typecheck/should_fail/FD3.stderr - testsuite/tests/typecheck/should_fail/FDsFromGivens2.stderr - testsuite/tests/typecheck/should_fail/FunDepOrigin1b.stderr - testsuite/tests/typecheck/should_fail/T13506.stderr - testsuite/tests/typecheck/should_fail/T15767.stderr - testsuite/tests/typecheck/should_fail/T19415.stderr - testsuite/tests/typecheck/should_fail/T19415b.stderr - testsuite/tests/typecheck/should_fail/T22924b.stderr - + testsuite/tests/typecheck/should_fail/T23162b.hs - + testsuite/tests/typecheck/should_fail/T23162b.stderr - + testsuite/tests/typecheck/should_fail/T23162c.hs - + testsuite/tests/typecheck/should_fail/T23162d.hs - testsuite/tests/typecheck/should_fail/T25325.stderr - testsuite/tests/typecheck/should_fail/T5236.stderr - testsuite/tests/typecheck/should_fail/T5246.stderr - testsuite/tests/typecheck/should_fail/T5978.stderr - testsuite/tests/typecheck/should_fail/T9612.stderr - testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail143.stderr - utils/check-exact/ExactPrint.hs - utils/deriveConstants/Main.hs - utils/ghc-pkg/Main.hs - utils/ghc-toolchain/exe/Main.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - − utils/iserv/cbits/iservmain.c - − utils/iserv/iserv.cabal.in - − utils/iserv/src/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9266918f7b7846584f32224a1daf13… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9266918f7b7846584f32224a1daf13… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T24464] 4 commits: Print pat not pat' in pattern match errors
by Simon Peyton Jones (＠simonpj) 18 Jan '26

18 Jan '26

Simon Peyton Jones pushed to branch wip/T24464 at Glasgow Haskell Compiler / GHC Commits: 02fa9d82 by Simon Peyton Jones at 2026-01-17T23:37:42+00:00 Print pat not pat' in pattern match errors in ds_val_bind - - - - - 726ae4c7 by Simon Peyton Jones at 2026-01-17T23:38:31+00:00 Zap unfolding in addImplicitBinds to avoid inlining makeStatic into callers - - - - - 7050a884 by Simon Peyton Jones at 2026-01-17T23:39:10+00:00 Accept err changes - - - - - 495e99fa by Simon Peyton Jones at 2026-01-18T00:13:10+00:00 Get closed types right - - - - - 11 changed files: - compiler/GHC/CoreToStg/AddImplicitBinds.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Types/Id/Make.hs - testsuite/tests/codeGen/should_run/CgStaticPointers.hs - testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr - testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr - testsuite/tests/warnings/should_fail/CaretDiagnostics1.stderr Changes: ===================================== compiler/GHC/CoreToStg/AddImplicitBinds.hs ===================================== @@ -98,7 +98,6 @@ addImplicitBinds pgm_cfg mod_loc tycons binds mkImplicitBinds :: Bool -> ModLocation -> TyCon -> [CoreBind] -- See Note [Data constructor workers] --- c.f. Note [Injecting implicit bindings] in GHC.Iface.Tidy mkImplicitBinds gen_debug_info mod_loc tycon = classop_binds ++ datacon_binds where ===================================== compiler/GHC/HsToCore/Expr.hs ===================================== @@ -180,7 +180,8 @@ ds_val_bind dflags (NonRecursive, hsbinds) body ; let rhs' = mkOptTickBox rhs_tick rhs_expr ; let body_ty = exprType body ; let mult = getTcMultAnn mult_ann - ; error_expr <- mkErrorAppDs pAT_ERROR_ID body_ty (ppr pat') + ; error_expr <- mkErrorAppDs pAT_ERROR_ID body_ty (ppr pat) + -- Show the original user-written `pat` in error msg ; matchSimply rhs' PatBindRhs mult pat' body error_expr } -- This is the one place where matchSimply is given a non-ManyTy -- multiplicity argument. ===================================== compiler/GHC/Iface/Tidy.hs ===================================== @@ -432,7 +432,7 @@ tidyProgram opts (ModGuts { mg_module = mod -- -- See Note [Don't attempt to trim data types] final_ids = [ trimId (opt_trim_ids opts) id - | id <- bindersOfBinds tidy_binds + | id <- bindersOfBinds tidy_binds' , isExternalName (idName id) , not (isWiredIn id) ] -- See Note [Drop wired-in things] @@ -443,9 +443,6 @@ tidyProgram opts (ModGuts { mg_module = mod tidy_cls_insts = mkFinalClsInsts tidy_type_env $ mkInstEnv cls_insts tidy_rules = tidyRules tidy_env trimmed_rules - -- See Note [Injecting implicit bindings] - all_tidy_binds = tidy_binds' - -- Get the TyCons to generate code for. Careful! We must use -- the untidied TyCons here, because we need -- (a) implicit TyCons arising from types and classes defined @@ -458,13 +455,13 @@ tidyProgram opts (ModGuts { mg_module = mod local_ccs | opt_collect_ccs opts - = collectCostCentres mod all_tidy_binds tidy_rules + = collectCostCentres mod tidy_binds' tidy_rules | otherwise = S.empty return (CgGuts { cg_module = mod , cg_tycons = alg_tycons - , cg_binds = all_tidy_binds + , cg_binds = tidy_binds' , cg_ccs = S.toList local_ccs , cg_foreign = all_foreign_stubs , cg_foreign_files = foreign_files ===================================== compiler/GHC/Iface/Tidy/StaticPtrTable.hs ===================================== @@ -80,20 +80,30 @@ Here is a running example: static form wouldn't be closed because the Show dictionary would come from g's context instead of coming from the top level. -(SF4) The desugarer replaces the static form with a top-level binding for - an application of the function 'makeStatic' (defined in module +(SF4) The desugarer replaces a nested expression (static e) with a top-level + binding for an application of the function 'makeStatic' (defined in module GHC.StaticPtr.Internal of base). So we get - s = fromStaticPtr (makeStatic location k) - f x = ...s... + s = /\abc. makeStatic location e + f x = ...(fromStaticPtr s)... + + The new Id `s` is marked Exported so that it won't be inlined, even though + it is only mentioned once. (SF6) The CoreTidy pass, specifically `sptCreateStaticBinds`, replaces all bindings of the form - b = /\ ... -> makeStatic location value + s = /\ ... -> makeStatic location value with - b = /\ ... -> StaticPtr key (StaticPtrInfo "pkg key" "module" location) value + s = /\ ... -> StaticPtr key + (StaticPtrInfo "pkg key" "module" location) + value where a distinct key is generated for each binding. + We also zap s's unfolding (if any) because we are changing the RHS; and + we don't particularly want client modules to see s's implementation. + (That would be possibly, with a little bit more footwork; e.g. maybe + it'd be better to do this key-generation step in the desugarer.) + (SF7) If we are compiling to object code we insert a C stub (generated by `sptModuleInitCode`) into the final object which runs when the module is loaded, inserting the static forms defined by the module into the RTS's static pointer @@ -154,7 +164,8 @@ data StaticPtrOpts = StaticPtrOpts -- pointer table. -- -- See (SF6) in Note [Grand plan for static forms] -sptCreateStaticBinds :: StaticPtrOpts -> Module -> CoreProgram -> IO ([SptEntry], Maybe CStub, CoreProgram) +sptCreateStaticBinds :: StaticPtrOpts -> Module -> CoreProgram + -> IO ([SptEntry], Maybe CStub, CoreProgram) sptCreateStaticBinds opts this_mod binds = do (fps, binds') <- evalStateT (go [] [] binds) 0 let cstub @@ -186,7 +197,11 @@ sptCreateStaticBinds opts this_mod binds = do Nothing -> return (Nothing, (b, e)) Just (_, t, info, arg) -> do (fp, e') <- mkStaticBind t info arg - return (Just (SptEntry (idName b) fp), (b, foldr Lam e' tvs)) + let b' = zapIdUnfolding b + -- zapIdUnfolding: we are changing the RHS! + -- And we don't particularly want importing clients + -- to see the unfolding anyway + return (Just (SptEntry (idName b) fp), (b', foldr Lam e' tvs)) mkStaticBind :: Type -> CoreExpr -> CoreExpr -> StateT Int IO (Fingerprint, CoreExpr) ===================================== compiler/GHC/Tc/Gen/Bind.hs ===================================== @@ -1798,7 +1798,9 @@ instance Outputable GeneralisationPlan where ppr (CheckGen _ s) = text "CheckGen" <+> ppr s decideGeneralisationPlan - :: DynFlags -> TopLevelFlag -> ClosedTypeId -> TcSigFun + :: DynFlags -> TopLevelFlag + -> ClosedTypeId -- True <=> all the free vars have closed types + -> TcSigFun -> [LHsBind GhcRn] -> GeneralisationPlan decideGeneralisationPlan dflags top_lvl closed_type sig_fn lbinds | Just (bind, sig) <- one_funbind_with_sig = CheckGen bind sig @@ -1812,7 +1814,7 @@ decideGeneralisationPlan dflags top_lvl closed_type sig_fn lbinds -- types (see #25428). So we don't force it. -- See (NVP5) in Note [Non-variable pattern bindings aren't linear] in GHC.Tc.Gen.Bind. - | isTopLevel top_lvl = True + | isTopLevel top_lvl = True -- See Note [Always generalise top-level bindings] | has_mult_anns_and_pats = False ===================================== compiler/GHC/Tc/Utils/Env.hs ===================================== @@ -117,7 +117,7 @@ import GHC.Utils.Misc ( HasDebugCallStack ) import GHC.Data.FastString import GHC.Data.List.SetOps -import GHC.Data.Maybe( MaybeErr(..), maybeToList, fromMaybe ) +import GHC.Data.Maybe( MaybeErr(..), maybeToList, fromMaybe, isNothing ) import GHC.Types.SrcLoc import GHC.Types.Basic hiding( SuccessFlag(..) ) @@ -677,7 +677,8 @@ tcExtendNameTyVarEnv binds thing_inside isTypeClosedLetBndr :: Id -> Bool -- See Note [Bindings with closed types: ClosedTypeId] in GHC.Tc.Types -isTypeClosedLetBndr = noFreeVarsOfType . idType +isTypeClosedLetBndr id + = noFreeVarsOfType (idType id) tcExtendRecIds :: [(Name, TcId)] -> TcM a -> TcM a -- Used for binding the recursive uses of Ids in a binding @@ -712,11 +713,18 @@ tcExtendLetEnv :: TopLevelFlag -> TcSigFun -> ClosedTypeId -- Used for both top-level value bindings and nested let/where-bindings -- Used for a single NonRec or a single Rec -- Adds to the TcBinderStack too -tcExtendLetEnv top_lvl _sig_fn closed ids thing_inside +-- Note (ELE) For Ids that are in `sig_fn` we have /already/ extended the env, +-- using `tcExtendSigIds`, so no point in doing so again. Moreover, for +-- those Ids, we want closed-ness to be driven entirely by the signature, +-- and not by the free vars (which are embodied in `closed`. +tcExtendLetEnv top_lvl sig_fn closed ids thing_inside = tcExtendBinderStack [TcIdBndr id top_lvl | Scaled _ id <- ids] $ tc_extend_local_env top_lvl - [ (idName id, ATcId { tct_id = id, tct_info = LetBound closed }) - | Scaled _ id <- ids ] $ + [ (id_nm, ATcId { tct_id = id, tct_info = LetBound closed }) + | Scaled _ id <- ids + , let id_nm = idName id + , isNothing (sig_fn id_nm) -- See (ELE) above + ] $ foldr check_one_usg thing_inside ids where check_one_usg (Scaled mult id) thing_inside ===================================== compiler/GHC/Types/Id/Make.hs ===================================== @@ -916,8 +916,8 @@ mkDataConRep dc_bang_opts fam_envs wrap_name data_con (rep_tys, rep_strs) = unzip (concat rep_tys_w_strs) -- This is True if the data constructor or class dictionary constructor - -- needs a wrapper. This wrapper is injected into the program later in the - -- CoreTidy pass. See Note [Injecting implicit bindings] in GHC.Iface.Tidy, + -- needs a wrapper. This wrapper is injected into the program later in the CoreTidy + -- pass. See Note [Injecting implicit bindings] in GHC.CoreToStg.AddImplicitBinds -- along with the accompanying implementation in getTyConImplicitBinds. wrapper_reqd | isTypeDataTyCon tycon ===================================== testsuite/tests/codeGen/should_run/CgStaticPointers.hs ===================================== @@ -15,9 +15,9 @@ main = do print $ deRefStaticPtr (static g) print $ deRefStaticPtr p0 'a' print $ deRefStaticPtr (static t_field) $ T 'b' - where - g :: String - g = "found" + +g :: String +g = "found" lookupKey :: StaticPtr a -> IO a lookupKey p = unsafeLookupStaticPtr (staticKey p) >>= \case ===================================== testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr ===================================== @@ -1,6 +1,3 @@ - RnStaticPointersFail01.hs:5:7: error: [GHC-88431] - • ‘x’ is used in a static form but it is not closed because it - is not let-bound. - • In the expression: static x - In an equation for ‘f’: f x = static x + ‘x’ is used in a static form but it is not defined at top level + ===================================== testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr ===================================== @@ -1,29 +1,12 @@ - RnStaticPointersFail03.hs:8:7: error: [GHC-88431] - • ‘x’ is used in a static form but it is not closed because it - is not let-bound. - • In the expression: static (x . id) - In an equation for ‘f’: f x = static (x . id) + ‘x’ is used in a static form but it is not defined at top level RnStaticPointersFail03.hs:10:8: error: [GHC-88431] - • ‘k’ is used in a static form but it is not closed because it - uses ‘x’ which is not let-bound. - • In the expression: static (k . id) - In an equation for ‘f0’: - f0 x - = static (k . id) - where - k = const (const () x) + ‘k’ is used in a static form but it is not defined at top level + +RnStaticPointersFail03.hs:14:8: error: [GHC-88431] + ‘k’ is used in a static form but it is not defined at top level RnStaticPointersFail03.hs:19:15: error: [GHC-88431] - • ‘g’ is used in a static form but it is not closed because it - uses ‘h’ which has a non-closed type because it contains the - type variables: ‘a’ - • In the first argument of ‘const’, namely ‘(static (g undefined))’ - In the expression: const (static (g undefined)) (h x) - In an equation for ‘f2’: - f2 x - = const (static (g undefined)) (h x) - where - g = h - h = typeOf + ‘g’ is used in a static form but it is not defined at top level + ===================================== testsuite/tests/warnings/should_fail/CaretDiagnostics1.stderr ===================================== @@ -1,5 +1,5 @@ CaretDiagnostics1.hs:7:8-15: error: [GHC-83865] - • Couldn't match expected type ‘IO a0’ with actual type ‘Int’ + • Couldn't match expected type ‘IO a1’ with actual type ‘Int’ • In the second argument of ‘(+)’, namely ‘(3 :: Int)’ In a stmt of a 'do' block: 10000000000000000000000000000000000000 + 2 + (3 :: Int) @@ -23,9 +23,9 @@ CaretDiagnostics1.hs:8:9-27: error: [GHC-83865] | ^^^^^^^^^^^^^^^^^^^ CaretDiagnostics1.hs:13:7-11: error: [GHC-83865] - • Couldn't match type: a1 -> a1 + • Couldn't match type: a0 -> a0 with: [Char] - Expected: a1 -> a1 + Expected: a0 -> a0 Actual: String • In the pattern: "γηξ" In a case alternative: "γηξ" -> () '0' View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5034e877fbae2f522c20dff41c2f48… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5034e877fbae2f522c20dff41c2f48… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26548] 2 commits: Wibbles
by Simon Peyton Jones (＠simonpj) 17 Jan '26

17 Jan '26

Simon Peyton Jones pushed to branch wip/T26548 at Glasgow Haskell Compiler / GHC Commits: 9e2dff0c by Simon Peyton Jones at 2026-01-17T22:16:11+00:00 Wibbles In particular, a lambda is a value argument in interestingArg For some reason I had changed this and it made many things worse This wibble puts it back! - - - - - 757166fb by Simon Peyton Jones at 2026-01-17T22:16:17+00:00 Tracing in SpecConstr only - - - - - 3 changed files: - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - testsuite/tests/simplCore/should_compile/T26615.stderr Changes: ===================================== compiler/GHC/Core/Opt/Simplify/Utils.hs ===================================== @@ -1059,7 +1059,9 @@ interestingArg env e = go env 0 e go env n (Lam v e) | isTyVar v = go env n e | n>0 = NonTrivArg -- (\x.b) e is NonTriv - | otherwise = NonTrivArg + | otherwise = ValueArg -- (\x.b) is Value + -- Having ValueArg here is very important + -- for getting higher order functions to inline go _ _ (Case {}) = NonTrivArg go env n (Let b e) = case go env' n e of ValueArg -> ValueArg @@ -1069,10 +1071,9 @@ interestingArg env e = go env 0 e go_var n v | isConLikeId v = ValueArg -- Experimenting with 'conlike' rather that - -- data constructors here - -- DFuns are con-like; see Note [Conlike is interesting] + -- data constructors here (includes DFuns) -- see (IA1) in Note [Interesting arguments] - | idArity v > n = NonTrivArg -- Catches (eg) primops with arity but no unfolding + | idArity v > n = NonTrivArg -- Catches (eg) primops with arity but no unfolding | n > 0 = NonTrivArg -- Saturated or unknown call | otherwise -- n==0, no value arguments; look for an interesting unfolding = case idUnfolding v of ===================================== compiler/GHC/Core/Opt/SpecConstr.hs ===================================== @@ -2602,7 +2602,8 @@ callToPat :: ScEnv -> [ArgOcc] -> Call -> UniqSM (Maybe CallPat) callToPat env bndr_occs call@(Call fn args con_env) = do { let in_scope = substInScopeSet (sc_subst env) - ; arg_triples <- zipWith3M (argToPat env in_scope con_env) args bndr_occs (map (const NotMarkedStrict) args) + ; arg_triples <- zipWith3M (argToPat env in_scope con_env) args bndr_occs + (map (const NotMarkedStrict) args) -- This zip trims the args to be no longer than -- the lambdas in the function definition (bndr_occs) @@ -2639,6 +2640,15 @@ callToPat env bndr_occs call@(Call fn args con_env) sanitise id = updateIdTypeAndMult expandTypeSynonyms id -- See Note [Free type variables of the qvar types] +-- ; pprTraceM "callToPatOut" $ +-- vcat [ text "fn:" <+> ppr fn +-- , text "args:" <+> ppr args +-- , text "arg_triples:" <+> ppr arg_triples +-- , text "bndr_occs:" <+> ppr bndr_occs +-- , text "pat_fvs:" <+> ppr pat_fvs +-- , text "qvars':" <+> ppr qvars' +-- , text "pats:" <+> ppr pats ] + -- Check for bad coercion variables: see Note [SpecConstr and casts] ; let bad_covars = filter isCoVar qids ; warnPprTrace (not (null bad_covars)) @@ -2648,12 +2658,6 @@ callToPat env bndr_occs call@(Call fn args con_env) if interesting && null bad_covars then do { let cp_res = CP { cp_qvars = qvars', cp_args = pats , cp_strict_args = concat cbv_ids } --- ; pprTraceM "callToPatOut" $ --- vcat [ text "fn:" <+> ppr fn --- , text "args:" <+> ppr args --- , text "bndr_occs:" <+> ppr bndr_occs --- , text "pat_fvs:" <+> ppr pat_fvs --- , text "cp_res:" <+> ppr cp_res ] ; return (Just cp_res) } else return Nothing } @@ -2684,9 +2688,9 @@ argToPat :: ScEnv argToPat env in_scope val_env arg arg_occ arg_str = do - -- pprTraceM "argToPatIn" (ppr arg) + -- pprTraceM "argToPatIn {" (ppr arg) !res <- argToPat1 env in_scope val_env arg arg_occ arg_str - -- pprTraceM "argToPatOut" (ppr res) + -- pprTraceM "argToPatOut }" (ppr arg $$ ppr res) return res argToPat1 :: ScEnv @@ -2780,7 +2784,8 @@ argToPat1 env in_scope val_env arg arg_occ _arg_str -- (b) we know what its value is -- In that case it counts as "interesting" argToPat1 env in_scope val_env (Var v) arg_occ arg_str - | sc_force env || specialisableArgOcc arg_occ -- (a) + | -- pprTrace "argToPat:var" (ppr v $$ ppr is_value) $ + sc_force env || specialisableArgOcc arg_occ -- (a) -- See Note [Forcing specialisation], point (FS3) , is_value -- (b) -- Ignoring sc_keen here to avoid gratuitously incurring Note [Reboxing] ===================================== testsuite/tests/simplCore/should_compile/T26615.stderr ===================================== @@ -2,7 +2,7 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 1,209, types: 1,139, coercions: 18, joins: 17/29} + = {terms: 1,200, types: 1,136, coercions: 18, joins: 17/29} -- RHS size: {terms: 6, types: 8, coercions: 0, joins: 0/0} unArray :: forall a. Array a -> SmallArray# a @@ -725,7 +725,7 @@ lvl1 = GHC.Internal.Control.Exception.Base.patError @LiftedRep @() lvl Rec { --- RHS size: {terms: 133, types: 126, coercions: 0, joins: 1/2} +-- RHS size: {terms: 130, types: 125, coercions: 0, joins: 1/2} T26615a.disjointSubtrees_$s$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] :: forall b a k. @@ -748,7 +748,6 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees Empty -> GHC.Internal.Types.True; Leaf bx ds -> case ds of { L kB ds1 -> - case kB of k0 { __DEFAULT -> case eqWord# bx sc of { __DEFAULT -> GHC.Internal.Types.True; 1# -> @@ -780,8 +779,7 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees } }; } in jump $wlookupInArrayCont_ - k0 sc1 0# (sizeofSmallArray# @Lifted @(Leaf k a) sc1) - } + kB sc1 0# (sizeofSmallArray# @Lifted @(Leaf k a) sc1) } }; Collision bx bx1 -> @@ -822,7 +820,7 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees end Rec } Rec { --- RHS size: {terms: 705, types: 732, coercions: 18, joins: 13/23} +-- RHS size: {terms: 699, types: 730, coercions: 18, joins: 13/23} T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] :: forall k a b. Eq k => Int# -> HashMap k a -> HashMap k b -> Bool [GblId[StrictWorker([~, ~, !])], @@ -852,7 +850,6 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] Empty -> GHC.Internal.Types.True; Leaf bx [Occ=Once1] ds2 [Occ=Once1!] -> case ds2 of { L kB [Occ=Once1] _ [Occ=Dead] -> - case kB of k0 [Occ=Once1] { __DEFAULT -> joinrec { lookupCont_ [Occ=LoopBreakerT[5]] :: Eq k => Word -> k -> Int -> HashMap k a -> Bool @@ -980,8 +977,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] } }; } in jump lookupCont_ - $dEq (GHC.Internal.Types.W# bx) k0 (GHC.Internal.Types.I# ww) ds - } + $dEq (GHC.Internal.Types.W# bx) kB (GHC.Internal.Types.I# ww) ds }; Collision _ [Occ=Dead] _ [Occ=Dead] -> T26615a.$wdisjointSubtrees @k @b @a $dEq ww wild ds @@ -992,7 +988,6 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] case ds1 of { L kA [Occ=Once2] _ [Occ=Dead] -> case _b of wild2 [Occ=Once1] { __DEFAULT -> - case kA of k0 [Occ=Once1] { __DEFAULT -> joinrec { lookupCont_ [Occ=LoopBreakerT[5]] :: Eq k => Word -> k -> Int -> HashMap k b -> Bool @@ -1116,8 +1111,11 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] } }; } in jump lookupCont_ - $dEq (GHC.Internal.Types.W# bx) k0 (GHC.Internal.Types.I# ww) wild2 - }; + $dEq + (GHC.Internal.Types.W# bx) + kA + (GHC.Internal.Types.I# ww) + wild2; Leaf bx1 [Occ=Once1] ds3 [Occ=Once1!] -> case ds3 of { L kB [Occ=Once1] _ [Occ=Dead] -> case GHC.Internal.Classes.neWord @@ -1391,7 +1389,6 @@ T26615a.$wdisjointSubtrees Empty -> GHC.Internal.Types.True; Leaf bx ds2 -> case ds2 of { L kB ds3 -> - case kB of k0 { __DEFAULT -> join { exit [Dmd=LC(S,C(1,C(1,C(1,L))))] :: Word# -> k -> Word# -> Leaf k a -> Bool @@ -1503,8 +1500,7 @@ T26615a.$wdisjointSubtrees } } }; } in - jump $wlookupCont_ bx k0 ww ds - } + jump $wlookupCont_ bx kB ww ds }; Collision bx bx1 -> T26615a.disjointSubtrees_$s$wdisjointSubtrees @@ -1516,7 +1512,6 @@ T26615a.$wdisjointSubtrees case ds1 of { L kA ds2 -> case _b of wild2 { __DEFAULT -> - case kA of k0 { __DEFAULT -> join { exit [Dmd=LC(S,C(1,C(1,C(1,L))))] :: Word# -> k -> Word# -> Leaf k b -> Bool @@ -1628,8 +1623,7 @@ T26615a.$wdisjointSubtrees } } }; } in - jump $wlookupCont_ bx k0 ww wild2 - }; + jump $wlookupCont_ bx kA ww wild2; Leaf bx1 ds3 -> case ds3 of { L kB ds4 -> case neWord# bx bx1 of { @@ -1950,7 +1944,7 @@ disjointSubtrees ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 614, types: 666, coercions: 18, joins: 8/14} + = {terms: 609, types: 665, coercions: 18, joins: 8/14} -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} T26615.$trModule2 :: GHC.Internal.Prim.Addr# @@ -2128,7 +2122,7 @@ $wpoly_lookupCont_ end Rec } Rec { --- RHS size: {terms: 448, types: 507, coercions: 18, joins: 8/13} +-- RHS size: {terms: 443, types: 506, coercions: 18, joins: 8/13} T26615.$s$wdisjointSubtrees [InlPrag=[~], Occ=LoopBreaker] :: forall a b. GHC.Internal.Prim.Int# @@ -2163,11 +2157,7 @@ T26615.$s$wdisjointSubtrees T26615a.Leaf bx1 ds3 -> case ds3 of { T26615a.L kB ds4 -> case GHC.Internal.Prim.neWord# bx bx1 of { - __DEFAULT -> - case GHC.Internal.Classes.$fEqList_$s$c==1 kA kB of { - False -> GHC.Internal.Types.True; - True -> GHC.Internal.Types.False - }; + __DEFAULT -> GHC.Internal.Classes.$fEqList_$s$c/=1 kA kB; 1# -> GHC.Internal.Types.True } } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/606ddfae3fc59c98d26fc66aaaa9f5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/606ddfae3fc59c98d26fc66aaaa9f5… You're receiving this email because of your account on gitlab.haskell.org.

1 0