- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Make `ibi_info_mod` rendered in quotes, like `bi_tick_mod`
by Wolfgang Jeltsch (＠jeltsch) 28 Jul '26

28 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: 08ba2433 by Wolfgang Jeltsch at 2026-07-28T14:42:10+03:00 Make `ibi_info_mod` rendered in quotes, like `bi_tick_mod` - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -222,7 +222,9 @@ pprInternalBreakpointID -> SDoc -- ^ The textual information pprInternalBreakpointID current_module InternalBreakpointId {..} | ibi_info_mod == current_module = indexDoc - | otherwise = indexDoc <+> text "in" <+> ppr ibi_info_mod + | otherwise = indexDoc <+> + text "in" <+> + quotes (ppr ibi_info_mod) where indexDoc :: SDoc View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/08ba243389dca17ff60bcc0797cf91c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/08ba243389dca17ff60bcc0797cf91c… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/9.14.2-backports] 2 commits: hadrian: add text and parsec to stage0Packages
by Zubin (＠wz1000) 28 Jul '26

28 Jul '26

Zubin pushed to branch wip/9.14.2-backports at Glasgow Haskell Compiler / GHC Commits: c506d4b4 by Zubin Duggal at 2026-07-28T17:10:17+05:30 hadrian: add text and parsec to stage0Packages text depends on template-haskell-lift, and template-haskell-lift needs to be built in tree rather than using the boot package, so `text` and `parsec` (which depends on `text`) must also be built in tree rather than copied from the boot pkgdb. Also need to disable -simdutf for text when building the stage0 version, wasm backend doesn't like -simdutf. - - - - - 4f3b5006 by Zubin Duggal at 2026-07-28T17:11:11+05:30 Prepare 9.14.2 Bump filpath submodule to 1.5.5.0 Bump Win32 submodule to 2.14.2.2 Metric Increase: T4029 T13379 haddock.base libdir Metric Decrease: T5030 T24602_perf_size T25046_perf_size_gzip T25046_perf_size_unicode T25046_perf_size_unicode_gzip - - - - - 46 changed files: - − changelog.d/26616 - − changelog.d/T26978 - − changelog.d/T26979 - − changelog.d/T27046 - − changelog.d/T27047 - − changelog.d/T27123.md - − changelog.d/T27124.md - − changelog.d/T27131 - − changelog.d/T27182.md - − changelog.d/T27202 - − changelog.d/T27225 - − changelog.d/T27386 - − changelog.d/bump-process - − changelog.d/deterministic-usage-order - − changelog.d/fix-absent-dict-projection - − changelog.d/fix-blackhole-handling - − changelog.d/fix-cmm-atomic-load-store - − changelog.d/fix-compacting-gc-ap-27434 - − changelog.d/fix-exponential-case-desugar-27383 - − changelog.d/fix-finalizers-27072 - − changelog.d/fix-layout-stack-fcall - − changelog.d/fix-peekitbl-no-tntc - − changelog.d/fix-use-std-ap-thunk - − changelog.d/ghc-pkg-faster-closure - − changelog.d/hadrian-stale-package-confs-26661 - − changelog.d/jobserver-leak-fix - − changelog.d/more-efficient-home-unit-imports-finding - − changelog.d/reexported-module-errors - − changelog.d/semaphore-v2 - − changelog.d/tag-inference-27005 - − changelog.d/unused-type - − changelog.d/wasm-fix-serviceworker - − changelog.d/windows-rethrow-overlapped-exception - configure.ac - docs/users_guide/9.14.2-notes.rst - hadrian/bootstrap/generate_bootstrap_plans - + hadrian/bootstrap/plan-9_10_3.json - + hadrian/bootstrap/plan-9_12_4.json - + hadrian/bootstrap/plan-bootstrap-9_10_3.json - + hadrian/bootstrap/plan-bootstrap-9_12_4.json - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - libraries/Win32 - libraries/base/base.cabal.in - libraries/base/changelog.md - libraries/filepath The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b65eecce8258934bc0c23ae1f8a330… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b65eecce8258934bc0c23ae1f8a330… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] 2 commits: Correct layout
by Wolfgang Jeltsch (＠jeltsch) 28 Jul '26

28 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: cf1af5fb by Wolfgang Jeltsch at 2026-07-28T14:22:50+03:00 Correct layout - - - - - 45fe5dfb by Wolfgang Jeltsch at 2026-07-28T14:38:40+03:00 Switch to indentation with two spaces - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -11,19 +11,19 @@ import GHC.Prelude -- Bytecode import GHC.ByteCode.Types ( - FFIInfo (..), - BCONPtr (..), - BCOPtr (..), - UnlinkedBCO (..), - ByteCodeHpcInfo (..), - CompiledByteCode (..) + FFIInfo (..), + BCONPtr (..), + BCOPtr (..), + UnlinkedBCO (..), + ByteCodeHpcInfo (..), + CompiledByteCode (..) ) import GHC.ByteCode.Breakpoints ( - InternalBreakpointId (..), - InternalBreakLoc (..), - CgBreakInfo (..), - InternalModBreaks (..) + InternalBreakpointId (..), + InternalBreakLoc (..), + CgBreakInfo (..), + InternalModBreaks (..) ) import GHC.ByteCode.Binary (OnDiskModuleByteCode (..)) import GHC.ByteCode.Serialize (readOnDiskModuleByteCode) @@ -45,17 +45,17 @@ import GHC.Utils.Binary (BinSrcSpan (..)) import GHC.Utils.Encoding.UTF8 (utf8DecodeShortByteString, utf8DecodeByteString) import GHC.Utils.Outputable ( - defaultDumpStyle, - SDoc, - text, - (<>), - (<+>), - quotes, - hsep, - vcat, - hang, - withPprStyle, - ppr + defaultDumpStyle, + SDoc, + text, + (<>), + (<+>), + quotes, + hsep, + vcat, + hang, + withPprStyle, + ppr ) import GHC.Unit.Types (Module) import GHC.Iface.Type (IfaceType, IfaceTvBndr, IfaceIdBndr) @@ -77,20 +77,20 @@ import Numeric (showHex) -- | Outputs textual information about the contents of a bytecode file. showByteCode :: Logger -> HscEnv -> FilePath -> IO () showByteCode logger env path = do - byteCode <- readOnDiskModuleByteCode env path - logMsg logger - MCDump - noSrcSpan - (withPprStyle defaultDumpStyle $ pprOnDiskModuleByteCode byteCode) + byteCode <- readOnDiskModuleByteCode env path + logMsg logger + MCDump + noSrcSpan + (withPprStyle defaultDumpStyle $ pprOnDiskModuleByteCode byteCode) -- | Constructs textual information about the contents of a bytecode file. pprOnDiskModuleByteCode :: OnDiskModuleByteCode -> SDoc pprOnDiskModuleByteCode OnDiskModuleByteCode {..} - = vcat [ - pprModuleIdent $ odgbc_module, - pprOnDiskModuleByteCodeHash $ odgbc_hash, - pprCompiledByteCode odgbc_module $ odgbc_compiled_byte_code - ] + = vcat [ + pprModuleIdent $ odgbc_module, + pprOnDiskModuleByteCodeHash $ odgbc_hash, + pprCompiledByteCode odgbc_module $ odgbc_compiled_byte_code + ] -- | Constructs textual information about the name of a module. pprModuleIdent :: Module -> SDoc @@ -105,14 +105,14 @@ pprCompiledByteCode :: Module -- ^ The enclosing module -> CompiledByteCode -- ^ The bytecode -> SDoc -- ^ The textual information pprCompiledByteCode current_module CompiledByteCode {..} - = vcat [ - pprByteCodeObjects current_module $ bc_bcos, - pprDataConstructorInfoTables $ bc_itbls, - pprTopLevelStrings $ bc_strs, - pprBreakpoints current_module $ bc_breaks, - pprStaticPointerTableEntries $ bc_spt_entries, - pprHPCInfo $ bc_hpc_info - ] + = vcat [ + pprByteCodeObjects current_module $ bc_bcos, + pprDataConstructorInfoTables $ bc_itbls, + pprTopLevelStrings $ bc_strs, + pprBreakpoints current_module $ bc_breaks, + pprStaticPointerTableEntries $ bc_spt_entries, + pprHPCInfo $ bc_hpc_info + ] -- | Constructs textual information about bytecode objects. pprByteCodeObjects :: Module -- ^ The enlosing module @@ -128,29 +128,25 @@ pprByteCodeObject :: Module -- ^ The enclosing module -> UnlinkedBCO -- ^ The bytecode object -> SDoc -- ^ The textual information pprByteCodeObject current_module byte_code_object = case byte_code_object of - UnlinkedBCO {..} - -> entry (text "ordinary object" <+> quotes (ppr unlinkedBCOName)) $ - vcat [ - pprArity $ unlinkedBCOArity, - pprLiterals current_module $ unlinkedBCOLits, - pprUsedItems current_module $ unlinkedBCOPtrs - ] - UnlinkedStaticCon {..} - -> entry ( - text "static-construction object" <+> - quotes (ppr unlinkedStaticConName) - ) - $ - vcat [ - pprDataConstructorName $ unlinkedStaticConDataConName, - pprLiftedness $ isLifted, - pprLiterals current_module $ unlinkedStaticConLits, - pprUsedItems current_module $ unlinkedStaticConPtrs - ] - where - - isLifted :: Bool - isLifted = not unlinkedStaticConIsUnlifted + UnlinkedBCO {..} + -> entry (text "ordinary object" <+> quotes (ppr unlinkedBCOName)) $ + vcat [ + pprArity $ unlinkedBCOArity, + pprLiterals current_module $ unlinkedBCOLits, + pprUsedItems current_module $ unlinkedBCOPtrs + ] + UnlinkedStaticCon {..} + -> entry ( + text "static-construction object" <+> + quotes (ppr unlinkedStaticConName) + ) + $ + vcat [ + pprDataConstructorName $ unlinkedStaticConDataConName, + pprLiftedness $ not unlinkedStaticConIsUnlifted, + pprLiterals current_module $ unlinkedStaticConLits, + pprUsedItems current_module $ unlinkedStaticConPtrs + ] -- | Constructs textual information about the arity of an ordinary bytecode -- object. @@ -181,63 +177,61 @@ pprLiteral :: Module -- ^ The enclosing module -> BCONPtr -- ^ The literal -> SDoc -- ^ The textual information pprLiteral current_module literal = case literal of - BCONPtrWord word - -> text "word" <+> - ppr word - BCONPtrLbl label - -> text "label" <+> - quotes (ppr label) - BCONPtrItbl infoTableName - -> text "info table of" <+> - quotes (ppr infoTableName) - BCONPtrAddr addrName - -> text "address" <+> - quotes (ppr addrName) - BCONPtrStr encoded_string - -> text "top-level string" <+> - text (show (utf8DecodeByteString encoded_string)) - BCONPtrFS string - -> text "top-level string" <+> - text (show (unpackFS string)) - BCONPtrFFIInfo ffiInfo - -> text "foreign function" <+> - quotes (pprFFIInfo ffiInfo) - BCONPtrCostCentre breakpointID - -> text "cost center of breakpoint" <+> - pprInternalBreakpointID current_module breakpointID + BCONPtrWord word + -> text "word" <+> + ppr word + BCONPtrLbl label + -> text "label" <+> + quotes (ppr label) + BCONPtrItbl infoTableName + -> text "info table of" <+> + quotes (ppr infoTableName) + BCONPtrAddr addrName + -> text "address" <+> + quotes (ppr addrName) + BCONPtrStr encoded_string + -> text "top-level string" <+> + text (show (utf8DecodeByteString encoded_string)) + BCONPtrFS string + -> text "top-level string" <+> + text (show (unpackFS string)) + BCONPtrFFIInfo ffiInfo + -> text "foreign function" <+> + quotes (pprFFIInfo ffiInfo) + BCONPtrCostCentre breakpointID + -> text "cost center of breakpoint" <+> + pprInternalBreakpointID current_module breakpointID -- | Constructs textual information about FFI info. pprFFIInfo :: FFIInfo -> SDoc pprFFIInfo FFIInfo {..} - = hsep (map (pprFFIType >>> (<+> text "->")) ffiInfoArgs) <+> - pprFFIType ffiInfoRet + = hsep (map (pprFFIType >>> (<+> text "->")) ffiInfoArgs) <+> + pprFFIType ffiInfoRet -- | Constructs textual information about an FFI type. pprFFIType :: FFIType -> SDoc pprFFIType ffi_type = assert (take 3 ident == "FFI") $ text (drop 3 ident) where - ident :: String - ident = show ffi_type + ident :: String + ident = show ffi_type -- | Constructs textual information about the ID of a bytecode breakpoint. pprInternalBreakpointID - :: Module -- ^ The enclosing module - -> InternalBreakpointId -- ^ The ID of the bytecode breakpoint - -> SDoc -- ^ The textual information + :: Module -- ^ The enclosing module + -> InternalBreakpointId -- ^ The ID of the bytecode breakpoint + -> SDoc -- ^ The textual information pprInternalBreakpointID current_module InternalBreakpointId {..} - | ibi_info_mod == current_module = indexDoc - | otherwise = indexDoc <+> - text "in" <+> - ppr ibi_info_mod - where + | ibi_info_mod == current_module = indexDoc + | otherwise = indexDoc <+> text "in" <+> ppr ibi_info_mod + where - indexDoc :: SDoc - indexDoc = ppr ibi_info_index + indexDoc :: SDoc + indexDoc = ppr ibi_info_index -- | Constructs textual information about used items. -pprUsedItems :: Module -- ^ The enclosing module - -> FlatBag BCOPtr -- ^ The used items - -> SDoc -- ^ The textual information +pprUsedItems :: Module -- ^ The enclosing module + -> FlatBag BCOPtr -- ^ The used items + -> SDoc -- ^ The textual information pprUsedItems current_module = entry (text "used items") . vcatOrNone . map (pprUsedItem current_module) . @@ -248,14 +242,14 @@ pprUsedItem :: Module -- ^ The enclosing module -> BCOPtr -- ^ The used item -> SDoc -- ^ The textual information pprUsedItem current_module usedItem = case usedItem of - BCOPtrName name - -> text "named item" <+> quotes (ppr name) - BCOPtrPrimOp primOp - -> text "primitive operation" <+> quotes (ppr primOp) - BCOPtrBCO byte_code_object - -> pprByteCodeObject current_module byte_code_object - BCOPtrBreakArray breakArrayModule - -> text "break array of module" <+> quotes (ppr breakArrayModule) + BCOPtrName name + -> text "named item" <+> quotes (ppr name) + BCOPtrPrimOp primOp + -> text "primitive operation" <+> quotes (ppr primOp) + BCOPtrBCO byte_code_object + -> pprByteCodeObject current_module byte_code_object + BCOPtrBreakArray breakArrayModule + -> text "break array of module" <+> quotes (ppr breakArrayModule) -- | Constructs textual information about data constructor info tables. pprDataConstructorInfoTables :: [(Name, ConInfoTable)] -> SDoc @@ -266,11 +260,11 @@ pprDataConstructorInfoTables = entry (text "data constructor info tables") . -- | Constructs textual information about a single data constructor info table. pprDataConstructorInfoTable :: Name -> ConInfoTable -> SDoc pprDataConstructorInfoTable dataConstrName ConInfoTable {..} - = entry (text "info table of" <+> quotes (ppr dataConstrName)) $ - vcat [ - pprPointerWordCount $ conItblPtrs, - pprNonPointerWordCount $ conItblNPtrs - ] + = entry (text "info table of" <+> quotes (ppr dataConstrName)) $ + vcat [ + pprPointerWordCount $ conItblPtrs, + pprNonPointerWordCount $ conItblNPtrs + ] -- | Constructs textual information about a number of pointer words. pprPointerWordCount :: Int -> SDoc @@ -299,37 +293,36 @@ pprBreakpoints :: Module -- ^ The enclosing module -> Maybe InternalModBreaks -- ^ The breakpoints -> SDoc -- ^ The textual information pprBreakpoints current_module - = entry (text "breakpoints") . - maybe (text "<none>") (pprActualBreakpoints current_module) + = entry (text "breakpoints") . + maybe (text "<none>") (pprActualBreakpoints current_module) -- | Constructs textual information about actual breakpoints. pprActualBreakpoints :: Module -- ^ The enclosing module -> InternalModBreaks -- ^ The actual breakpoints -> SDoc -- ^ The textual information pprActualBreakpoints current_module InternalModBreaks {..} - = vcat [ - pprSourceBreakpoints current_module $ imodBreaks_modBreaks, - pprByteCodeBreakpoints current_module $ imodBreaks_breakInfo - ] + = vcat [ + pprSourceBreakpoints current_module $ imodBreaks_modBreaks, + pprByteCodeBreakpoints current_module $ imodBreaks_breakInfo + ] -- | Constructs textual information about source breakpoints. pprSourceBreakpoints :: Module -- ^ The enclosing module -> ModBreaks -- ^ The source breakpoints -> SDoc -- ^ The textual information pprSourceBreakpoints current_module ModBreaks {..} - = entry (text "source breakpoints") $ - assert (modBreaks_module == current_module) $ - assert (bounds modBreaks_locs_ == bounds modBreaks_decls) $ - assert (bounds modBreaks_locs_ == bounds modBreaks_vars) $ - vcatOrNone $ - zipWith4 pprSourceBreakpoint (indices modBreaks_locs_) - (elems modBreaks_locs_) - (elems modBreaks_decls) - (elems modBreaks_vars) - -- The cost center infos in 'modBreaks_ccs', when present, just contain - -- textual representations of the declaration paths in 'modBreaks_decls' - -- and the source spans in 'modBreaks_locs_' and are therefore never - -- shown. + = entry (text "source breakpoints") $ + assert (modBreaks_module == current_module) $ + assert (bounds modBreaks_locs_ == bounds modBreaks_decls) $ + assert (bounds modBreaks_locs_ == bounds modBreaks_vars) $ + vcatOrNone $ + zipWith4 pprSourceBreakpoint (indices modBreaks_locs_) + (elems modBreaks_locs_) + (elems modBreaks_decls) + (elems modBreaks_vars) + -- The cost center infos in 'modBreaks_ccs', when present, just contain + -- textual representations of the declaration paths in 'modBreaks_decls' and + -- the source spans in 'modBreaks_locs_' and are therefore never shown. -- | Constructs textual information about a single source breakpoint. pprSourceBreakpoint :: BreakTickIndex @@ -338,12 +331,12 @@ pprSourceBreakpoint :: BreakTickIndex -> [OccName] -> SDoc pprSourceBreakpoint ix srcSpan declarationPath freeVars - = entry (text "source breakpoint" <+> ppr ix) $ - vcat [ - pprSrcSpan $ srcSpan, - pprDeclarationPath $ declarationPath, - pprFreeVariables $ freeVars - ] + = entry (text "source breakpoint" <+> ppr ix) $ + vcat [ + pprSrcSpan $ srcSpan, + pprDeclarationPath $ declarationPath, + pprFreeVariables $ freeVars + ] -- | Constructs textual information about a source span. pprSrcSpan :: BinSrcSpan -> SDoc @@ -362,10 +355,10 @@ pprByteCodeBreakpoints :: Module -- ^ The enclosing module -> IntMap CgBreakInfo -- ^ The bytecode breakpoints -> SDoc -- ^ The textual information pprByteCodeBreakpoints current_module - = entry (text "bytecode breakpoints") . - vcatOrNone . - map (uncurry (pprByteCodeBreakpoint current_module)) . - IntMap.toList + = entry (text "bytecode breakpoints") . + vcatOrNone . + map (uncurry (pprByteCodeBreakpoint current_module)) . + IntMap.toList -- | Constructs textual information about a single bytecode breakpoint. pprByteCodeBreakpoint :: Module -- ^ The enclosing module @@ -373,20 +366,20 @@ pprByteCodeBreakpoint :: Module -- ^ The enclosing module -> CgBreakInfo -- ^ The bytecode breakpoint -> SDoc -- ^ The textual information pprByteCodeBreakpoint current_module ix CgBreakInfo {..} - = entry (text "bytecode breakpoint" <+> ppr ix) $ - vcat [ - pprType $ cgb_resty, - pprTypeVariables $ cgb_tyvars, - pprVariables $ cgb_vars, - pprCorrespondingSourceBreakpoint current_module $ cgb_tick_id - ] - -- That the 'cgb_resty' field holds the type of the breakpoint is apparent - -- from the fact that this field is set by - -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' using one of its arguments and - -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' is always invoked with this - -- argument set to the extension field of 'Breakpoint', which in turn holds - -- the type of the breakpoint according to Note [Tickish passes] and the - -- comment on the instance declaration of @XBreakpoint 'TickishPassStg@. + = entry (text "bytecode breakpoint" <+> ppr ix) $ + vcat [ + pprType $ cgb_resty, + pprTypeVariables $ cgb_tyvars, + pprVariables $ cgb_vars, + pprCorrespondingSourceBreakpoint current_module $ cgb_tick_id + ] + -- That the 'cgb_resty' field holds the type of the breakpoint is apparent + -- from the fact that this field is set by + -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' using one of its arguments and + -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' is always invoked with this + -- argument set to the extension field of 'Breakpoint', which in turn holds + -- the type of the breakpoint according to Note [Tickish passes] and the + -- comment on the instance declaration of @XBreakpoint 'TickishPassStg@. -- | Constructs textual information about a type. pprType :: IfaceType -> SDoc @@ -413,8 +406,8 @@ pprVariable = maybe (text "<unknown>") (pprVariableBinder . fst) -- | Constructs textual information about a variable binder. pprVariableBinder :: IfaceIdBndr -> SDoc pprVariableBinder (multiplicity, name, type_) - = text "%" <> ppr multiplicity <+> - ppr name <+> text "::" <+> ppr type_ + = text "%" <> ppr multiplicity <+> + ppr name <+> text "::" <+> ppr type_ -- | Constructs textual information about a source breakpoint corresponding to a -- bytecode breakpoint. @@ -425,9 +418,9 @@ pprCorrespondingSourceBreakpoint :: Module -> SDoc -- ^ The textual information pprCorrespondingSourceBreakpoint current_module - = entry (text "corresponding source breakpoint") . - pprBreakpointID current_module . - either internalBreakLoc id + = entry (text "corresponding source breakpoint") . + pprBreakpointID current_module . + either internalBreakLoc id -- | Constructs textual information about the ID of a source breakpoint. pprBreakpointID :: Module -- ^ The enclosing module @@ -452,7 +445,7 @@ pprStaticPointerTableEntries = entry (text "static-pointer table entries") . -- | Constructs textual information about a single static-pointer table entry. pprStaticPointerTableEntry :: SptEntry -> SDoc pprStaticPointerTableEntry (SptEntry name fingerprint) - = ppr fingerprint <> text ":" <+> ppr name + = ppr fingerprint <> text ":" <+> ppr name -- | Constructs textual information about HPC info. pprHPCInfo :: Strict.Maybe ByteCodeHpcInfo -> SDoc @@ -462,12 +455,12 @@ pprHPCInfo = entry (text "HPC information") . -- | Constructs textual information about actual HPC info. pprActualHPCInfo :: ByteCodeHpcInfo -> SDoc pprActualHPCInfo ByteCodeHpcInfo {..} - = vcat [ - pprHPCInfoHash $ bchi_hash, - pprModuleName $ bchi_module_name, - pprTickBoxName $ bchi_tickbox_name, - pprTickCount $ bchi_tick_count - ] + = vcat [ + pprHPCInfoHash $ bchi_hash, + pprModuleName $ bchi_module_name, + pprTickBoxName $ bchi_tickbox_name, + pprTickCount $ bchi_tick_count + ] -- | Constructs textual information about the hash of HPC info. pprHPCInfoHash :: Int -> SDoc @@ -494,15 +487,15 @@ pprTickCount = entry (text "number of ticks") . ppr -- natural number. pprFixedSizeNatural :: (Integral a, FiniteBits a) => a -> SDoc pprFixedSizeNatural num - = assert (num >= 0) $ - text $ replicate (digitCount - length unpadded) '0' ++ unpadded - where + = assert (num >= 0) $ + text $ replicate (digitCount - length unpadded) '0' ++ unpadded + where - digitCount :: Int - digitCount = (finiteBitSize num + 3) `div` 4 + digitCount :: Int + digitCount = (finiteBitSize num + 3) `div` 4 - unpadded :: String - unpadded = showHex num "" + unpadded :: String + unpadded = showHex num "" -- | Constructs a textual representation of a boolean, interpreting 'True' and -- 'False' as “yes” and “no”, respectively. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/caefc9da7d625db3146216ccbef2b4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/caefc9da7d625db3146216ccbef2b4… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/fendor/26300] Check external dependencies and home units for duplicates
by Hannes Siebenhandl (＠fendor) 28 Jul '26

28 Jul '26

Hannes Siebenhandl pushed to branch wip/fendor/26300 at Glasgow Haskell Compiler / GHC Commits: d8aa9526 by fendor at 2026-07-28T13:12:16+02:00 Check external dependencies and home units for duplicates - - - - - 16 changed files: - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Errors/Types.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - + testsuite/tests/ghci/T26300/Makefile - + testsuite/tests/ghci/T26300/T26300.script - + testsuite/tests/ghci/T26300/T26300.stderr - + testsuite/tests/ghci/T26300/T26300.stdout - + testsuite/tests/ghci/T26300/a/Main.hs - + testsuite/tests/ghci/T26300/all.T - + testsuite/tests/ghci/T26300/b/Bar.hs - + testsuite/tests/ghci/T26300/b/Data/List.hs - + testsuite/tests/ghci/T26300/c/Bar.hs - + testsuite/tests/ghci/T26300/unitA - + testsuite/tests/ghci/T26300/unitB - + testsuite/tests/ghci/T26300/unitC Changes: ===================================== compiler/GHC/Iface/Errors/Ppr.hs ===================================== @@ -240,7 +240,9 @@ cantFindErrorX pkg_hidden_hint may_show_locations mod_or_interface (CantFindInst -> vcat (map pprMod mods) where unambiguousPackages = foldl' unambiguousPackage (Just []) mods - unambiguousPackage (Just xs) (m, ModOrigin (Just _) _ _ _) + unambiguousPackage (Just xs) (m, ExternalUnitOrigin (ModOrigin (Just _) _ _ _)) + = Just (moduleUnit m : xs) + unambiguousPackage (Just xs) (m, HomeOrigin{}) = Just (moduleUnit m : xs) unambiguousPackage _ _ = Nothing GenericMissing pkg_hiddens mod_hiddens unusables files -> @@ -251,9 +253,16 @@ cantFindErrorX pkg_hidden_hint may_show_locations mod_or_interface (CantFindInst where pprMod (m, o) = text "it is bound as" <+> ppr m <+> text "by" <+> pprOrigin m o - pprOrigin _ ModHidden = panic "cantFindErr: bound by mod hidden" - pprOrigin _ (ModUnusable _) = panic "cantFindErr: bound by mod unusable" - pprOrigin m (ModOrigin e res _ f) = sep $ punctuate comma ( + + pprOrigin m HomeOrigin = pprHomeOrigin m + pprOrigin m (ExternalUnitOrigin o) = pprExtOrigin m o + + pprHomeOrigin m = + text "package" <+> ppr (moduleUnit m) + + pprExtOrigin _ ModHidden = panic "cantFindErr: bound by mod hidden" + pprExtOrigin _ (ModUnusable _) = panic "cantFindErr: bound by mod unusable" + pprExtOrigin m (ModOrigin e res _ f) = sep $ punctuate comma ( if e == Just True then [text "package" <+> ppr (moduleUnit m)] else [] ++ ===================================== compiler/GHC/Iface/Errors/Types.hs ===================================== @@ -6,6 +6,7 @@ module GHC.Iface.Errors.Types ( , ReadInterfaceError(..) , CantFindInstalled(..) , CantFindInstalledReason(..) + , HomeOrExternalOrigin(..) , FindingModuleOrInterface(..) , BuildingCabalPackage(..) @@ -75,9 +76,13 @@ data CantFindInstalledReason | GenericMissing [UnitInfo] [Unit] [UnusableUnit] [FilePath] - | MultiplePackages [(Module, ModuleOrigin)] + | MultiplePackages [(Module, HomeOrExternalOrigin)] deriving Generic +data HomeOrExternalOrigin + = HomeOrigin + | ExternalUnitOrigin ModuleOrigin + data CantFindInstalled = CantFindInstalled ModuleName CantFindInstalledReason deriving Generic ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -82,6 +82,7 @@ import qualified Data.Set as Set (empty, intersection, difference, null, toList) import qualified System.Directory as SD import qualified System.OsPath as OsPath import qualified Data.List.NonEmpty as NE +import GHC.Iface.Errors.Types type FileExt = OsString -- Filename extension type BaseName = OsPath -- Basename of file @@ -247,8 +248,12 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit ue_findHomeUnitEnv home_unit_id ue other_fopts :: [(UnitId, FinderOpts)] - other_fopts = homeUnitDepsFinderOpts ue home_module_name_providers_map + other_fopts = + let + (providers, others) = homeUnitDepsFinderOpts ue home_module_name_providers_map unit_state mod_name + in + providers ++ others -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as @@ -265,7 +270,7 @@ findPluginModuleNoHsc findPluginModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit@(Just home_unit) mod_name = findHomeModuleAmongDeps fc fopts ue home_module_name_providers_map mb_home_unit mod_name - `orIfNotFound` + `combineFindResult` findExposedPluginPackageModule fc fopts unit_state mod_name where unit_state = HUG.homeUnitEnv_units $ @@ -291,9 +296,9 @@ findPluginModule hsc_env mod_name = do rankedHomeUnitDeps :: HomeModuleNameProvidersMap -> ModuleName -> Set UnitId - -> [UnitId] + -> ([UnitId], [UnitId]) rankedHomeUnitDeps _ _ home_unit_deps | Set.null home_unit_deps - = [] + = ([], []) -- The special handling of the situation where the dependency set is empty does -- not change the result, but it avoids triggering evaluation of the module -- graph. This is particularly important in one-shot mode, where the module @@ -309,7 +314,7 @@ rankedHomeUnitDeps _ _ home_unit_deps | Set.null home_unit_deps -- 3 | import {-# source #-} A -- | ^^^^^^^^^^^^^^^^^^^^^^^ rankedHomeUnitDeps home_module_name_providers_map mod_name home_unit_deps - = Set.toList cached_deps ++ Set.toList uncached_deps + = (Set.toList cached_deps, Set.toList uncached_deps) where cached_providers :: Set UnitId @@ -330,12 +335,19 @@ homeUnitDepsFinderOpts -> HomeModuleNameProvidersMap -> UnitState -- ^ unit state of the requesting home unit -> ModuleName - -> [(UnitId, FinderOpts)] + -> ([(UnitId, FinderOpts)], [(UnitId, FinderOpts)]) homeUnitDepsFinderOpts ue home_module_name_providers_map unit_state mod_name = - [ (uid, initFinderOpts (ue_unitFlags uid ue)) - | uid <- rankedHomeUnitDeps home_module_name_providers_map mod_name + let + (providers, otherHomeUnits) = rankedHomeUnitDeps home_module_name_providers_map mod_name (homeUnitDepends unit_state) - ] + in + ( [ (uid, initFinderOpts (ue_unitFlags uid ue)) + | uid <- providers + ] + , [ (uid, initFinderOpts (ue_unitFlags uid ue)) + | uid <- otherHomeUnits + ] + ) -- | Search for @mod_name@ in the given home unit. findHomeUnitDepModule @@ -371,11 +383,25 @@ findHomeModuleAmongDeps -> ModuleName -> IO FindResult findHomeModuleAmongDeps fc fopts ue home_module_name_providers_map mb_home_unit mod_name = - foldr1 orIfNotFound (home_import :| map home_pkg_import other_fopts) - -- Do not try to be smart and change this to `foldr orIfNotFound home_import - -- (map home_pkg_import other_fopts)`, as that would not be the same. - -- `home_import` is first because we need to first look within the current - -- unit before looking at the other units in order. + case other_fopts of + [] -> + foldr1 combineFindResult (home_import :| map home_pkg_import provider_fopts) + -- Do not try to be smart and change this to `foldr combineFindResult home_import + -- (map home_pkg_import other_fopts)`, as that would not be the same. + -- `home_import` is first because we need to first look within the current + -- unit before looking at the other units in order. + (x:xs) -> + foldr1 combineFindResult (home_import :| map home_pkg_import provider_fopts) + -- Do not try to be smart and change this to `foldr combineFindResult home_import + -- (map home_pkg_import other_fopts)`, as that would not be the same. + -- `home_import` is first because we need to first look within the current + -- unit before looking at the other units in order. + `orIfNotFound` + foldr1 orIfNotFound (home_pkg_import x :| map home_pkg_import xs) + -- Do not try to be smart and change this to `foldr orIfNotFound home_import + -- (map home_pkg_import other_fopts)`, as that would not be the same. + -- `home_import` is first because we need to first look within the current + -- unit before looking at the other units in order. where home_import = case mb_home_unit of Just home_unit -> findHomeModule fc fopts home_unit mod_name @@ -387,7 +413,7 @@ findHomeModuleAmongDeps fc fopts ue home_module_name_providers_map mb_home_unit Nothing -> ue_homeUnitState ue Just home_unit_id -> HUG.homeUnitEnv_units $ ue_findHomeUnitEnv home_unit_id ue - other_fopts = homeUnitDepsFinderOpts ue home_module_name_providers_map + (provider_fopts, other_fopts) = homeUnitDepsFinderOpts ue home_module_name_providers_map unit_state mod_name -- | Search the home-unit graph and otherwise the regular exposed package @@ -403,7 +429,7 @@ findHomeOrRegularPackageModule findHomeOrRegularPackageModule fc fopts ue home_module_name_providers_map mb_home_unit mod_name = findHomeModuleAmongDeps fc fopts ue home_module_name_providers_map mb_home_unit mod_name - `orIfNotFound` + `combineFindResult` findExposedPackageModule fc fopts unit_state mod_name NoPkgQual where unit_state = case homeUnitId <$> mb_home_unit of @@ -470,6 +496,40 @@ orIfNotFound this or_this = do _other -> return res2 _other -> return res +combineFindResult :: Monad m => m FindResult -> m FindResult -> m FindResult +combineFindResult this or_this = do + res <- this + case res of + NotFound { fr_paths = paths1, fr_mods_hidden = mh1 + , fr_pkgs_hidden = ph1, fr_unusables = u1, fr_suggestions = s1 } + -> do res2 <- or_this + case res2 of + NotFound { fr_paths = paths2, fr_pkg = mb_pkg2, fr_mods_hidden = mh2 + , fr_pkgs_hidden = ph2, fr_unusables = u2 + , fr_suggestions = s2 } + -> return (NotFound { fr_paths = paths1 ++ paths2 + , fr_pkg = mb_pkg2 -- snd arg is the package search + , fr_mods_hidden = mh1 ++ mh2 + , fr_pkgs_hidden = ph1 ++ ph2 + , fr_unusables = u1 ++ u2 + , fr_suggestions = s1 ++ s2 }) + _other -> return res2 + NoPackage{} -> pure res + FoundMultiple ms -> do + otherRes <- or_this + case otherRes of + Found _ other_mod -> pure $ FoundMultiple $ ms ++ [(other_mod, HomeOrigin)] + NoPackage{} -> pure res + FoundMultiple other_ms -> pure $ FoundMultiple $ ms ++ other_ms + NotFound{} -> pure res + Found _mod_location modl -> do + otherRes <- or_this + case otherRes of + Found _ other_mod -> pure $ FoundMultiple $ [(modl, HomeOrigin), (other_mod, HomeOrigin)] + NoPackage{} -> pure res + FoundMultiple other_ms -> pure $ FoundMultiple $ [(modl, HomeOrigin)] ++ other_ms + NotFound{} -> pure res + -- | Helper function for 'findHomeModule': this function wraps an IO action -- which would look up @mod_name@ in the file system (the home package), -- and first consults the 'hsc_FC' cache to see if the lookup has already @@ -509,7 +569,7 @@ findLookupResult fc fopts r = case r of , fr_unusables = [] , fr_suggestions = []}) LookupMultiple rs -> - return (FoundMultiple rs) + return (FoundMultiple $ map (\ (m, o) -> (m, ExternalUnitOrigin o)) rs) LookupHidden fr_pkgs_hidden mod_hiddens -> return (NotFound{ fr_paths = [], fr_pkg = Nothing , fr_pkgs_hidden ===================================== compiler/GHC/Unit/Finder/Types.hs ===================================== @@ -19,6 +19,7 @@ import GHC.Unit.Env import GHC.Data.FastString import GHC.Types.Unique.Set +import GHC.Iface.Errors.Types (HomeOrExternalOrigin) -- | The 'FinderCache' maps modules to the result of -- searching for that module. It records the results of searching for @@ -56,7 +57,7 @@ data FindResult -- ^ The module was found | NoPackage Unit -- ^ The requested unit was not found - | FoundMultiple [(Module, ModuleOrigin)] + | FoundMultiple [(Module, HomeOrExternalOrigin)] -- ^ _Error_: both in multiple packages -- | Not found ===================================== testsuite/tests/ghci/T26300/Makefile ===================================== @@ -0,0 +1,9 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +.PHONY: prog-mhu006a +prog-mhu006a: + '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) $(WAY_FLAGS) $(ghciWayFlags) \ + -no-user-package-db \ + -unit @unitA -unit @unitB < prog-mhu006a.script ===================================== testsuite/tests/ghci/T26300/T26300.script ===================================== @@ -0,0 +1,3 @@ +"Report two ambiguous imports." +"The Data.List import is ambiguous with the `base` module." +"Bar module is defined in two home units, as such needs to be reported as ambiguous." ===================================== testsuite/tests/ghci/T26300/T26300.stderr ===================================== @@ -0,0 +1,8 @@ +a/Main.hs:3:1: error: [GHC-45102] + Ambiguous module name ‘Data.List’. + it was found in multiple packages: base-4.23.0.0 b-0.0.1 + +a/Main.hs:4:1: error: [GHC-45102] + Ambiguous module name ‘Bar’. + it was found in multiple packages: c-0.0.1 b-0.0.1 + ===================================== testsuite/tests/ghci/T26300/T26300.stdout ===================================== @@ -0,0 +1,3 @@ +"Report two ambiguous imports." +"The Data.List import is ambiguous with the `base` module." +"Bar module is defined in two home units, as such needs to be reported as ambiguous." ===================================== testsuite/tests/ghci/T26300/a/Main.hs ===================================== @@ -0,0 +1,4 @@ +module Main where + +import Data.List +import Bar ===================================== testsuite/tests/ghci/T26300/all.T ===================================== @@ -0,0 +1,6 @@ +test('T26300', + [extra_files(['a/', 'b/', 'c/', 'unitA', 'unitB', 'unitC']), + cmd_prefix('ghciWayFlags=' + config.ghci_way_flags), + normalise_slashes, + req_interp], + ghci_multiunit_script, [['unitA', 'unitB', 'unitC'], 'T26300.script']) ===================================== testsuite/tests/ghci/T26300/b/Bar.hs ===================================== @@ -0,0 +1 @@ +module Bar where ===================================== testsuite/tests/ghci/T26300/b/Data/List.hs ===================================== @@ -0,0 +1 @@ +module Data.List where ===================================== testsuite/tests/ghci/T26300/c/Bar.hs ===================================== @@ -0,0 +1 @@ +module Bar where ===================================== testsuite/tests/ghci/T26300/unitA ===================================== @@ -0,0 +1,6 @@ +-i +-ia +-this-unit-id a-0.0.1 +-package-id b-0.0.1 +-package-id c-0.0.1 +Main ===================================== testsuite/tests/ghci/T26300/unitB ===================================== @@ -0,0 +1,5 @@ +-i +-ib +-this-unit-id b-0.0.1 +Data.List +Bar ===================================== testsuite/tests/ghci/T26300/unitC ===================================== @@ -0,0 +1,4 @@ +-i +-ic +-this-unit-id c-0.0.1 +Bar View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d8aa95262333abb8485c31bf8aed2da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d8aa95262333abb8485c31bf8aed2da… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/fendor/26300] 7 commits: Introduce global unit database cache
by Hannes Siebenhandl (＠fendor) 28 Jul '26

28 Jul '26

Hannes Siebenhandl pushed to branch wip/fendor/26300 at Glasgow Haskell Compiler / GHC Commits: 5d0ab71a by fendor at 2026-07-27T17:31:05-04:00 Introduce global unit database cache As a first step for better sharing of `UnitInfo` across `UnitEnv`, we introduce a new datatype called `ExternalUnitDatabases`. It primarily serves as an in-memory representation of *all* `UnitDatabase`s across `UnitEnv`. This means, if multiple `HomeUnitEnv`s depend on the same database, one way or another, we make sure that we don't parse from disk every time. Instead, we store the in-memory representation in `ExternalUnitDatabases`. `ExternalUnitDatabaseCache` is the equivalent of `ExternalUnitState` in the `UnitEnv`. It is a mutable variable wrapping `ExternalUnitDatabases`. The mutable `ExternalUnitDatabaseCache` is used in `initUnits` to make sure we don't parse the same unit database multiple times. Almost by accident, we change the semantics of `initUnits` to honour modifications to `packageDBFlags`. The inability to change `packageDBFlags` while also reusing the already parsed `UnitDatabase`s was reported in #26423 as a bug. Hence, we think this behaviour change is warranted and acceptable, especially since it comes with a breaking change to the `initUnits` API. Add regression test for #26423 Closes #26423 - - - - - 6cce494a by fendor at 2026-07-27T17:31:05-04:00 Introduce UnitIndex for global external unit caching `UnitInfo`s have been observed to cause a lot of memory usage in #27500. Especially with multiple home units, as the same (external) units are processed from scratch, even though most of the time we end up with exactly the same `UnitInfo`. We introduce a `UnitEnv` global cache that allows us to store external unit information that is used across all `HomeUnitEnv`s. The most important change in this commit is the introduction of the `UnitIndex`. It stores a global mapping of `UnitId` -> `UnitInfo`, and `initUnits` always uses the cached `UnitInfo` entry to populate each `HomeUnitEnv`'s `UnitState`. This allows us to ensure the following property: > Each `UnitInfo` should be alive exactly once in GHC. All `UnitState`s should reference 'UnitInfo's stored in the 'UnitIndex'. This ensured by calling 'initUnits' with the 'UnitIndex'. In addition, the `ExternalUnitDatabases` may also hold a reference to each on-disk representation of `UnitInfo`. This means, we impose an hard upper bound on the number of `UnitInfo`s alive in the GHC session: > The number of alive `UnitInfo`s closure objects must be the > sum of all loaded unit database times two. We add performance regression tests that make sure the number of live `UnitInfo` cannot exceed this threshold. Closes #27500 ------------------------- Metric Decrease: MultiComponentModules MultiComponentModulesRecomp MultiComponentModulesRecomp100 mhu-perf LinkableUsage02 ------------------------- These metrics increases are especially notable, as we are not even sharing anything big but merely the global package database with 50 entries. It shows how careful sharing of `UnitInfo` can improve memory usage. We expect this to be much more notable when the whole cabal package database is shared across multiple home units. `LinkableUsage02` metric decreases on unreg and i386 platform, only. --- Technical details To share the `UnitInfo`s correctly, it is important that we extract the `WireMap` into the `UnitIndex`. At the moment of writing, `WireMap` must be globally the same for all `HomeUnitEnv`s. This is important, as we could otherwise not cache the "fully-resolved" `UnitInfo`, as we don't change the `UnitId` or `unitAbiHash` when resolving wired-in units. Thus, there could be ambiguities, when the `WireMap` is not the same for all `UnitState`s across the `UnitEnv`. We consider a `UnitInfo` fully-resolved, if wired-in units have been updated, the `UnitInfo` has been validated and variables in the unit config, such as `${pkgroot}` have been resolved. Updating the wired-in units requires the `WireMap` to be globally the same. - - - - - f8e3bee9 by Zubin Duggal at 2026-07-27T17:31:49-04:00 testsuite: skip runtime stats tests on debugged compilers Debugged flavours build the boot libraries without optimisation, so the runtime numbers do not match the baselines. - - - - - 1e326770 by Zubin Duggal at 2026-07-27T17:31:50-04:00 testsuite: mark #20706 tests fragile rather than broken Whether the static linux linker issues manifest depends on the host toolchain. - - - - - c0b13cbe by Zubin Duggal at 2026-07-27T17:31:50-04:00 testsuite: exclude libnuma from mostly-static It needs static system libraries (libnuma.a) that many platforms do not ship. Fixes #26914 - - - - - 10f33b9f by Rodrigo Mesquita at 2026-07-28T13:11:11+02:00 loopImports: Don't dup ms_uid in summary imports We were writing the ms_unitid of the mod summary with every single import of that module That complicated the code (as though the UnitId in that list could ever be something else) and also allocates unnecessarily per every mod import. Very slight allocation decrease measured locally in a few tests: (MultiComponentModulesRecomp: -0.06%; MultiComponentModulesRecomp100: -0.05%) Purely a clean up. - - - - - 18702319 by fendor at 2026-07-28T13:11:11+02:00 Check external dependencies and home units for duplicates - - - - - 73 changed files: - + changelog.d/T26423 - + changelog.d/unit-index - compiler/GHC.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/Env.hs - compiler/GHC/Driver/Main/Hsc.hs - compiler/GHC/Driver/Main/Interactive.hs - compiler/GHC/Driver/Main/Passes.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Errors/Types.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Unit/Env.hs - + compiler/GHC/Unit/External/Database.hs - + compiler/GHC/Unit/External/Index.hs - + compiler/GHC/Unit/External/ModuleOrigin.hs - + compiler/GHC/Unit/External/Providers.hs - + compiler/GHC/Unit/External/Query.hs - + compiler/GHC/Unit/External/Substitution.hs - + compiler/GHC/Unit/External/Validate.hs - + compiler/GHC/Unit/External/Visibility.hs - + compiler/GHC/Unit/External/Wired.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/Home/Graph.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Unit/State.hs-boot - compiler/GHC/Unit/Types.hs - compiler/ghc.cabal.in - ghc/GHCi/UI.hs - hadrian/src/Rules/Generate.hs - testsuite/driver/testlib.py - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/driver/T26423/Hello.hs - + testsuite/tests/driver/T26423/Makefile - + testsuite/tests/driver/T26423/T26423.hs - + testsuite/tests/driver/T26423/T26423.stderr - + testsuite/tests/driver/T26423/T26423.stdout - + testsuite/tests/driver/T26423/all.T - + testsuite/tests/driver/T26423/test/Test.hs - + testsuite/tests/driver/T26423/test/test.pkg - + testsuite/tests/driver/TUnitInfo/Foo.hs - + testsuite/tests/driver/TUnitInfo/Makefile - + testsuite/tests/driver/TUnitInfo/all.T - + testsuite/tests/driver/TUnitInfo/genMhu.sh - + testsuite/tests/driver/TUnitInfo/generic-unit-info-space-mhu.stdout - + testsuite/tests/driver/TUnitInfo/generic-unit-info-space-single.stdout - + testsuite/tests/driver/TUnitInfo/generic-unit-info-space.hs - + testsuite/tests/driver/TUnitInfo/generic-unit-info-space.stdout - testsuite/tests/driver/all.T - testsuite/tests/driver/mostly-static/Makefile - testsuite/tests/ghci/T13786/all.T - + testsuite/tests/ghci/T26300/Makefile - + testsuite/tests/ghci/T26300/T26300.script - + testsuite/tests/ghci/T26300/T26300.stderr - + testsuite/tests/ghci/T26300/T26300.stdout - + testsuite/tests/ghci/T26300/a/Main.hs - + testsuite/tests/ghci/T26300/all.T - + testsuite/tests/ghci/T26300/b/Bar.hs - + testsuite/tests/ghci/T26300/b/Data/List.hs - + testsuite/tests/ghci/T26300/c/Bar.hs - + testsuite/tests/ghci/T26300/unitA - + testsuite/tests/ghci/T26300/unitB - + testsuite/tests/ghci/T26300/unitC - testsuite/tests/ghci/linking/all.T - testsuite/tests/ghci/linking/dyn/all.T - testsuite/tests/package/T20010/all.T - testsuite/tests/plugins/all.T - testsuite/tests/rts/all.T - testsuite/tests/rts/linker/all.T - utils/haddock/haddock-api/src/Haddock.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8a0db31aa3e13b11b75a5aa95afc4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8a0db31aa3e13b11b75a5aa95afc4… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/26300
by Hannes Siebenhandl (＠fendor) 28 Jul '26

28 Jul '26

Hannes Siebenhandl pushed new branch wip/fendor/26300 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fendor/26300 You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Remove import list for `GHC.Prelude`
by Wolfgang Jeltsch (＠jeltsch) 28 Jul '26

28 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: caefc9da by Wolfgang Jeltsch at 2026-07-28T13:53:44+03:00 Remove import list for `GHC.Prelude` - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -7,23 +7,6 @@ module GHC.ByteCode.Show (showByteCode) where -- Prelude import GHC.Prelude - ( - (+), (-), Integral, div, -- Prelude - (==), -- Data.Eq - (>=), -- Data.Ord - FiniteBits, finiteBitSize, -- Data.Bits - ($), id, (.), -- Data.Function - fst, uncurry, -- Data.Tuple - Bool, otherwise, not, -- Data.Bool - Int, -- Data.Int - Word, -- Data.Word - Maybe, maybe, -- Data.Maybe - Either, either, -- Data.Either - length, (++), map, take, drop, replicate, -- Data.List - String, -- Data.String - show, -- Text.Show - IO, FilePath -- System.IO - ) -- Bytecode import GHC.ByteCode.Types View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/caefc9da7d625db3146216ccbef2b4c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/caefc9da7d625db3146216ccbef2b4c… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] Allow GHC.Essentials to be hidden
by sheaf (＠sheaf) 28 Jul '26

28 Jul '26

sheaf pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 6cb49440 by sheaf at 2026-07-28T12:03:57+02:00 Allow GHC.Essentials to be hidden - - - - - 21 changed files: - compiler/GHC/Builtin.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/MakeFile.hs - compiler/GHC/HsToCore.hs - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Errors/Types.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Unit/External.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/State.hs - libraries/base/base.cabal.in - testsuite/tests/cabal/T12485/Makefile - testsuite/tests/driver/T27013e/T27013e.stderr - testsuite/tests/driver/T27013f/T27013f.stderr - testsuite/tests/ghci/scripts/all.T - 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 The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6cb4944059ec052a22837f5732b85e3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6cb4944059ec052a22837f5732b85e3… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T27368-ppr
by Simon Jakobi (＠sjakobi) 28 Jul '26

28 Jul '26

Simon Jakobi pushed new branch wip/sjakobi/T27368-ppr at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sjakobi/T27368-ppr You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/9.14.2-backports] 3 commits: test-primops: Switch to the 9.14 branch so we don't try to build on platforms
by Zubin (＠wz1000) 28 Jul '26

28 Jul '26

Zubin pushed to branch wip/9.14.2-backports at Glasgow Haskell Compiler / GHC Commits: cae07835 by Zubin Duggal at 2026-07-28T15:18:03+05:30 test-primops: Switch to the 9.14 branch so we don't try to build on platforms that GHC 9.14 is not built for. Use the commit instead of the branch so that it is pinned. - - - - - 566e8b18 by Zubin Duggal at 2026-07-28T15:18:03+05:30 hadrian: add text and parsec to stage0Packages text depends on template-haskell-lift, and template-haskell-lift needs to be built in tree rather than using the boot package, so `text` and `parsec` (which depends on `text`) must also be built in tree rather than copied from the boot pkgdb. - - - - - b65eecce by Zubin Duggal at 2026-07-28T15:18:03+05:30 Prepare 9.14.2 Bump filpath submodule to 1.5.5.0 Bump Win32 submodule to 2.14.2.2 Metric Increase: T4029 T13379 haddock.base libdir Metric Decrease: T5030 T24602_perf_size T25046_perf_size_gzip T25046_perf_size_unicode T25046_perf_size_unicode_gzip - - - - - 46 changed files: - .gitlab-ci.yml - − changelog.d/26616 - − changelog.d/T26978 - − changelog.d/T26979 - − changelog.d/T27046 - − changelog.d/T27047 - − changelog.d/T27123.md - − changelog.d/T27124.md - − changelog.d/T27131 - − changelog.d/T27182.md - − changelog.d/T27202 - − changelog.d/T27225 - − changelog.d/T27386 - − changelog.d/bump-process - − changelog.d/deterministic-usage-order - − changelog.d/fix-absent-dict-projection - − changelog.d/fix-blackhole-handling - − changelog.d/fix-cmm-atomic-load-store - − changelog.d/fix-compacting-gc-ap-27434 - − changelog.d/fix-exponential-case-desugar-27383 - − changelog.d/fix-finalizers-27072 - − changelog.d/fix-layout-stack-fcall - − changelog.d/fix-peekitbl-no-tntc - − changelog.d/fix-use-std-ap-thunk - − changelog.d/ghc-pkg-faster-closure - − changelog.d/hadrian-stale-package-confs-26661 - − changelog.d/jobserver-leak-fix - − changelog.d/more-efficient-home-unit-imports-finding - − changelog.d/reexported-module-errors - − changelog.d/semaphore-v2 - − changelog.d/tag-inference-27005 - − changelog.d/unused-type - − changelog.d/wasm-fix-serviceworker - − changelog.d/windows-rethrow-overlapped-exception - configure.ac - docs/users_guide/9.14.2-notes.rst - hadrian/bootstrap/generate_bootstrap_plans - + hadrian/bootstrap/plan-9_10_3.json - + hadrian/bootstrap/plan-9_12_4.json - + hadrian/bootstrap/plan-bootstrap-9_10_3.json - + hadrian/bootstrap/plan-bootstrap-9_12_4.json - hadrian/src/Settings/Default.hs - libraries/Win32 - libraries/base/base.cabal.in - libraries/base/changelog.md - libraries/filepath The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1172aa13710d0882ec903570a0214f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1172aa13710d0882ec903570a0214f… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0