- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/fix-26953] Monomorphising GHC pass parameters where appropriate
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 8ad34dc4 by Recursion Ninja at 2026-06-26T13:48:24-04:00 Monomorphising GHC pass parameters where appropriate - - - - - 4 changed files: - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Rename/Pat.hs - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Iface/Syntax.hs ===================================== @@ -671,7 +671,7 @@ fromIfaceWarningTxt = \case fromIfaceStringLiteralWithNames :: (IfaceStringLiteral, [IfExtName]) -> WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLoc names) -fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral (GhcPass p) +fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral GhcRn fromIfaceStringLiteral (IfStringLiteral st fs) = StringLiteral st fs ===================================== compiler/GHC/Iface/Warnings.hs ===================================== @@ -28,6 +28,6 @@ toIfaceWarningTxt (DeprecatedTxt src strs) = IfDeprecatedTxt src (map (toIfaceSt toIfaceStringLiteralWithNames :: WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn -> (IfaceStringLiteral, [IfExtName]) toIfaceStringLiteralWithNames (WithHsDocIdentifiers src names) = (toIfaceStringLiteral src, map unLoc names) -toIfaceStringLiteral :: StringLiteral (GhcPass p) -> IfaceStringLiteral +toIfaceStringLiteral :: StringLiteral GhcRn -> IfaceStringLiteral toIfaceStringLiteral sLit = IfStringLiteral (stringLitSourceText sLit) (sl_fs sLit) ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -1026,7 +1026,7 @@ getFieldIds flds = map (hsRecFieldSel . unLoc) flds getFieldRdrs :: [LHsRecField GhcRn arg] -> [RdrName] getFieldRdrs flds = map (foExt . unXRec @GhcRn . hfbLHS . unLoc) flds -getFieldLbls :: [LHsRecField (GhcPass p) arg] -> [IdGhcP p] +getFieldLbls :: [LHsRecField GhcRn arg] -> [IdGhcP p] getFieldLbls flds = map (unLoc . foLabel . unLoc . hfbLHS . unLoc) flds ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1584,7 +1584,7 @@ instance ExactPrint (LocatedP (WarningTxt GhcPs)) where c' <- markEpToken c return (L (EpAnn l (AnnPragma o' c' (os',cs') l1 l2 t m) css) (DeprecatedTxt src ws')) -instance Typeable p => ExactPrint (InWarningCategory (GhcPass p)) where +instance Typeable p => ExactPrint (InWarningCategory GhcPs) where getAnnotationEntry _ = NoEntryVal setAnnotationAnchor a _ _ _ = a @@ -1969,7 +1969,7 @@ exactNsSpec (DataNamespaceSpecifier data_) = do -- --------------------------------------------------------------------- -instance Typeable p => ExactPrint (StringLiteral (GhcPass p)) where +instance Typeable p => ExactPrint (StringLiteral GhcPs) where getAnnotationEntry = const NoEntryVal setAnnotationAnchor a _ _ _ = a View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ad34dc4449f5bbd7e75785cb35e710… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ad34dc4449f5bbd7e75785cb35e710… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] Monomorphising GHC pass parameters where appropriate
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 182e1846 by Recursion Ninja at 2026-06-26T13:45:06-04:00 Monomorphising GHC pass parameters where appropriate - - - - - 5 changed files: - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Rename/Pat.hs - libraries/process - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Iface/Syntax.hs ===================================== @@ -671,7 +671,7 @@ fromIfaceWarningTxt = \case fromIfaceStringLiteralWithNames :: (IfaceStringLiteral, [IfExtName]) -> WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLoc names) -fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral (GhcPass p) +fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral GhcRn fromIfaceStringLiteral (IfStringLiteral st fs) = StringLiteral st fs ===================================== compiler/GHC/Iface/Warnings.hs ===================================== @@ -28,6 +28,6 @@ toIfaceWarningTxt (DeprecatedTxt src strs) = IfDeprecatedTxt src (map (toIfaceSt toIfaceStringLiteralWithNames :: WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn -> (IfaceStringLiteral, [IfExtName]) toIfaceStringLiteralWithNames (WithHsDocIdentifiers src names) = (toIfaceStringLiteral src, map unLoc names) -toIfaceStringLiteral :: StringLiteral (GhcPass p) -> IfaceStringLiteral +toIfaceStringLiteral :: StringLiteral GhcRn -> IfaceStringLiteral toIfaceStringLiteral sLit = IfStringLiteral (stringLitSourceText sLit) (sl_fs sLit) ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -1026,7 +1026,7 @@ getFieldIds flds = map (hsRecFieldSel . unLoc) flds getFieldRdrs :: [LHsRecField GhcRn arg] -> [RdrName] getFieldRdrs flds = map (foExt . unXRec @GhcRn . hfbLHS . unLoc) flds -getFieldLbls :: [LHsRecField (GhcPass p) arg] -> [IdGhcP p] +getFieldLbls :: [LHsRecField GhcRn arg] -> [IdGhcP p] getFieldLbls flds = map (unLoc . foLabel . unLoc . hfbLHS . unLoc) flds ===================================== libraries/process ===================================== @@ -1 +1 @@ -Subproject commit 11fd247ad33208da7a914acf15d4a09d64a6a4c4 +Subproject commit 92deb52c1781bf10ad390296dbc435abe103bfe4 ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1584,7 +1584,7 @@ instance ExactPrint (LocatedP (WarningTxt GhcPs)) where c' <- markEpToken c return (L (EpAnn l (AnnPragma o' c' (os',cs') l1 l2 t m) css) (DeprecatedTxt src ws')) -instance Typeable p => ExactPrint (InWarningCategory (GhcPass p)) where +instance Typeable p => ExactPrint (InWarningCategory GhcPs) where getAnnotationEntry _ = NoEntryVal setAnnotationAnchor a _ _ _ = a @@ -1969,7 +1969,7 @@ exactNsSpec (DataNamespaceSpecifier data_) = do -- --------------------------------------------------------------------- -instance Typeable p => ExactPrint (StringLiteral (GhcPass p)) where +instance Typeable p => ExactPrint (StringLiteral GhcPs) where getAnnotationEntry = const NoEntryVal setAnnotationAnchor a _ _ _ = a View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/182e1846f9fb465b1265c8a5e7987da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/182e1846f9fb465b1265c8a5e7987da… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch wip/fix-26953-2
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja deleted branch wip/fix-26953-2 at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] Decoupling 'L.H.S' from 'GHC.Types.SourceText'
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: bc16fb06 by Recursion Ninja at 2026-06-26T13:31:53-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Fixes #26953 - - - - - 53 changed files: - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bc16fb0695ef474dbf9ef818f38c3e4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bc16fb0695ef474dbf9ef818f38c3e4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-26953-2
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

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

1 0

[Git][ghc/ghc][wip/fix-26953] Decoupling 'L.H.S' from 'GHC.Types.SourceText'
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 0a02f1a9 by Recursion Ninja at 2026-06-26T13:26:36-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Fixes #26953 - - - - - 54 changed files: - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - libraries/process - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a02f1a94bb112c084089eec914127a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a02f1a94bb112c084089eec914127a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 9 commits: perf: Share Module in Iface Symbol Table
by Marge Bot (＠marge-bot) 26 Jun '26

26 Jun '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 810cc685 by Rodrigo Mesquita at 2026-06-26T12:54:21-04:00 perf: Share Module in Iface Symbol Table This commit modifies the structure of the serialized `SymbolTable Name` to then re-use and share the `Module` (both on disk and in memory) across all `Name`s from the same module. The new structure looks like: <total name count> $modules.size for (mod, names) in $modules: $mod $names.size for table_ix, occ in $names $table_ix $occ i.e. we put the module just once, followed by all names in that module. When deserializing, we deserialize the module just once, and all the following `Name`s are constructed with a pointer to that same decoded `Module`. In `hoogle-test`, we must use `DNameEnv` rather than `Map Name`, otherwise the output fixities order was susceptible to changes in the uniques assigned to each Names, which is not stable. Fixes #27401 ------------------------- Metric Decrease: InstanceMatching LinkableUsage01 LinkableUsage02 hard_hole_fits ------------------------- - - - - - 349c4045 by Simon Hengel at 2026-06-26T12:54:22-04:00 Rename `MCDiagnostic` to `InternalMCDiagnostic` `MCDiagnostic` is meant to be used for compiler diagnostics. Any code that creates `MCDiagnostic` directly, without going through `GHC.Driver.Errors.printMessage`, sidesteps `-fdiagnostics-as-json` (see e.g. !14616, !14475, !14492 !14548). To avoid this in the future, this change more narrowly controls who creates `MCDiagnostic` (see #24113). - - - - - 3e2e509b by Facundo Domínguez at 2026-06-26T12:54:26-04:00 Encapsulate options of occurAnalysePgm in a record - - - - - bc693049 by Facundo Domínguez at 2026-06-26T12:54:26-04:00 Allow to configure the occurrence analyser to retain some dead bindings This is needed by plugins that are the only consumers of a binding which is otherwise unused in the program. See Note [Controlling elimination of dead bindings in occurrence analysis] added in this commit, or https://gitlab.haskell.org/ghc/ghc/-/issues/27240 for more discussion. - - - - - 4ce66380 by Copilot at 2026-06-26T12:54:26-04:00 Address documentation feedback - - - - - a0263f9c by Copilot at 2026-06-26T12:54:27-04:00 Keep the imp_rules parameter of occurPgmAnalysePgm and add occ_opts to OccEnv - - - - - 633b0995 by Copilot at 2026-06-26T12:54:27-04:00 Strengthen T27240.hs with a binding that should be removed - - - - - 48cf34d9 by Copilot at 2026-06-26T12:54:27-04:00 Move the reference #27240 to a related paragraph - - - - - 859c956d by Simon Hengel at 2026-06-26T12:54:27-04:00 Remove deprecated flag `-ddump-json` (see #24113) This was first deprecated in 9.10.1. - - - - - 46 changed files: - + changelog.d/add_can_drop_to_occurence_analyser - + changelog.d/remove-ddump-json-flag - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/Simplify.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Driver/Config.hs - compiler/GHC/Driver/Errors.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main/Passes.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Error.hs - − compiler/GHC/Types/Error.hs-boot - compiler/GHC/Types/SourceError.hs - compiler/GHC/Unit/Module/Env.hs - compiler/GHC/Utils/Error.hs - compiler/GHC/Utils/Logger.hs - docs/users_guide/debugging.rst - ghc/GHCi/UI.hs - ghc/GHCi/UI/Exception.hs - testsuite/tests/driver/T16167.stderr - − testsuite/tests/driver/T16167.stdout - testsuite/tests/driver/all.T - testsuite/tests/driver/json2.stderr - − testsuite/tests/driver/json_dump.hs - − testsuite/tests/driver/json_dump.stderr - + testsuite/tests/ghc-api/T27240.hs - testsuite/tests/ghc-api/all.T - testsuite/tests/overloadedrecflds/should_compile/DRFPatSynExport.stdout - testsuite/tests/rename/should_compile/T1792_imports.stdout - testsuite/tests/rename/should_compile/T18264.stdout - testsuite/tests/rename/should_compile/T4239.stdout - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/DocsInHiFileTH.stdout - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr - utils/check-exact/Main.hs - utils/check-exact/Preprocess.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/120dc0deade325d1b1727ea3e5866a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/120dc0deade325d1b1727ea3e5866a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T27437] 3 commits: NCG: avoid boxing the insert-lookup result in livenessBlock
by Simon Jakobi (＠sjakobi2) 26 Jun '26

26 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T27437 at Glasgow Haskell Compiler / GHC Commits: 94670147 by Simon Jakobi at 2026-06-26T15:01:42+02:00 NCG: avoid boxing the insert-lookup result in livenessBlock mapInsertLookup's (Maybe v, LabelMap v) pair was allocated and shared because livenessBlock bound it with a lazy let-pattern and scrutinised it twice. Mark mapInsertLookup INLINE and consume it with a single case, so the pair cancels via case-of-known-constructor instead of being allocated. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 090ac14a by Simon Jakobi at 2026-06-26T18:28:35+02:00 Revert "NCG: avoid boxing the insert-lookup result in livenessBlock" This reverts commit 94670147695768dab9a9cdb4c7f40334539e2d36. - - - - - 3613ce02 by Simon Jakobi at 2026-06-26T18:28:39+02:00 Revert "NCG: fuse the liveness fixpoint change-detection lookup into the insert" This reverts commit d8a819e71e67f9e372cd92126f2fb63bcdea0419. - - - - - 2 changed files: - compiler/GHC/Cmm/Dataflow/Label.hs - compiler/GHC/CmmToAsm/Reg/Liveness.hs Changes: ===================================== compiler/GHC/Cmm/Dataflow/Label.hs ===================================== @@ -35,7 +35,6 @@ module GHC.Cmm.Dataflow.Label , mapEmpty , mapSingleton , mapInsert - , mapInsertLookup , mapInsertWith , mapDelete , mapAlter @@ -200,13 +199,6 @@ mapSingleton (Label k) v = LM (M.singleton k v) mapInsert :: Label -> v -> LabelMap v -> LabelMap v mapInsert (Label k) v (LM m) = LM (M.insert k v m) --- | Insert a value, also returning the value previously bound to the key (if --- any). Fuses the insert and lookup into a single traversal of the map. -mapInsertLookup :: Label -> v -> LabelMap v -> (Maybe v, LabelMap v) -mapInsertLookup (Label k) v (LM m) = - case M.insertLookupWithKey (\_ new _ -> new) k v m of - (old, m') -> (old, LM m') - mapInsertWith :: (v -> v -> v) -> Label -> v -> LabelMap v -> LabelMap v mapInsertWith f (Label k) v (LM m) = LM (M.insertWith f k v m) ===================================== compiler/GHC/CmmToAsm/Reg/Liveness.hs ===================================== @@ -891,7 +891,7 @@ livenessSCCs _ blockmap done [] = (done, blockmap) livenessSCCs platform blockmap done (AcyclicSCC block : sccs) - = let (_, blockmap', block') = livenessBlock platform blockmap block + = let (blockmap', block') = livenessBlock platform blockmap block in livenessSCCs platform blockmap' (AcyclicSCC block' : done) sccs livenessSCCs platform blockmap done @@ -909,9 +909,8 @@ livenessSCCs platform blockmap done | otherwise = (bm', blocks'') where (changed, bm', blocks'') = linearLiveness bm blocks - -- Like @mapAccumL (livenessBlock platform)@, but also OR's together - -- the per-block changed flags reported by livenessBlock, so the - -- caller can detect the fixed point without comparing block maps. + -- Like @mapAccumL (livenessBlock platform)@, but also reports whether + -- any of the SCC's blocks changed. linearLiveness :: Instruction instr => BlockMap Regs -> [LiveBasicBlock instr] @@ -921,8 +920,10 @@ livenessSCCs platform blockmap done go !changed bm [] = (changed, bm, []) go !changed bm (block : blks') = case livenessBlock platform bm block of - (blockChanged, bm', block') -> - let !changed' = changed || blockChanged + (bm', block') -> + let bid = blockId block + !changed' = changed + || mapLookup bid bm /= mapLookup bid bm' in case go changed' bm' blks' of (changed'', bm'', blks'') -> (changed'', bm'', block' : blks'') @@ -935,23 +936,19 @@ livenessBlock => Platform -> BlockMap Regs -> LiveBasicBlock instr - -> (Bool, BlockMap Regs, LiveBasicBlock instr) + -> (BlockMap Regs, LiveBasicBlock instr) livenessBlock platform blockmap (BasicBlock block_id instrs) = let (regsLiveOnEntry, instrs1) = livenessBack platform noRegs blockmap [] (reverse instrs) - -- Fuse the insert with the lookup of the old entry, so the fixpoint - -- loop in livenessSCCs can tell whether this block changed for free, - -- without a separate map traversal. - (oldEntry, blockmap') = mapInsertLookup block_id regsLiveOnEntry blockmap - changed = oldEntry /= Just regsLiveOnEntry + blockmap' = mapInsert block_id regsLiveOnEntry blockmap instrs2 = livenessForward platform regsLiveOnEntry instrs1 output = BasicBlock block_id instrs2 - in (changed, blockmap', output) + in ( blockmap', output) -- | Calculate liveness going forwards, -- filling in when regs are born View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d8a819e71e67f9e372cd92126f2fb6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d8a819e71e67f9e372cd92126f2fb6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-unreg] hadrian/rts: fix unregisterised build for gcc 15+
by Cheng Shao (＠TerrorJack) 26 Jun '26

26 Jun '26

Cheng Shao pushed to branch wip/fix-unreg at Glasgow Haskell Compiler / GHC Commits: cab3cfbc by Cheng Shao at 2026-06-26T16:23:18+00:00 hadrian/rts: fix unregisterised build for gcc 15+ This patch fixes unregisterised build for gcc 15+: - Pass -optc-Wno-error in hadrian when +werror enables -optc-Werror, see added comment for details. - For RTS functions that the codegen would emit calls, ensure their real prototype is hidden when the header is included in .hc fies (IN_STG_CODE), and the dummy prototype is provided to match the EFF_ convention. In the future we should get rid of EFF_ (#14647) and remove these hacks, but for now this patch makes unregisterised work again on newer toolchains. Fixes #27404. Co-authored-by: Codex <codex(a)openai.com> - - - - - 4 changed files: - + changelog.d/fix-unreg - hadrian/src/Flavour.hs - rts/include/rts/NonMoving.h - rts/include/stg/MiscClosures.h Changes: ===================================== changelog.d/fix-unreg ===================================== @@ -0,0 +1,4 @@ +section: packaging +synopsis: Fix unregisterised build for gcc 15+ +issues: #27404 +mrs: !16264 ===================================== hadrian/src/Flavour.hs ===================================== @@ -35,7 +35,9 @@ import Data.Either import Data.Map (Map) import qualified Data.Map as M import qualified Data.Set as Set +import GHC.Toolchain.Target import Oracles.Flag +import Oracles.Setting import Packages import Flavour.Type import Settings.Parser @@ -140,8 +142,9 @@ addArgs args' fl = fl { extraArgs = extraArgs fl <> args' } -- in unix and/or hsc2hs to make cross-compiling unix completely free -- from warnings. werror :: Flavour -> Flavour -werror = - addArgs $ mconcat +werror = addArgs $ do + stage <- getStage + mconcat [ builder Ghc ? notStage0 ? mconcat @@ -159,6 +162,15 @@ werror = , arg "-optc-Wno-error=unknown-pragmas" -- rejected inlinings are highly dependent upon toolchain and way , arg "-optc-Wno-error=inline" + -- when building unregisterised, gcc 15+ complains "error: + -- function called through a non-compatible type" with + -- -Werror (#27404). no corresponding -Wno-foo for it so + -- -Wno-error is needed. + -- + -- TODO: get rid of EFF_ altogether (#14647) and make sure + -- unregisterised backend emits clean C without needing + -- these hacks. + , queryTargetTarget stage tgtUnregisterised ? arg "-optc-Wno-error" ] -- N.B. We currently don't build the boot libraries' C sources with -Werror -- as this tends to be a portability nightmare. ===================================== rts/include/rts/NonMoving.h ===================================== @@ -18,6 +18,14 @@ struct StgClosure_; struct StgThunk_; struct Capability_; +#if IN_STG_CODE + +EFF_(updateRemembSetPushClosure_); + +EFF_(updateRemembSetPushThunk_); + +#else + /* This is called by the code generator */ extern void updateRemembSetPushClosure_(StgRegTable *reg, struct StgClosure_ *p); @@ -25,6 +33,8 @@ void updateRemembSetPushClosure_(StgRegTable *reg, struct StgClosure_ *p); extern void updateRemembSetPushThunk_(StgRegTable *reg, struct StgThunk_ *p); +#endif + // Forward declaration for unregisterised backend. EF_(stg_copyArray_barrier); ===================================== rts/include/stg/MiscClosures.h ===================================== @@ -617,7 +617,11 @@ extern StgWord CCS_SYSTEM[]; // 'GHC.StgToCmm.Prof' // as opposed to real prototype declared in // 'rts/include/rts/prof/CCS.h' +#if IN_STG_CODE +EFF_(enterFunCCS); +#else void enterFunCCS (void *reg, void *ccsfn); +#endif void * pushCostCentre (void *ccs, void *cc); // Capability.c View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cab3cfbccc0d99fb2910689124e1b2a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cab3cfbccc0d99fb2910689124e1b2a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] Decoupling 'L.H.S' from 'GHC.Types.SourceText'
by recursion-ninja (＠recursion-ninja) 26 Jun '26

26 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: d1ac8b13 by Recursion Ninja at 2026-06-26T11:31:05-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Fixes #26953 - - - - - 54 changed files: - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - libraries/process - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d1ac8b13956697e975c207fbcb10d50… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d1ac8b13956697e975c207fbcb10d50… You're receiving this email because of your account on gitlab.haskell.org.

1 0