- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/fendor/no-code-output-constr] Add failing test for `-finfo-table-map` and bytecode backend
by Hannes Siebenhandl (＠fendor) 22 Jun '26

22 Jun '26

Hannes Siebenhandl pushed to branch wip/fendor/no-code-output-constr at Glasgow Haskell Compiler / GHC Commits: a376a1c9 by Matthew Pickering at 2026-06-22T13:46:47+02:00 Add failing test for `-finfo-table-map` and bytecode backend If you compile a module using the bytecode backend, with -finfo-table-map, then the info table map doesn't get populated for the module. This is because the -finfo-table-map code path is implemented mostly in the StgToCmm phase which isn't run when creating bytecode. Ticket #27039 - - - - - 4 changed files: - testsuite/tests/ghci/scripts/all.T - + testsuite/tests/ghci/scripts/bytecodeIPE.hs - + testsuite/tests/ghci/scripts/bytecodeIPE.script - + testsuite/tests/ghci/scripts/bytecodeIPE.stdout Changes: ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -385,6 +385,14 @@ test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script']) test('ListTuplePunsPprNoAbbrevTuple', [limit_stdout_lines(14)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script']) test('T24459', normal, ghci_script, ['T24459.script']) test('T24632', normal, ghci_script, ['T24632.script']) +test('bytecodeIPE', + [ expect_broken(27039) + , extra_hc_opts('-finfo-table-map') + , extra_files(['bytecodeIPE.hs']) + , req_rts_linker + , when(arch('wasm32') or arch('javascript'), skip) + ], + ghci_script, ['bytecodeIPE.script']) # Test package renaming in GHCi session test('GhciPackageRename', ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.hs ===================================== @@ -0,0 +1,12 @@ +module BytecodeIPE where + +import Data.Maybe (isJust) +import GHC.InfoProv (whereFrom) + +marker :: String +marker = id "bytecode-stub-init" +{-# NOINLINE marker #-} + +-- `whereFrom` only succeeds if the module's IPE initializer ran. +probe :: IO Bool +probe = isJust <$> whereFrom marker ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.script ===================================== @@ -0,0 +1,2 @@ +:load bytecodeIPE.hs +probe ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.stdout ===================================== @@ -0,0 +1 @@ +True View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a376a1c9849964b5f420cc039b09410… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a376a1c9849964b5f420cc039b09410… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/no-code-output-constr
by Hannes Siebenhandl (＠fendor) 22 Jun '26

22 Jun '26

Hannes Siebenhandl pushed new branch wip/fendor/no-code-output-constr at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fendor/no-code-output-constr You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/reexported-error-message-refactor
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed new branch wip/sol/reexported-error-message-refactor at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sol/reexported-error-message-… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] Reference correct package in error messages for reexported modules
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: dc72e5b4 by Simon Hengel at 2026-06-22T15:36:02+07:00 Reference correct package in error messages for reexported modules (fixes #27417) - - - - - 11 changed files: - + changelog.d/reexported-module-errors - compiler/GHC/Iface/Errors.hs - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Errors/Types.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/State.hs - ghc/GHCi/UI/Exception.hs - + testsuite/tests/package/ImportReexport.hs - + testsuite/tests/package/ImportReexport.stderr - testsuite/tests/package/all.T Changes: ===================================== changelog.d/reexported-module-errors ===================================== @@ -0,0 +1,4 @@ +section: compiler +synopsis: Reference the correct package in error messages when trying to import a reexported module from a hidden package. +issues: #27417 +mrs: !16229 ===================================== compiler/GHC/Iface/Errors.hs ===================================== @@ -128,7 +128,7 @@ cantFindErr unit_env profile mod_name find_result | otherwise -> GenericMissing - (map ((\uid -> (uid, lookupUnit (ue_homeUnitState unit_env) uid))) pkg_hiddens) + pkg_hiddens mod_hiddens unusables files _ -> panic "cantFindErr" ===================================== compiler/GHC/Iface/Errors/Ppr.hs ===================================== @@ -261,13 +261,13 @@ cantFindErrorX pkg_hidden_hint may_show_locations mod_or_interface (CantFindInst .ppr.mkUnit) res ++ if f then [text "a package flag"] else [] ) - pkg_hidden :: (Unit, Maybe UnitInfo) -> SDoc - pkg_hidden (uid, uif) = + pkg_hidden :: UnitInfo -> SDoc + pkg_hidden unit = text "It is a member of the hidden package" - <+> quotes (ppr uid) + <+> quotes (ppr $ unitId unit) --FIXME: we don't really want to show the unit id here we should -- show the source package id or installed package id if it's ambiguous - <> dot $$ maybe empty pkg_hidden_hint uif + <> dot $$ pkg_hidden_hint unit mod_hidden pkg = ===================================== compiler/GHC/Iface/Errors/Types.hs ===================================== @@ -73,7 +73,7 @@ data CantFindInstalledReason | NotAModule | CouldntFindInFiles [FilePath] | GenericMissing - [(Unit, Maybe UnitInfo)] [Unit] + [UnitInfo] [Unit] [UnusableUnit] [FilePath] | MultiplePackages [(Module, ModuleOrigin)] deriving Generic ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -510,9 +510,9 @@ findLookupResult fc fopts r = case r of , fr_suggestions = []}) LookupMultiple rs -> return (FoundMultiple rs) - LookupHidden pkg_hiddens mod_hiddens -> + LookupHidden fr_pkgs_hidden mod_hiddens -> return (NotFound{ fr_paths = [], fr_pkg = Nothing - , fr_pkgs_hidden = map (moduleUnit.fst) pkg_hiddens + , fr_pkgs_hidden , fr_mods_hidden = map (moduleUnit.fst) mod_hiddens , fr_unusables = [] , fr_suggestions = [] }) ===================================== compiler/GHC/Unit/Finder/Types.hs ===================================== @@ -70,7 +70,7 @@ data FindResult , fr_mods_hidden :: [Unit] -- ^ Module is in these units, -- but the *module* is hidden - , fr_pkgs_hidden :: [Unit] -- ^ Module is in these units, + , fr_pkgs_hidden :: [UnitInfo] -- ^ Module is in these units, -- but the *unit* is hidden -- | Module is in these units, but it is unusable ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1905,7 +1905,7 @@ data LookupResult = -- | No modules found, but there were some hidden ones with -- an exact name match. First is due to package hidden, second -- is due to module being hidden - | LookupHidden [(Module, ModuleOrigin)] [(Module, ModuleOrigin)] + | LookupHidden [UnitInfo] [(Module, ModuleOrigin)] -- | No modules found, but there were some unusable ones with -- an exact name match | LookupUnusable [(Module, ModuleOrigin)] @@ -1954,8 +1954,8 @@ lookupModuleWithSuggestions' :: UnitState -> ModuleName -> PkgQual -> LookupResult -lookupModuleWithSuggestions' pkgs mod_map m mb_pn - = case lookupUniqMap mod_map m of +lookupModuleWithSuggestions' pkgs mod_map name mb_pn + = case lookupUniqMap mod_map name of Nothing -> LookupNotFound suggestions Just xs -> case foldl' classify ([],[],[], []) (sortOn fst $ nonDetUniqMapToList xs) of @@ -1974,14 +1974,18 @@ lookupModuleWithSuggestions' pkgs mod_map m mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - _ | originEmpty origin + ModOrigin { fromOrigUnit = origAvailableUnderSameName, fromHiddenReexport } + | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin -> (hidden_pkg, hidden_mod, unusable, x:exposed) | otherwise - -> (x:hidden_pkg, hidden_mod, unusable, exposed) + -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) + where + origUnit :: Maybe UnitInfo + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) - unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr m) + unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit -- Filters out origins which are not associated with the given package @@ -2011,7 +2015,7 @@ lookupModuleWithSuggestions' pkgs mod_map m mb_pn , fromPackageFlag = False -- always excluded } - suggestions = fuzzyLookup (moduleNameString m) all_mods + suggestions = fuzzyLookup (moduleNameString name) all_mods all_mods :: [(String, ModuleSuggestion)] -- All modules all_mods = sortBy (comparing fst) $ ===================================== ghc/GHCi/UI/Exception.hs ===================================== @@ -222,11 +222,13 @@ ghciDiagnosticMessage ghc_opts msg = Just (pprWithUnitState us $ cantFindErrorX pkg_hidden_hint may_show_locations module_or_interface cfi) _ -> Nothing where - + may_show_locations :: [String] -> SDoc may_show_locations = mayShowLocations ":set -v" (ifaceShowTriedFiles opts) + pkg_hidden_hint :: UnitInfo -> SDoc pkg_hidden_hint = pkgHiddenHint hidden_msg (ifaceBuildingCabalPackage opts) where + hidden_msg :: UnitInfo -> SDoc hidden_msg pkg = text "You can run" <+> quotes (text ":set -package " <> ppr (unitPackageName pkg)) <+> ===================================== testsuite/tests/package/ImportReexport.hs ===================================== @@ -0,0 +1,3 @@ +module ImportReexport where +import GHC.Types -- reexported and renamed by ghc-prim from ghc-internal +import GHC.Platform.ArchOS -- reexported by by ghc and ghc-boot + provided by ghc-platform ===================================== testsuite/tests/package/ImportReexport.stderr ===================================== @@ -0,0 +1,12 @@ +ImportReexport.hs:2:1: error: [GHC-87110] + Could not load module ‘GHC.Types’. + It is a member of the hidden package ‘ghc-prim-0.14.0’. + Use -v to see a list of the files searched for. + +ImportReexport.hs:3:1: error: [GHC-87110] + Could not load module ‘GHC.Platform.ArchOS’. + It is a member of the hidden package ‘ghc-10.1’. + It is a member of the hidden package ‘ghc-boot-10.1’. + It is a member of the hidden package ‘ghc-platform-0.1.0.0’. + Use -v to see a list of the files searched for. + ===================================== testsuite/tests/package/all.T ===================================== @@ -13,6 +13,7 @@ test('package04', normal, compile, [incr_containers]) test('package05', normal, compile, [incr_ghc + inc_ghc]) test('package06', normal, compile, [incr_ghc]) test('package06e', normalise_version('ghc'), compile_fail, [incr_ghc]) +test('ImportReexport', normalise_version('ghc'), compile_fail, ['-hide-all-packages -XNoImplicitPrelude']) test('package07e', normalise_version('ghc'), compile_fail, [incr_ghc + inc_ghc + hide_ghc]) test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc]) test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, Data.Set as M)"']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dc72e5b481ca10008c7b8be7df7ded9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dc72e5b481ca10008c7b8be7df7ded9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] More refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: f1e9b87f by Simon Hengel at 2026-06-22T13:52:42+07:00 More refactoring - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1974,7 +1974,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin { fromOrigUnit, fromHiddenReexport } + ModOrigin { fromOrigUnit = origAvailableUnderSameName, fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin @@ -1983,14 +1983,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) where origUnit :: Maybe UnitInfo - origUnit - | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) - | otherwise = Nothing - - origAvailableUnderSameName :: Bool - origAvailableUnderSameName = case fromOrigUnit of - Nothing -> False - Just _ -> True + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f1e9b87f029e662323335406801cb57… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f1e9b87f029e662323335406801cb57… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] More refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: 7e0c68bf by Simon Hengel at 2026-06-22T13:51:04+07:00 More refactoring - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1974,7 +1974,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin { fromOrigUnit, fromHiddenReexport } + ModOrigin { fromOrigUnit = origAvailableUnderSameName , fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin @@ -1983,14 +1983,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) where origUnit :: Maybe UnitInfo - origUnit - | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) - | otherwise = Nothing - - origAvailableUnderSameName :: Bool - origAvailableUnderSameName = case fromOrigUnit of - Nothing -> False - Just _ -> True + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e0c68bf1f58aad03510f5a35821845… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e0c68bf1f58aad03510f5a35821845… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] Refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: fcfa795a by Simon Hengel at 2026-06-22T13:35:29+07:00 Refactoring - - - - - 3 changed files: - compiler/GHC/Unit/State.hs - testsuite/tests/package/ImportReexport.hs - testsuite/tests/package/ImportReexport.stderr Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1969,24 +1969,28 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn classify (hidden_pkg, hidden_mod, unusable, exposed) (m, origin0) = let origin = filterOrigin mb_pn (mod_unit m) origin0 x = (m, origin) - - originUnit :: [UnitInfo] -> [UnitInfo] - originUnit - | moduleName m == name, Just pkg <- lookupUnit pkgs (moduleUnit m) = (pkg :) - | otherwise = id - in case origin of ModHidden -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin _ _ reexports _ + ModOrigin { fromOrigUnit, fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin -> (hidden_pkg, hidden_mod, unusable, x:exposed) | otherwise - -> (reexports ++ originUnit hidden_pkg, hidden_mod, unusable, exposed) + -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) + where + origUnit :: Maybe UnitInfo + origUnit + | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) + | otherwise = Nothing + + origAvailableUnderSameName :: Bool + origAvailableUnderSameName = case fromOrigUnit of + Nothing -> False + Just _ -> True unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit ===================================== testsuite/tests/package/ImportReexport.hs ===================================== @@ -1,2 +1,3 @@ module ImportReexport where -import GHC.Types -- reexported by ghc-prim from ghc-internal +import GHC.Types -- reexported and renamed by ghc-prim from ghc-internal +import GHC.Platform.ArchOS -- reexported by by ghc and ghc-boot + provided by ghc-platform ===================================== testsuite/tests/package/ImportReexport.stderr ===================================== @@ -3,3 +3,10 @@ ImportReexport.hs:2:1: error: [GHC-87110] It is a member of the hidden package ‘ghc-prim-0.14.0’. Use -v to see a list of the files searched for. +ImportReexport.hs:3:1: error: [GHC-87110] + Could not load module ‘GHC.Platform.ArchOS’. + It is a member of the hidden package ‘ghc-10.1’. + It is a member of the hidden package ‘ghc-boot-10.1’. + It is a member of the hidden package ‘ghc-platform-0.1.0.0’. + Use -v to see a list of the files searched for. + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fcfa795ad8256084624302865141297… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fcfa795ad8256084624302865141297… 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: TTG: Add extension points to HsConDetails
by Marge Bot (＠marge-bot) 22 Jun '26

22 Jun '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 4efb4a66 by Alan Zimmerman at 2026-06-18T14:41:14-04:00 TTG: Add extension points to HsConDetails Extend HsConDetails as data HsConDetails p arg rec = PrefixCon !(XPrefixCon p) [arg] -- C @t1 @t2 p1 p2 p3 | RecCon !(XRecCon p) rec -- C { x = p1, y = p2 } | InfixCon !(XInfixCon p) arg arg -- p1 `C` p2 | XHsConDetails !(XXHsConDetails p) type family XPrefixCon p type family XRecCon p type family XInfixCon p type family XXHsConDetails p - - - - - c8d27dd4 by Simon Jakobi at 2026-06-18T14:41:59-04:00 CI: quiet submodule clean output in after_script and setup The clean and cleanup_submodules functions ran 'git submodule foreach git clean -xdf', flooding the job log with 'Entering ...' and 'Removing ...' lines. Pass --quiet to 'git submodule' and -q to 'git clean' to drop the success output; errors are still reported. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - afaee09f by Andreas Klebinger at 2026-06-22T02:35:05-04:00 compiler: Deduplicate hscTidy This function was accidentally duplicated during a refactor. Fixes #27351 - - - - - f5db8148 by sheaf at 2026-06-22T02:35:15-04:00 Avoid mkTick in Core Prep breaking ANF (part II) Hotfix for 2f9579765f55b3920ceb2e04995ff41a9d0e2d4e fixing a small oversight in the call to tickTickedExpr from mkTick, in which we improperly recursively called mkTick without passing on the preserve_anf flag. Fixes #27386 - - - - - 58 changed files: - .gitlab/ci.sh - + changelog.d/T27386 - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Driver/Main/Interactive.hs - compiler/GHC/Driver/Main/Passes.hs - compiler/GHC/Driver/Main/Passes.hs-boot - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Constructor.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/ThToHs.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/printer/Test24533.stdout - + testsuite/tests/profiling/should_compile/T27386.hs - testsuite/tests/profiling/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.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/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.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/-/compare/4cc795c741ba37c6db360737b9aea7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4cc795c741ba37c6db360737b9aea7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/fix-prof-segv] Add test and changelog for #27123 fix.
by Andreas Klebinger (＠AndreasK) 22 Jun '26

22 Jun '26

Andreas Klebinger pushed to branch wip/andreask/fix-prof-segv at Glasgow Haskell Compiler / GHC Commits: 5411bdca by Andreas Klebinger at 2026-06-22T06:27:30+00:00 Add test and changelog for #27123 fix. - - - - - 3 changed files: - + changelog.d/T27123.md - + testsuite/tests/rts/T27123.hs - testsuite/tests/rts/all.T Changes: ===================================== changelog.d/T27123.md ===================================== @@ -0,0 +1,7 @@ +section: compiler +synopsis: Fix two crashes that could happen in a multithreaded setting when profiling. +description: There where two bugs that could cause occasional segfaults or crashes with +an `PAP object entered` error when profiling. They only happened when two threads +where racing to evaluate the same thunk, and specific GC timings. +mrs: !16214 +issues: #27123 ===================================== testsuite/tests/rts/T27123.hs ===================================== @@ -0,0 +1,65 @@ +{-# OPTIONS_GHC -fno-full-laziness -fno-worker-wrapper #-} +{-# LANGUAGE MagicHash, UnboxedTuples #-} + +-- This test checks that the auto-apply code (stg_ap_0_fast, stg_ap_p) is robust +-- against another thread or the GC evaluating a closure at the same time. + +module Main + -- (main) +where + +import Control.Monad +import Control.Concurrent +import System.IO +import GHC.Data.SmallArray +import GHC.Exts +import GHC.IO + +type Arr = SmallMutableArray RealWorld (Int->Int) + +io :: (State# RealWorld -> (# State# RealWorld, a #)) -> IO a +io f = IO f + +io_ :: (State# RealWorld -> State# RealWorld ) -> IO () +io_ f = IO (\s -> case f s of s2 -> (# s2, () #)) + +{-# NOINLINE readSmallArray #-} +readSmallArray (SmallMutableArray arr) (I# idx) = IO $ \s -> case readSmallArray# arr idx s of + (# s2, r #) -> (# s2, r #) + +-- Continually overwrites the array with unevaluated thunks that will evaluated to +-- a PAP under profiling. +{-# NOINLINE mkThunks #-} +mkThunks :: Arr -> IO () +mkThunks arr = do + forever $ do + yield + forM_ [0..100] $ \_j -> do + forM_ [0..5 :: Int] $ \i -> do + -- With profiling results in a thunk that will evaluate to a PAP capturing the SCC + let g = {-# SCC g #-} succ + io_ (writeSmallArray arr i g) + +-- Evaluate the array repeatedly in the given order. +{-# NOINLINE evaluateThunks #-} +evaluateThunks :: Arr -> [Int] -> IO () +evaluateThunks arr idxs = do + forever $ do + yield + -- putStr "." >> hFlush stdout + forM [0..5000::Int] $ \j -> do + forM_ idxs $ \i -> do + !g <- readSmallArray arr i + seq (g i) (pure ()) + +main :: IO () +main = do + -- We spawn three threads. Two are evaluating the thunks in the array in opposite directions + -- One thread is + arr <- io (newSmallArray 6 (id)) + _ <- forkIO $ do + evaluateThunks arr [0..5] + _ <- forkIO $ do + evaluateThunks arr [5,4..0] + forkIO $ mkThunks arr + threadDelay 10_000_000 ===================================== testsuite/tests/rts/all.T ===================================== @@ -687,3 +687,5 @@ test('ClosureTable', ['-debug -O0 ClosureTable_c.c -I{top}/../rts -I{top}/../rts/include']) test('resizeMutableByteArrayInPlace', [req_cmm, extra_ways(['optasm', 'sanity']), only_ways(['optasm', 'sanity'])], compile_and_run, ['']) + +test('T27123', [extra_ways(['optasm']), when(have_profiling(), extra_ways(['prof']))], compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5411bdca908f495a1fb318c917e2142… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5411bdca908f495a1fb318c917e2142… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/fix-prof-segv] Add test and changelog for #27123 fix.
by Andreas Klebinger (＠AndreasK) 22 Jun '26

22 Jun '26

Andreas Klebinger pushed to branch wip/andreask/fix-prof-segv at Glasgow Haskell Compiler / GHC Commits: 39f0b896 by Andreas Klebinger at 2026-06-22T06:24:20+00:00 Add test and changelog for #27123 fix. - - - - - 3 changed files: - + changelog.d/T27123.md - + testsuite/tests/rts/T27123.hs - testsuite/tests/rts/all.T Changes: ===================================== changelog.d/T27123.md ===================================== @@ -0,0 +1,7 @@ +section: compiler +synopsis: Fix two crashes that could happen in a multithreaded setting when profiling. +description: There where two bugs that could cause occasional segfaults or crashes with +an `PAP object entered` error when profiling. They only happened when two threads +where racing to evaluate the same thunk, and specific GC timings. +mrs: !16214 +issues: #27123 ===================================== testsuite/tests/rts/T27123.hs ===================================== @@ -0,0 +1,65 @@ +{-# OPTIONS_GHC -fno-full-laziness -fno-worker-wrapper #-} +{-# LANGUAGE MagicHash, UnboxedTuples #-} + +-- This test checks that the auto-apply code (stg_ap_0_fast, stg_ap_p) is robust +-- against another thread or the GC evaluating a closure at the same time. + +module Main + -- (main) +where + +import Control.Monad +import Control.Concurrent +import System.IO +import GHC.Data.SmallArray +import GHC.Exts +import GHC.IO + +type Arr = SmallMutableArray RealWorld (Int->Int) + +io :: (State# RealWorld -> (# State# RealWorld, a #)) -> IO a +io f = IO f + +io_ :: (State# RealWorld -> State# RealWorld ) -> IO () +io_ f = IO (\s -> case f s of s2 -> (# s2, () #)) + +{-# NOINLINE readSmallArray #-} +readSmallArray (SmallMutableArray arr) (I# idx) = IO $ \s -> case readSmallArray# arr idx s of + (# s2, r #) -> (# s2, r #) + +-- Continually overwrites the array with unevaluated thunks that will evaluated to +-- a PAP under profiling. +{-# NOINLINE mkThunks #-} +mkThunks :: Arr -> IO () +mkThunks arr = do + forever $ do + yield + forM_ [0..100] $ \_j -> do + forM_ [0..5 :: Int] $ \i -> do + -- With profiling results in a thunk that will evaluate to a PAP capturing the SCC + let g = {-# SCC g #-} succ + io_ (writeSmallArray arr i g) + +-- Evaluate the array repeatedly in the given order. +{-# NOINLINE evaluateThunks #-} +evaluateThunks :: Arr -> [Int] -> IO () +evaluateThunks arr idxs = do + forever $ do + yield + -- putStr "." >> hFlush stdout + forM [0..5000::Int] $ \j -> do + forM_ idxs $ \i -> do + !g <- readSmallArray arr i + seq (g i) (pure ()) + +main :: IO () +main = do + -- We spawn three threads. Two are evaluating the thunks in the array in opposite directions + -- One thread is + arr <- io (newSmallArray 6 (id)) + _ <- forkIO $ do + evaluateThunks arr [0..5] + _ <- forkIO $ do + evaluateThunks arr [5,4..0] + forkIO $ mkThunks arr + threadDelay 30_000_000 ===================================== testsuite/tests/rts/all.T ===================================== @@ -687,3 +687,5 @@ test('ClosureTable', ['-debug -O0 ClosureTable_c.c -I{top}/../rts -I{top}/../rts/include']) test('resizeMutableByteArrayInPlace', [req_cmm, extra_ways(['optasm', 'sanity']), only_ways(['optasm', 'sanity'])], compile_and_run, ['']) + +test('T27123', [extra_ways(['optasm']), when(have_profiling(), extra_ways(['prof']))], compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/39f0b896bf566afcbe3523052250fb9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/39f0b896bf566afcbe3523052250fb9… You're receiving this email because of your account on gitlab.haskell.org.

1 0