- ghc-commits - Haskell.org

[Git][ghc/ghc][master] Bump transformers submodule to 0.6.3.0
by Marge Bot (＠marge-bot) 04 Feb '26

04 Feb '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: ea0d1317 by Zubin Duggal at 2026-02-04T09:57:06-05:00 Bump transformers submodule to 0.6.3.0 Fixes #26790 - - - - - 1 changed file: - libraries/transformers Changes: ===================================== libraries/transformers ===================================== @@ -1 +1 @@ -Subproject commit cee47cca7705edafe0a5839439e679edbd61890a +Subproject commit 0d615bc2457d5d2c695dcfdb902d88c1225beff3 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ea0d1317a630799a6b7bea12b24ef7e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ea0d1317a630799a6b7bea12b24ef7e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: Explicitly use utf-8 encoding in rts-includes linter.
by Marge Bot (＠marge-bot) 04 Feb '26

04 Feb '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 01ecb612 by Andreas Klebinger at 2026-02-04T09:56:25-05:00 testsuite: Explicitly use utf-8 encoding in rts-includes linter. Not doing so caused failures on windows, as python failed to pick a reasonable encoding even with locale set. Fixes #26850 - - - - - 1 changed file: - testsuite/tests/linters/regex-linters/check-rts-includes.py Changes: ===================================== testsuite/tests/linters/regex-linters/check-rts-includes.py ===================================== @@ -12,12 +12,16 @@ import re INCLUDE_RE = re.compile('# *include ([<"][^">]+[>"])') def get_includes(file: Path) -> List[Tuple[int, str]]: - txt = file.read_text() - return [ (line_no+1, m.group(1) ) - for (line_no, line) in enumerate(txt.split('\n')) - for m in [INCLUDE_RE.match(line)] - if m is not None - if m.group(1) != "rts/PosixSource.h"] + try: + txt = file.read_text(encoding="utf-8") + return [ (line_no+1, m.group(1) ) + for (line_no, line) in enumerate(txt.split('\n')) + for m in [INCLUDE_RE.match(line)] + if m is not None + if m.group(1) != "rts/PosixSource.h"] + except Exception as e: + e.add_note(f"While reading includes from {file}") + raise def in_rts_dir(path: Path) -> bool: return len(path.parts) > 0 and path.parts[0] == 'rts' @@ -40,9 +44,14 @@ class RtsHIncludeOrderLinter(Linter): '"ghcplatform.h"', } - includes = get_includes(path) - headers = [x[1] for x in includes] - lines = path.read_text().split('\n') + try: + includes = get_includes(path) + headers = [x[1] for x in includes] + lines = path.read_text(encoding="utf-8").split('\n') + # #26850 + except Exception as e: + e.add_note(f"Error while decoding path {path}") + raise e if '"PosixSource.h"' in headers: for line_no, header in includes: @@ -69,18 +78,22 @@ class PrivateIncludeLinter(Linter): def lint(self, path: Path): private = False - lines = path.read_text().split('\n') - for line_no, include in get_includes(path): - if include == '"BeginPrivate.h"': - private = True - elif include == '"EndPrivate.h"': - private = False - elif private: - self.add_warning(Warning( - path=path, - line_no=line_no, - line_content=lines[line_no-1], - message='System header %s found inside of <BeginPrivate.h> block' % include)) + try: + lines = path.read_text(encoding="utf-8").split('\n') + for line_no, include in get_includes(path): + if include == '"BeginPrivate.h"': + private = True + elif include == '"EndPrivate.h"': + private = False + elif private: + self.add_warning(Warning( + path=path, + line_no=line_no, + line_content=lines[line_no-1], + message='System header %s found inside of <BeginPrivate.h> block' % include)) + except Exception as e: + e.add_note(f"While handling {path}") + raise e linters = [ RtsHIncludeOrderLinter(), View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/01ecb61234b03b94d08ab649395e2da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/01ecb61234b03b94d08ab649395e2da… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sort-usages] determinism: Sort Usages by fingerprint to ensure consistent ordering
by Matthew Pickering (＠mpickering) 04 Feb '26

04 Feb '26

Matthew Pickering pushed to branch wip/sort-usages at Glasgow Haskell Compiler / GHC Commits: 29a4e618 by Ian-Woo Kim at 2026-02-04T14:30:53+00:00 determinism: Sort Usages by fingerprint to ensure consistent ordering In some situations it has been observed that the ordering of usages can be non-determinstic in parallel builds. Therefore to be on the safe side we perform a sort on the usages field before writing them to the interface. Fixes #26877 - - - - - 2 changed files: - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Unit/Module/Deps.hs Changes: ===================================== compiler/GHC/HsToCore/Usage.hs ===================================== @@ -36,7 +36,7 @@ import GHC.Data.Maybe import GHC.Data.FastString import Data.IORef -import Data.List (sortBy) +import Data.List (sortBy, sortOn) import Data.Map (Map) import qualified Data.Map as Map import qualified Data.Set as Set @@ -73,6 +73,8 @@ data UsageConfig = UsageConfig { uc_safe_implicit_imps_req :: !Bool -- ^ Are all implicit imports required to be safe for this Safe Haskell mode? } +-- | Build the list of 'Usage's that drives recompilation checking. +-- The resulting list is deterministically sorted (see 'usageFingerprint'). mkUsageInfo :: UsageConfig -> Plugins -> FinderCache -> UnitEnv -> Module -> ImportedMods -> [ImportUserSpec] -> NameSet -> [FilePath] -> [FilePath] -> [(Module, Fingerprint)] -> [Linkable] -> PkgsLoaded @@ -105,7 +107,10 @@ mkUsageInfo uc plugins fc unit_env } | (mod, hash) <- merged ] ++ object_usages - usages `seqList` return usages + + -- Sort all the Usages to ensure a deterministic ordering. + let sorted_usages = sortOn usageFingerprint usages + sorted_usages `seqList` return sorted_usages -- seq the list of Usages returned: occasionally these -- don't get evaluated for a while and we can end up hanging on to -- the entire collection of Ifaces. ===================================== compiler/GHC/Unit/Module/Deps.hs ===================================== @@ -17,6 +17,7 @@ module GHC.Unit.Module.Deps , noDependencies , pprDeps , Usage (..) + , usageFingerprint , HomeModImport (..) , HomeModImportedAvails (..) , ImportAvails (..) @@ -492,6 +493,17 @@ instance Binary Usage where i -> error ("Binary.get(Usage): " ++ show i) +-- | Extract the distinguishing fingerprint carried by a particular 'Usage' +-- constructor. Every constructor stores a hash capturing the bit of state +-- that drives recompilation decisions, so we can sort on it directly. +usageFingerprint :: Usage -> Fingerprint +usageFingerprint UsagePackageModule{ usg_mod_hash = fp } = fp +usageFingerprint UsageHomeModule{ usg_mod_hash = fp } = fp +usageFingerprint UsageFile{ usg_file_hash = fp } = fp +usageFingerprint UsageDirectory{ usg_dir_hash = fp } = fp +usageFingerprint UsageHomeModuleInterface{ usg_iface_hash = fp } = fp +usageFingerprint UsageMergedRequirement{ usg_mod_hash = fp } = fp + -- | Records the imports that we depend on from a home module, -- for recompilation checking. -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/29a4e6183960c1edba7199335c63371… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/29a4e6183960c1edba7199335c63371… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sort-usages
by Matthew Pickering (＠mpickering) 04 Feb '26

04 Feb '26

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

1 0

[Git][ghc/ghc][wip/with-hs-doc-identifiers-determ] determinism: Use a stable sort in WithHsDocIdentifiers binary instance
by Matthew Pickering (＠mpickering) 04 Feb '26

04 Feb '26

Matthew Pickering pushed to branch wip/with-hs-doc-identifiers-determ at Glasgow Haskell Compiler / GHC Commits: fa45b63d by Matthew Pickering at 2026-02-04T14:28:34+00:00 determinism: Use a stable sort in WithHsDocIdentifiers binary instance `WithHsDocIdentifiers` is defined as ``` 71 data WithHsDocIdentifiers a pass = WithHsDocIdentifiers 72 { hsDocString :: !a 73 , hsDocIdentifiers :: ![Located (IdP pass)] 74 } ``` This list of names is populated from `rnHsDocIdentifiers`, which calls `lookupGRE`, which calls `lookupOccEnv_AllNameSpaces`, which calls `nonDetEltsUFM` and returns the results in an order depending on uniques. Sorting the list with a stable sort before returning the interface makes the output deterministic and follows the approach taken by other fields in `Docs`. Fixes #26858 - - - - - 4 changed files: - compiler/GHC/Hs/Doc.hs - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/HaddockSpanIssueT24378.stdout - testsuite/tests/showIface/MagicHashInHaddocks.stdout Changes: ===================================== compiler/GHC/Hs/Doc.hs ===================================== @@ -45,6 +45,7 @@ import qualified GHC.Utils.Outputable as O import GHC.Hs.Extension import GHC.Types.Unique.Map import Data.List (sortBy) +import Data.Function import GHC.Hs.DocString @@ -83,7 +84,7 @@ instance Outputable a => Outputable (WithHsDocIdentifiers a pass) where instance Binary a => Binary (WithHsDocIdentifiers a GhcRn) where put_ bh (WithHsDocIdentifiers s ids) = do put_ bh s - put_ bh $ BinLocated <$> ids + put_ bh $ BinLocated <$> (sortBy (stableNameCmp `on` getName) ids) get bh = liftA2 WithHsDocIdentifiers (get bh) (fmap unBinLocated <$> get bh) ===================================== testsuite/tests/showIface/DocsInHiFile1.stdout ===================================== @@ -6,14 +6,14 @@ docs: '<>', ':=:', 'Bool' -} identifiers: + {DocsInHiFile.hs:4:2-3} + GHC.Internal.Base.<> {DocsInHiFile.hs:2:6-9} GHC.Internal.Data.Foldable.elem - {DocsInHiFile.hs:2:6-9} - elem {DocsInHiFile.hs:2:14-18} GHC.Internal.System.IO.print - {DocsInHiFile.hs:4:2-3} - GHC.Internal.Base.<> + {DocsInHiFile.hs:2:6-9} + elem {DocsInHiFile.hs:4:15-18} GHC.Internal.Types.Bool export docs: ===================================== testsuite/tests/showIface/HaddockSpanIssueT24378.stdout ===================================== @@ -6,14 +6,14 @@ docs: '<>', ':=:', 'Bool' -} identifiers: + {HaddockSpanIssueT24378.hs:3:2-3} + GHC.Internal.Base.<> {HaddockSpanIssueT24378.hs:1:6-9} GHC.Internal.Data.Foldable.elem - {HaddockSpanIssueT24378.hs:1:6-9} - elem {HaddockSpanIssueT24378.hs:1:14-18} GHC.Internal.System.IO.print - {HaddockSpanIssueT24378.hs:3:2-3} - GHC.Internal.Base.<> + {HaddockSpanIssueT24378.hs:1:6-9} + elem {HaddockSpanIssueT24378.hs:3:15-18} GHC.Internal.Types.Bool export docs: ===================================== testsuite/tests/showIface/MagicHashInHaddocks.stdout ===================================== @@ -3,10 +3,10 @@ docs: Just text: -- | 'foo#' `Bar##` `*##` identifiers: - {MagicHashInHaddocks.hs:3:7-10} - foo# {MagicHashInHaddocks.hs:3:14-18} Bar## + {MagicHashInHaddocks.hs:3:7-10} + foo# export docs: [] declaration docs: View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa45b63d896aac6aa3a0e6a84c2771d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa45b63d896aac6aa3a0e6a84c2771d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/submodule-bumps-2026-01] Deleted 1 commit: libraries: bump filepath submodule to 1.5.5.0
by Cheng Shao (＠TerrorJack) 04 Feb '26

04 Feb '26

Cheng Shao pushed to branch wip/submodule-bumps-2026-01 at Glasgow Haskell Compiler / GHC WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: f07adbf6 by Cheng Shao at 2026-02-04T09:48:00+00:00 libraries: bump filepath submodule to 1.5.5.0 - - - - - 1 changed file: - libraries/filepath Changes: ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit baac7d7e76449f76fc6785e77206edb5530b6bfb View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f07adbf6ad7acd42a3ccef67ded6185… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f07adbf6ad7acd42a3ccef67ded6185… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/andreask/hadrian_build_par
by Andreas Klebinger (＠AndreasK) 04 Feb '26

04 Feb '26

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

1 0

[Git][ghc/ghc][wip/andreask/ticked_joins] Allow join point Ids to occur below ticks & casts
by sheaf (＠sheaf) 04 Feb '26

04 Feb '26

sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC Commits: 681d279b by sheaf at 2026-02-04T12:28:43+01:00 Allow join point Ids to occur below ticks & casts This commit classifies all join points into two categories: - true join points - quasi join points A quasi join point is a join point for which a jump is enclosed within a profiling tick or a cast. The only operational difference is that, for quasi join points, we cannot perform the case-of-case transformation described in Note [Join points and case-of-case] in GHC.Core.Opt.Simplify.Iteration. All of this is explained in detail in Note [Quasi join points]. Fixes #26693 and #26642 Improves on #14610, #26157 and #26422, as it means casts/profiling ticks don't prevent join points, but it doesn't entirely fix these issues because we are still inhibiting optimisations (lack of case-of-case). - - - - - 34 changed files: - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.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/Monad.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Id.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - testsuite/tests/profiling/should_run/T2552.prof.sample - testsuite/tests/profiling/should_run/ioprof.prof.sample - testsuite/tests/profiling/should_run/scc001.prof.sample - + testsuite/tests/simplCore/should_compile/QuasiJoinPoints.hs - testsuite/tests/simplCore/should_compile/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/681d279b678cfad3a1cbf72ee28584e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/681d279b678cfad3a1cbf72ee28584e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/linker_fix] check for mac sections
by Andreas Klebinger (＠AndreasK) 04 Feb '26

04 Feb '26

Andreas Klebinger pushed to branch wip/andreask/linker_fix at Glasgow Haskell Compiler / GHC Commits: 61f0b4c5 by Andreas Klebinger at 2026-02-04T12:06:09+01:00 check for mac sections - - - - - 1 changed file: - rts/linker/LoadArchive.c Changes: ===================================== rts/linker/LoadArchive.c ===================================== @@ -510,6 +510,17 @@ HsInt loadArchive_ (pathchar *path) DEBUG_LOG("Found member file `%s'\n", fileName); bool is_symbol_table = strcmp("", fileName) == 0; +#if defined(OBJFORMAT_MACHO) + if (!is_symbol_table) { + /* Darwin ranlib symbol tables are named __.SYMDEF* */ + if (strncmp(fileName, "__.SYMDEF", sizeof("__.SYMDEF")) == 0 || + strncmp(fileName, "__.SYMDEF SORTED", sizeof("__.SYMDEF SORTED")) == 0 || + strncmp(fileName, "__.SYMDEF_64", sizeof("__.SYMDEF_64")) == 0 || + strncmp(fileName, "__.SYMDEF_64 SORTED", sizeof("__.SYMDEF_64 SORTED")) == 0) { + is_symbol_table = true; + } + } +#endif ///////////////////////////////////////////////// // We found the member file. Load it into memory. @@ -596,6 +607,7 @@ HsInt loadArchive_ (pathchar *path) #endif if (isThin) { if (!readThinArchiveMember(memberSize, path, fileName, image)) { + errorBelch("Failed to read thin member %" PATH_FMT"\n", path); goto fail; } } @@ -630,6 +642,7 @@ HsInt loadArchive_ (pathchar *path) IF_DEBUG(linker, ocDebugBelch(oc, "Faild to verify ... skipping.")); errorBelch("Faild to verify ... skipping."); freeObjectCode( oc ); + //TODO: Unmap or free image continue; } @@ -752,4 +765,3 @@ bool isArchive (pathchar *path) } return strncmp(ARCHIVE_HEADER, buffer, sizeof(ARCHIVE_HEADER)-1) == 0; } - View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/61f0b4c59de631590642b444b9e01d0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/61f0b4c59de631590642b444b9e01d0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/ticked_joins] Allow join point Ids to occur below ticks & casts
by sheaf (＠sheaf) 04 Feb '26

04 Feb '26

sheaf pushed to branch wip/andreask/ticked_joins at Glasgow Haskell Compiler / GHC Commits: 04e5f8e4 by sheaf at 2026-02-04T11:40:48+01:00 Allow join point Ids to occur below ticks & casts This commit classifies all join points into two categories: - true join points - quasi join points A quasi join point is a join point for which a jump is enclosed within a profiling tick or a cast. The only operational difference is that, for quasi join points, we cannot perform the case-of-case transformation described in Note [Join points and case-of-case] in GHC.Core.Opt.Simplify.Iteration. All of this is explained in detail in Note [Quasi join points]. Fixes #26693 and #26642 Improves on #14610, #26157 and #26422, as it means casts/profiling ticks don't prevent join points, but it doesn't entirely fix these issues because we are still inhibiting optimisations (lack of case-of-case). - - - - - 34 changed files: - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.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/Monad.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Id.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - testsuite/tests/profiling/should_run/T2552.prof.sample - testsuite/tests/profiling/should_run/ioprof.prof.sample - testsuite/tests/profiling/should_run/scc001.prof.sample - + testsuite/tests/simplCore/should_compile/QuasiJoinPoints.hs - testsuite/tests/simplCore/should_compile/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/04e5f8e440323bc7d05958b1efb1cf8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/04e5f8e440323bc7d05958b1efb1cf8… You're receiving this email because of your account on gitlab.haskell.org.

1 0