October 2025 - ghc-commits

[Git][ghc/ghc][master] Fix typos in haddock documentation for stack annotation API
by Marge Bot (＠marge-bot) 16 Oct '25

16 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - 1 changed file: - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs Changes: ===================================== libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs ===================================== @@ -17,6 +17,7 @@ -- the user to gain more control over what an IPE stack trace looks like. -- -- The main advantages of stack frame annotations over other 'Backtraces': +-- -- * Function signatures don't need to be modified to improve stack traces (e.g. via 'HasCallStack'). -- * Annotation are arbitrary user-defined datatypes, not just source locations. -- * Stack frame annotations are always present and do not require recompilation (e.g. @-prof@ or @-g3@). @@ -39,7 +40,7 @@ module GHC.Stack.Annotation.Experimental ( annotateCallStackIO, -- * Push stack frame annotations in non-'IO' code. -- - -- These variants all evaluate the code to be annotated to WHNF. + -- | These variants all evaluate the code to be annotated to WHNF. -- Otherwise, the stack annotations will not be shown in stack traces, -- as the computation is immediately "evaluated" to a thunk, popping the -- annotation frames from the stack. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e17dc695bf1f5fc015c2a9ab8981ac6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e17dc695bf1f5fc015c2a9ab8981ac6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: Refactor distinct constructor tables map construction
by Marge Bot (＠marge-bot) 16 Oct '25

16 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - 33 changed files: - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0c00c9c3b4e9b8515d4839f2c1d7d7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0c00c9c3b4e9b8515d4839f2c1d7d7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Add submodules for template-haskell-lift and template-haskell-quasiquoter
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 4be32153 by Teo Camarasu at 2025-10-15T08:06:09-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 0c00c9c3 by Ben Gamari at 2025-10-15T08:06:51-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - c27cd0c6 by Fendor at 2025-10-15T09:40:36-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - 767a59e4 by Fendor at 2025-10-15T09:40:36-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - 42ae5b19 by fendor at 2025-10-15T09:40:37-04:00 Fix typos in haddock documentation for stack annotation API - - - - - 43 changed files: - .gitmodules - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter - rts/Printer.c - rts/posix/OSMem.c - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/21a826393e159ca60b00e5471c9030… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/21a826393e159ca60b00e5471c9030… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] WIP: fix all remaining wasm regressions for now
by Cheng Shao (＠TerrorJack) 15 Oct '25

15 Oct '25

Cheng Shao pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 8f1564dc by Cheng Shao at 2025-10-15T15:14:16+02:00 WIP: fix all remaining wasm regressions for now - - - - - 5 changed files: - libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/RtsToHsIface.c - rts/include/rts/RtsToHsIface.h - rts/wasm/JSFFI.c Changes: ===================================== libraries/ghc-internal/cbits/RtsIface.c ===================================== @@ -25,7 +25,7 @@ void init_ghc_hs_iface(void); #define UNDEF_CLOSURE(module, symbol) #define INFO_TBL(module, symbol) \ - extern StgInfoTable ghczminternal_##module##_##symbol; + extern const StgInfoTable ghczminternal_##module##_##symbol; #include "RtsIfaceSymbols.h" @@ -43,7 +43,7 @@ void init_ghc_hs_iface(void); #define INFO_TBL(module, symbol) \ .symbol = &ghczminternal_##module##_##symbol, -static const HsIface the_ghc_hs_iface = { +static HsIface the_ghc_hs_iface = { #include "RtsIfaceSymbols.h" }; ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -60,7 +60,7 @@ CLOSURE(GHCziInternalziExceptionziType, overflowException_closure) CLOSURE(GHCziInternalziCString, unpackCStringzh_closure) INFO_TBL(GHCziInternalziCString, unpackCStringzh_info) INFO_TBL(GHCziInternalziCString, unpackCStringUtf8zh_info) -#if defined(wasm32_HOST_ARCH) +#if defined(wasm32_HOST_ARCH) && defined(__PIC__) CLOSURE(GHCziInternalziWasmziPrimziImports, raiseJSException_closure) INFO_TBL(GHCziInternalziWasmziPrimziTypes, JSVal_con_info) CLOSURE(GHCziInternalziWasmziPrimziConcziInternal, threadDelay_closure) ===================================== rts/RtsToHsIface.c ===================================== @@ -56,4 +56,4 @@ // This captures the symbols provided by ghc-internal which // are needed by the RTS. -const HsIface *ghc_hs_iface = NULL; +HsIface *ghc_hs_iface = NULL; ===================================== rts/include/rts/RtsToHsIface.h ===================================== @@ -36,36 +36,36 @@ typedef struct { StgClosure *runHandlersPtr_closure; // GHC.Internal.Conc.Signal.runHandlersPtr_closure StgClosure *flushStdHandles_closure; // GHC.Internal.TopHandler.flushStdHandles_closure StgClosure *runMainIO_closure; // GHC.Internal.TopHandler.runMainIO_closure - StgInfoTable *Czh_con_info; // GHC.Internal.Types.Czh_con_info - StgInfoTable *Izh_con_info; // GHC.Internal.Types.Izh_con_info - StgInfoTable *Fzh_con_info; // GHC.Internal.Types.Fzh_con_info - StgInfoTable *Dzh_con_info; // GHC.Internal.Types.Dzh_con_info - StgInfoTable *Wzh_con_info; // GHC.Internal.Types.Wzh_con_info + const StgInfoTable *Czh_con_info; // GHC.Internal.Types.Czh_con_info + const StgInfoTable *Izh_con_info; // GHC.Internal.Types.Izh_con_info + const StgInfoTable *Fzh_con_info; // GHC.Internal.Types.Fzh_con_info + const StgInfoTable *Dzh_con_info; // GHC.Internal.Types.Dzh_con_info + const StgInfoTable *Wzh_con_info; // GHC.Internal.Types.Wzh_con_info StgClosure *absentSumFieldError_closure; // GHC.Internal.Prim.Panic.absentSumFieldError_closure StgClosure *runAllocationLimitHandler_closure; // GHC.Internal.AllocationLimitHandler.runAllocationLimitHandler_closure - StgInfoTable *Ptr_con_info; // GHC.Internal.Ptr.Ptr_con_info - StgInfoTable *FunPtr_con_info; // GHC.Internal.Ptr.FunPtr_con_info - StgInfoTable *I8zh_con_info; // GHC.Internal.Int.I8zh_con_info - StgInfoTable *I16zh_con_info; // GHC.Internal.Int.I16zh_con_info - StgInfoTable *I32zh_con_info; // GHC.Internal.Int.I32zh_con_info - StgInfoTable *I64zh_con_info; // GHC.Internal.Int.I64zh_con_info - StgInfoTable *W8zh_con_info; // GHC.Internal.Word.W8zh_con_info - StgInfoTable *W16zh_con_info; // GHC.Internal.Word.W16zh_con_info - StgInfoTable *W32zh_con_info; // GHC.Internal.Word.W32zh_con_info - StgInfoTable *W64zh_con_info; // GHC.Internal.Word.W64zh_con_info - StgInfoTable *StablePtr_con_info; // GHC.Internal.Stable.StablePtr_con_info + const StgInfoTable *Ptr_con_info; // GHC.Internal.Ptr.Ptr_con_info + const StgInfoTable *FunPtr_con_info; // GHC.Internal.Ptr.FunPtr_con_info + const StgInfoTable *I8zh_con_info; // GHC.Internal.Int.I8zh_con_info + const StgInfoTable *I16zh_con_info; // GHC.Internal.Int.I16zh_con_info + const StgInfoTable *I32zh_con_info; // GHC.Internal.Int.I32zh_con_info + const StgInfoTable *I64zh_con_info; // GHC.Internal.Int.I64zh_con_info + const StgInfoTable *W8zh_con_info; // GHC.Internal.Word.W8zh_con_info + const StgInfoTable *W16zh_con_info; // GHC.Internal.Word.W16zh_con_info + const StgInfoTable *W32zh_con_info; // GHC.Internal.Word.W32zh_con_info + const StgInfoTable *W64zh_con_info; // GHC.Internal.Word.W64zh_con_info + const StgInfoTable *StablePtr_con_info; // GHC.Internal.Stable.StablePtr_con_info StgClosure *StackSnapshot_closure; // GHC.Internal.Stack.CloneStack.StackSnapshot_closure StgClosure *divZZeroException_closure; // GHC.Internal.Exception.Type.divZeroException_closure StgClosure *underflowException_closure; // GHC.Internal.Exception.Type.underflowException_closure StgClosure *overflowException_closure; // GHC.Internal.Exception.Type.overflowException_closure StgClosure *unpackCStringzh_closure; // GHC.Internal.CString.unpackCStringzh_closure - StgInfoTable *unpackCStringzh_info; // GHC.Internal.CString.unpackCStringzh_info - StgInfoTable *unpackCStringUtf8zh_info; // GHC.Internal.CString.unpackCStringUtf8zh_info + const StgInfoTable *unpackCStringzh_info; // GHC.Internal.CString.unpackCStringzh_info + const StgInfoTable *unpackCStringUtf8zh_info; // GHC.Internal.CString.unpackCStringUtf8zh_info #if defined(wasm32_HOST_ARCH) StgClosure *raiseJSException_closure; // GHC.Internal.Wasm.Prim.Imports.raiseJSException_closure - StgInfoTable *JSVal_con_info; // GHC.Internal.Wasm.Prim.Types.JSVal_con_info + const StgInfoTable *JSVal_con_info; // GHC.Internal.Wasm.Prim.Types.JSVal_con_info StgClosure *threadDelay_closure; // GHC.Internal.Wasm.Prim.Conc.Internal.threadDelay_closure #endif } HsIface; -extern const HsIface *ghc_hs_iface; +extern HsIface *ghc_hs_iface; ===================================== rts/wasm/JSFFI.c ===================================== @@ -15,6 +15,22 @@ extern HsStablePtr rts_threadDelay_impl; __attribute__((__weak__)) int __main_argc_argv(int argc, char *argv[]); +#if !defined(__PIC__) +void init_ghc_hs_iface(void); + +extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure; +extern const StgInfoTable ghczminternal_GHCziInternalziWasmziPrimziTypes_JSVal_con_info; +extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure; + +__attribute__((constructor(100))) +static void __init_ghc_hs_iface_jsffi(void) { + init_ghc_hs_iface(); + ghc_hs_iface->raiseJSException_closure = &ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure; + ghc_hs_iface->JSVal_con_info = &ghczminternal_GHCziInternalziWasmziPrimziTypes_JSVal_con_info; + ghc_hs_iface->threadDelay_closure = &ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure; +} +#endif + // Note [JSFFI initialization] // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f1564dcba343fd33fe50980015de07… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f1564dcba343fd33fe50980015de07… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/bomb_out] exprSize: Accumulate size as we go to allow early bomb out.
by Andreas Klebinger (＠AndreasK) 15 Oct '25

15 Oct '25

Andreas Klebinger pushed to branch wip/andreask/bomb_out at Glasgow Haskell Compiler / GHC Commits: e16e2882 by Andreas Klebinger at 2025-10-15T14:20:24+02:00 exprSize: Accumulate size as we go to allow early bomb out. When dealing with branches in the AST we now accumulate expr size across branches, rather than computing both branches before adding them up. This way we can abort early when it's clear an expression is too large to be useful. This fixes an issue I observed in #26425 where we sometimes spent a significant amount of time computing unfolding sizes in deeply nested but branching rhss. Speedup is on the order of ~1%-4% depending on the program we are compiling. - - - - - 1 changed file: - compiler/GHC/Core/Unfold.hs Changes: ===================================== compiler/GHC/Core/Unfold.hs ===================================== @@ -1,3 +1,5 @@ +{-# LANGUAGE DataKinds #-} + {- (c) The University of Glasgow 2006 (c) The AQUA Project, Glasgow University, 1994-1998 @@ -554,56 +556,69 @@ uncondInlineJoin bndrs body go_arg (Var f) = Just $! f `notElem` bndrs go_arg _ = Nothing - sizeExpr :: UnfoldingOpts - -> Int -- Bomb out if it gets bigger than this + -> PlainSize -- Bomb out if it gets bigger than this -> [Id] -- Arguments; we're interested in which of these -- get case'd -> CoreExpr - -> ExprSize + -> ExprSize WithDiscount -- Note [Computing the size of an expression] -- Forcing bOMB_OUT_SIZE early prevents repeated -- unboxing of the Int argument. sizeExpr opts !bOMB_OUT_SIZE top_args expr - = size_up expr + = case size_up 0 expr of + -- We skip the size check in some places, in exchange for checking it one last time here. + TooBig -> TooBig + size@(SizeIs size_n _arg_dc _scrut_dc) + | size_n > bOMB_OUT_SIZE -> TooBig + | otherwise -> size where - size_up (Cast e _) = size_up e - size_up (Tick _ e) = size_up e - size_up (Type _) = sizeZero -- Types cost nothing - size_up (Coercion _) = sizeZero - size_up (Lit lit) = sizeN (litSize lit) - size_up (Var f) | isZeroBitId f = sizeZero - -- Make sure we get constructor discounts even - -- on nullary constructors - | otherwise = size_up_call f [] 0 - - size_up (App fun arg) - | isTyCoArg arg = size_up fun - | otherwise = size_up arg `addSizeNSD` - size_up_app fun [arg] (if isZeroBitExpr arg then 1 else 0) - - size_up (Lam b e) - | isId b && not (isZeroBitId b) = lamScrutDiscount opts (size_up e `addSizeN` 10) - | otherwise = size_up e - - size_up (Let (NonRec binder rhs) body) - = size_up_rhs (binder, rhs) `addSizeNSD` - size_up body `addSizeN` - size_up_alloc binder - - size_up (Let (Rec pairs) body) - = foldr (addSizeNSD . size_up_rhs) - (size_up body `addSizeN` sum (map (size_up_alloc . fst) pairs)) - pairs - - size_up (Case e _ _ alts) = case nonEmpty alts of - Nothing -> size_up e -- case e of {} never returns, so take size of scrutinee + -- (size_up s e) returns `s` plus the size of `e` + size_up :: PlainSize -> CoreExpr -> ExprSize WithDiscount + size_up acc_size _e | acc_size > bOMB_OUT_SIZE = TooBig + size_up acc_size (Cast e _) = size_up acc_size e + size_up acc_size (Tick _ e) = size_up acc_size e + size_up acc_size (Type _) = sizeND acc_size -- Types add no cost + size_up acc_size (Coercion _) = sizeND acc_size + size_up acc_size (Lit lit) = sizeND (acc_size + litSize lit) + size_up acc_size (Var f) | isZeroBitId f = sizeND acc_size + -- Make sure we get constructor discounts even + -- on nullary constructors + | otherwise = size_up_call acc_size emptyBag f [] 0 + + size_up acc_size (App fun arg) + | isTyCoArg arg = size_up acc_size fun + | otherwise = case size_up acc_size arg of + TooBig -> TooBig + SizeIs acc_size' acc_args' _d -> size_up_app acc_size' acc_args' + fun [arg] (if isZeroBitExpr arg then 1 else 0) + + size_up acc_size (Lam b e) + | isId b && not (isZeroBitId b) = lamScrutDiscount opts (size_up (acc_size+10) e) + | otherwise = size_up acc_size e + + size_up acc_size (Let (NonRec binder rhs) body) + = case size_up_let acc_size emptyBag (binder, rhs) of + TooBig -> TooBig + SizeIs acc_size' acc_args' _d -> size_up acc_size' body `addSizeB` acc_args' + + size_up acc_size (Let (Rec pairs) body) + = do_pairs acc_size emptyBag pairs + where + do_pairs acc_size acc_args [] = size_up acc_size body `addSizeB` acc_args + do_pairs acc_size acc_args (pair:pairs) = + case size_up_let acc_size acc_args pair of + TooBig -> TooBig + SizeIs acc_size' acc_args' _d -> do_pairs acc_size' acc_args' pairs + + size_up acc_size (Case e _ _ alts) = case nonEmpty alts of + Nothing -> size_up acc_size e -- case e of {} never returns, so take size of scrutinee Just alts | Just v <- is_top_arg e -> -- We are scrutinising an argument variable let - alt_sizes = NE.map size_up_alt alts + alt_sizes = NE.map (size_up_alt acc_size) alts -- alts_size tries to compute a good discount for -- the case when we are scrutinising an argument variable @@ -625,14 +640,15 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr alts_size tot_size _ = tot_size in - alts_size (foldr1 addAltSize alt_sizes) -- alts is non-empty - (foldr1 maxSize alt_sizes) + sizeN acc_size `addSizeNSD` alts_size (foldr1 addAltSize alt_sizes) -- alts is non-empty + (foldr1 maxSize alt_sizes) -- Good to inline if an arg is scrutinised, because -- that may eliminate allocation in the caller -- And it eliminates the case itself - | otherwise -> size_up e `addSizeNSD` - foldr (addAltSize . size_up_alt) case_size alts + | otherwise -> foldr (addAltSize . (size_up_alt acc_size)) + (size_up (acc_size + case_size) e) + alts where is_top_arg (Var v) | v `elem` top_args = Just v @@ -641,9 +657,10 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr is_top_arg _ = Nothing where + case_size :: PlainSize case_size - | is_inline_scrut e, lengthAtMost alts 1 = sizeN (-10) - | otherwise = sizeZero + | is_inline_scrut e, lengthAtMost alts 1 = (-10) + | otherwise = 0 -- Normally we don't charge for the case itself, but -- we charge one per alternative (see size_up_alt, -- below) to account for the cost of the info table @@ -676,48 +693,64 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr | otherwise = False - size_up_rhs (bndr, rhs) + size_up_let :: PlainSize -> Bag (Id,Int) -> (Id, CoreExpr) -> ExprSize NoDiscount + size_up_let !acc_size acc_args (bndr, rhs) | JoinPoint join_arity <- idJoinPointHood bndr -- Skip arguments to join point - , (_bndrs, body) <- collectNBinders join_arity rhs - = size_up body + , (_bndrs, join_rhs) <- collectNBinders join_arity rhs + = (stripDiscounts $ size_up acc_size join_rhs) `addSizeB` acc_args | otherwise - = size_up rhs + = (stripDiscounts $ size_up (acc_size + size_up_alloc bndr) rhs) `addSizeB` acc_args ------------ -- size_up_app is used when there's ONE OR MORE value args - size_up_app (App fun arg) args voids - | isTyCoArg arg = size_up_app fun args voids - | isZeroBitExpr arg = size_up_app fun (arg:args) (voids + 1) - | otherwise = size_up arg `addSizeNSD` - size_up_app fun (arg:args) voids - size_up_app (Var fun) args voids = size_up_call fun args voids - size_up_app (Tick _ expr) args voids = size_up_app expr args voids - size_up_app (Cast expr _) args voids = size_up_app expr args voids - size_up_app other args voids = size_up other `addSizeN` - callSize (length args) voids + size_up_app :: PlainSize -> Bag (Id,Int) -> CoreExpr -> [CoreExpr] -> Int -> ExprSize WithDiscount + size_up_app !acc_size acc_args (App fun arg) args voids + | isTyCoArg arg = size_up_app acc_size acc_args fun args voids + | isZeroBitExpr arg = size_up_app acc_size acc_args fun (arg:args) (voids + 1) + | otherwise = case size_up acc_size arg of + TooBig -> TooBig + SizeIs acc_size' acc_args' _ -> + size_up_app acc_size' acc_args' fun (arg:args) voids + `addSizeB` acc_args + size_up_app acc_size acc_args (Var fun) args voids = size_up_call acc_size acc_args fun args voids + size_up_app acc_size acc_args (Tick _ expr) args voids = size_up_app acc_size acc_args expr args voids + size_up_app acc_size acc_args (Cast expr _) args voids = size_up_app acc_size acc_args expr args voids + size_up_app acc_size acc_args other args voids = size_up (acc_size + callSize (length args) voids) other `addSizeB` acc_args + -- if the lhs is not an App or a Var, or an invisible thing like a -- Tick or Cast, then we should charge for a complete call plus the -- size of the lhs itself. ------------ - size_up_call :: Id -> [CoreExpr] -> Int -> ExprSize - size_up_call fun val_args voids - = case idDetails fun of - FCallId _ -> sizeN (callSize (length val_args) voids) - DataConWorkId dc -> conSize dc (length val_args) - PrimOpId op _ -> primOpSize op (length val_args) - ClassOpId cls _ -> classOpSize opts cls top_args val_args - _ | fun `hasKey` buildIdKey -> buildSize - | fun `hasKey` augmentIdKey -> augmentSize - | otherwise -> funSize opts top_args fun (length val_args) voids + size_up_call :: PlainSize -> Bag (Id,Int) -> Id -> [CoreExpr] -> Int -> ExprSize WithDiscount + size_up_call !acc_size acc_args fun val_args voids + = let !n_args = length val_args + call_size = case idDetails fun of + FCallId _ -> withDiscount $ sizeN (callSize n_args voids) + DataConWorkId dc -> conSize dc n_args + PrimOpId op _ -> sizeND $ primOpSize op n_args + ClassOpId cls _ -> withDiscount $ classOpSize opts cls top_args val_args + _ | fun `hasKey` buildIdKey -> buildSize + | fun `hasKey` augmentIdKey -> augmentSize + | otherwise -> funSize opts top_args fun n_args voids + in mkSizeNoDiscount bOMB_OUT_SIZE acc_size acc_args `addSizeNSD` call_size ------------ - size_up_alt (Alt _con _bndrs rhs) = size_up rhs `addSizeN` 10 + -- size_up_alt returns only the alternatives size, not counting the accumulated + -- size passed in unless we reach TooBig. This is to facility better discount + -- calculation based on the size of only the alternative. + -- size_up_alt acc_size acc_args = TooBig + size_up_alt acc_size (Alt _con _bndrs rhs) = + size_up acc_size rhs + -- Why add and then subtract s? + -- If the expression large enough this will ensure we bomb out early. + `addSizeND` (10 -acc_size) + -- Don't charge for args, so that wrappers look cheap -- (See comments about wrappers with Case) -- - -- IMPORTANT: *do* charge 1 for the alternative, else we + -- IMPORTANT: *do* charge 10 for the alternative, else we -- find that giant case nests are treated as practically free -- A good example is Foreign.C.Error.errnoToIOError @@ -734,26 +767,40 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr ------------ -- These addSize things have to be here because -- I don't want to give them bOMB_OUT_SIZE as an argument - addSizeN TooBig _ = TooBig - addSizeN (SizeIs n xs d) m = mkSizeIs bOMB_OUT_SIZE (n + m) xs d + addSizeND :: ExprSize WithDiscount -> Int -> ExprSize WithDiscount + addSizeND TooBig _ = TooBig + addSizeND (SizeIs n xs d) m = mkSizeDiscount bOMB_OUT_SIZE (n + m) xs d + addSizeB :: ExprSize a -> Bag (Id,Int) -> ExprSize a + addSizeB TooBig _ = TooBig + addSizeB (SizeIs sz bg1 dc) bg2 = SizeIs sz (bg1 `unionBags` bg2) dc -- addAltSize is used to add the sizes of case alternatives addAltSize TooBig _ = TooBig addAltSize _ TooBig = TooBig addAltSize (SizeIs n1 xs d1) (SizeIs n2 ys d2) - = mkSizeIs bOMB_OUT_SIZE (n1 + n2) + = mkSizeDiscount bOMB_OUT_SIZE (n1 + n2) (xs `unionBags` ys) (d1 + d2) -- Note [addAltSize result discounts] -- This variant ignores the result discount from its LEFT argument -- It's used when the second argument isn't part of the result + addSizeNSD :: ExprSize NoDiscount -> ExprSize WithDiscount -> ExprSize WithDiscount addSizeNSD TooBig _ = TooBig addSizeNSD _ TooBig = TooBig addSizeNSD (SizeIs n1 xs _) (SizeIs n2 ys d2) - = mkSizeIs bOMB_OUT_SIZE (n1 + n2) + = mkSizeDiscount bOMB_OUT_SIZE (n1 + n2) (xs `unionBags` ys) d2 -- Ignore d1 + -- Throw away the discount for scrutinizing the expression. + -- Used for things like `let x = rhs in body` where we only consider + -- this benefit for the body. + -- Why? `x` is visible to `body` either way, so it really should not + -- affect our inlining decision either way. + stripDiscounts :: ExprSize a -> ExprSize NoDiscount + stripDiscounts TooBig = TooBig + stripDiscounts (SizeIs n xs _) = (SizeIs n xs 0) + -- don't count expressions such as State# RealWorld -- exclude join points, because they can be rep-polymorphic -- and typePrimRep will crash @@ -764,7 +811,7 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr isZeroBitExpr _ = False -- | Finds a nominal size of a string literal. -litSize :: Literal -> Int +litSize :: Literal -> PlainSize -- Used by GHC.Core.Unfold.sizeExpr litSize (LitNumber LitNumBigNat _) = 100 litSize (LitString str) = 10 + 10 * ((BS.length str + 3) `div` 4) @@ -775,7 +822,7 @@ litSize _other = 0 -- Must match size of nullary constructors -- Key point: if x |-> 4, then x must inline unconditionally -- (eg via case binding) -classOpSize :: UnfoldingOpts -> Class -> [Id] -> [CoreExpr] -> ExprSize +classOpSize :: UnfoldingOpts -> Class -> [Id] -> [CoreExpr] -> ExprSize NoDiscount -- See Note [Conlike is interesting] classOpSize opts cls top_args args | isUnaryClass cls @@ -798,7 +845,7 @@ classOpSize opts cls top_args args callSize :: Int -- ^ number of value args -> Int -- ^ number of value args that are void - -> Int + -> PlainSize callSize n_val_args voids = 10 * (1 + n_val_args - voids) -- The 1+ is for the function itself -- Add 1 for each non-trivial arg; @@ -808,7 +855,7 @@ callSize n_val_args voids = 10 * (1 + n_val_args - voids) jumpSize :: Int -- ^ number of value args -> Int -- ^ number of value args that are void - -> Int + -> PlainSize jumpSize _n_val_args _voids = 0 -- Jumps are small, and we don't want penalise them -- Old version: @@ -818,7 +865,7 @@ jumpSize _n_val_args _voids = 0 -- Jumps are small, and we don't want penalise -- spectral/puzzle. TODO Perhaps adjusting the default threshold would be a -- better solution? -funSize :: UnfoldingOpts -> [Id] -> Id -> Int -> Int -> ExprSize +funSize :: UnfoldingOpts -> [Id] -> Id -> Int -> Int -> ExprSize WithDiscount -- Size for function calls where the function is not a constructor or primops -- Note [Function applications] funSize opts top_args fun n_val_args voids @@ -844,14 +891,14 @@ funSize opts top_args fun n_val_args voids -- If the function is partially applied, show a result discount -- XXX maybe behave like ConSize for eval'd variable -conSize :: DataCon -> Int -> ExprSize +conSize :: DataCon -> Int -> ExprSize WithDiscount conSize dc n_val_args | n_val_args == 0 = SizeIs 0 emptyBag 10 -- Like variables -- See Note [Unboxed tuple size and result discount] | isUnboxedTupleDataCon dc = SizeIs 0 emptyBag 10 - | isUnaryClassDataCon dc = sizeZero + | isUnaryClassDataCon dc = withDiscount sizeZero -- See Note [Constructor size and result discount] | otherwise = SizeIs 10 emptyBag 10 @@ -948,16 +995,16 @@ that mention a literal Integer, because the float-out pass will float all those constants to top level. -} -primOpSize :: PrimOp -> Int -> ExprSize +primOpSize :: PrimOp -> Int -> PlainSize primOpSize op n_val_args = if primOpOutOfLine op - then sizeN (op_size + n_val_args) - else sizeN op_size + then (op_size + n_val_args) + else op_size where op_size = primOpCodeSize op -buildSize :: ExprSize +buildSize :: ExprSize WithDiscount buildSize = SizeIs 0 emptyBag 40 -- We really want to inline applications of build -- build t (\cn -> e) should cost only the cost of e (because build will be inlined later) @@ -966,13 +1013,13 @@ buildSize = SizeIs 0 emptyBag 40 -- build is saturated (it usually is). The "-2" discounts for the \c n, -- The "4" is rather arbitrary. -augmentSize :: ExprSize +augmentSize :: ExprSize WithDiscount augmentSize = SizeIs 0 emptyBag 40 -- Ditto (augment t (\cn -> e) ys) should cost only the cost of -- e plus ys. The -2 accounts for the \cn -- When we return a lambda, give a discount if it's used (applied) -lamScrutDiscount :: UnfoldingOpts -> ExprSize -> ExprSize +lamScrutDiscount :: UnfoldingOpts -> ExprSize a -> ExprSize WithDiscount lamScrutDiscount opts (SizeIs n vs _) = SizeIs n vs (unfoldingFunAppDiscount opts) lamScrutDiscount _ TooBig = TooBig @@ -1045,18 +1092,27 @@ In a function application (f a b) Code for manipulating sizes -} +-- | Does an ExprSize include an evaluation Discount? +data HasDiscount = NoDiscount | WithDiscount deriving (Eq) + +type PlainSize = Int -- Things that have a size, but not argument discount, nor scrut discount + -- | The size of a candidate expression for unfolding -data ExprSize +-- +-- We don't use a separate constructor without a discount field as the +-- re-allocation here as the resulting re-allocation when converting +-- between them outweights any benefit. +data ExprSize (hasDiscount :: HasDiscount) = TooBig - | SizeIs { _es_size_is :: {-# UNPACK #-} !Int -- ^ Size found + | SizeIs { _es_size_is :: {-# UNPACK #-} !PlainSize -- ^ Size found , _es_args :: !(Bag (Id,Int)) -- ^ Arguments cased herein, and discount for each such , _es_discount :: {-# UNPACK #-} !Int -- ^ Size to subtract if result is scrutinised by a case - -- expression + -- expression. Must be zero if `hasDiscount == NoDiscount` } -instance Outputable ExprSize where +instance Outputable (ExprSize a) where ppr TooBig = text "TooBig" ppr (SizeIs a _ c) = brackets (int a <+> int c) @@ -1065,18 +1121,28 @@ instance Outputable ExprSize where -- tup = (a_1, ..., a_99) -- x = case tup of ... -- -mkSizeIs :: Int -> Int -> Bag (Id, Int) -> Int -> ExprSize -mkSizeIs max n xs d | (n - d) > max = TooBig - | otherwise = SizeIs n xs d +mkSizeDiscount :: Int -> PlainSize -> Bag (Id, Int) -> Int -> ExprSize WithDiscount +mkSizeDiscount max n xs d | (n - d) > max = TooBig + | otherwise = SizeIs n xs d + +mkSizeNoDiscount :: Int -> PlainSize -> Bag (Id, Int) -> ExprSize NoDiscount +mkSizeNoDiscount max n xs | n > max = TooBig + | otherwise = SizeIs n xs 0 -maxSize :: ExprSize -> ExprSize -> ExprSize +maxSize :: ExprSize a -> ExprSize a -> ExprSize a maxSize TooBig _ = TooBig maxSize _ TooBig = TooBig maxSize s1@(SizeIs n1 _ _) s2@(SizeIs n2 _ _) | n1 > n2 = s1 | otherwise = s2 +withDiscount :: ExprSize NoDiscount -> ExprSize WithDiscount +withDiscount s = case s of + TooBig -> TooBig + SizeIs x1 x2 x3 -> SizeIs x1 x2 x3 -sizeZero :: ExprSize -sizeN :: Int -> ExprSize +sizeZero :: ExprSize NoDiscount +sizeN :: PlainSize -> ExprSize NoDiscount +sizeND :: PlainSize -> ExprSize WithDiscount sizeZero = SizeIs 0 emptyBag 0 sizeN n = SizeIs n emptyBag 0 +sizeND = withDiscount . sizeN View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e16e2882214cea1f57ec7289047faae… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e16e2882214cea1f57ec7289047faae… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: Eliminate uses of implicit constant arrays
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 0c00c9c3 by Ben Gamari at 2025-10-15T08:06:51-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - 2 changed files: - rts/Printer.c - rts/posix/OSMem.c Changes: ===================================== rts/Printer.c ===================================== @@ -1033,8 +1033,8 @@ findPtr(P_ p, int follow) { uint32_t g, n; bdescr *bd; - const int arr_size = 1024; - StgPtr arr[arr_size]; +#define ARR_SIZE 1024 + StgPtr arr[ARR_SIZE]; int i = 0; searched = 0; @@ -1044,24 +1044,24 @@ findPtr(P_ p, int follow) // just before a block is used. for (n = 0; n < getNumCapabilities(); n++) { bd = nurseries[i].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; } #endif for (g = 0; g < RtsFlags.GcFlags.generations; g++) { bd = generations[g].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); bd = generations[g].large_objects; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; for (n = 0; n < getNumCapabilities(); n++) { i = findPtrBlocks(p, gc_threads[n]->gens[g].part_list, - arr, arr_size, i); + arr, ARR_SIZE, i); i = findPtrBlocks(p, gc_threads[n]->gens[g].todo_bd, - arr, arr_size, i); + arr, ARR_SIZE, i); } - if (i >= arr_size) return; + if (i >= ARR_SIZE) return; } if (follow && i == 1) { debugBelch("-->\n"); ===================================== rts/posix/OSMem.c ===================================== @@ -585,7 +585,7 @@ void *osReserveHeapMemory(void *startAddressPtr, W_ *len) } #endif - const int MAX_ATTEMPTS = 256; +#define MAX_ATTEMPTS 256 void *bad_allocs[MAX_ATTEMPTS]; size_t bad_alloc_lens[MAX_ATTEMPTS]; memset(bad_allocs, 0, sizeof(void*) * MAX_ATTEMPTS); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0c00c9c3b4e9b8515d4839f2c1d7d77… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0c00c9c3b4e9b8515d4839f2c1d7d77… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Add submodules for template-haskell-lift and template-haskell-quasiquoter
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 4be32153 by Teo Camarasu at 2025-10-15T08:06:09-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 7 changed files: - .gitmodules - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,9 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/template-haskell-lift"] + path = libraries/template-haskell-lift + url = https://gitlab.haskell.org/ghc/template-haskell-lift.git +[submodule "libraries/template-haskell-quasiquoter"] + path = libraries/template-haskell-quasiquoter + url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git ===================================== hadrian/src/Packages.hs ===================================== @@ -9,7 +9,7 @@ module Packages ( ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -39,7 +39,7 @@ ghcPackages = , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell, thLift, thQuasiquoter , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -56,7 +56,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, - osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, + osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace @@ -124,6 +124,8 @@ runGhc = util "runghc" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" +thLift = lib "template-haskell-lift" +thQuasiquoter = lib "template-haskell-quasiquoter" terminfo = lib "terminfo" text = lib "text" time = lib "time" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -106,6 +106,8 @@ stage0Packages = do , runGhc , semaphoreCompat -- depends on , time -- depends on win32 + , thLift -- new library not yet present for boot compilers + , thQuasiquoter -- new library not yet present for boot compilers , unlit , if windowsHost then win32 else unix -- We must use the in-tree `Win32` as the version ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs ===================================== @@ -20,7 +20,7 @@ -- | This module gives the definition of the 'Lift' class. -- -- This is an internal module. --- Please import "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead! +-- Please import "Language.Haskell.TH.Lift", "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead! module GHC.Internal.TH.Lift ( Lift(..) @@ -71,6 +71,9 @@ import GHC.Internal.ForeignPtr -- > deriving Lift -- -- Representation-polymorphic since /template-haskell-2.16.0.0/. +-- +-- This is exposed both from the @template-haskell-lift@ and @template-haskell@ packages. +-- Consider importing it from the more stable @template-haskell-lift@ if you don't need the full breadth of the @template-haskell@ interface. class Lift (t :: TYPE r) where -- | Turn a value into a Template Haskell expression, suitable for use in -- a splice. ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs ===================================== @@ -31,6 +31,9 @@ import GHC.Internal.Base hiding (Type) -- @QuasiQuoter@ that is only intended to be used in certain splice -- contexts, the unused fields should just 'fail'. This is most easily -- accomplished using 'namedefaultQuasiQuoter' or 'defaultQuasiQuoter'. +-- +-- This is exposed both from the @template-haskell-quasiquoter@ and @template-haskell@ packages. +-- Consider importing it from the more stable @template-haskell-quasiquoter@ if you don't need the full breadth of the @template-haskell@ interface. data QuasiQuoter = QuasiQuoter { -- | Quasi-quoter for expressions, invoked by quotes like @lhs = $[q|...]@ quoteExp :: String -> Q Exp, ===================================== libraries/template-haskell-lift ===================================== @@ -0,0 +1 @@ +Subproject commit e0b2a7eefcd1b7247af63ab4a691d3161eada284 ===================================== libraries/template-haskell-quasiquoter ===================================== @@ -0,0 +1 @@ +Subproject commit a47506eca032b139d9779fb8210d408c81d3fbd6 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4be32153febff94f9c89f7f74971da3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4be32153febff94f9c89f7f74971da3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/occ_anal_tuning] 7 commits: rts/nonmoving: Fix comment spelling
by Andreas Klebinger (＠AndreasK) 15 Oct '25

15 Oct '25

Andreas Klebinger pushed to branch wip/andreask/occ_anal_tuning at Glasgow Haskell Compiler / GHC Commits: 14281a22 by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/nonmoving: Fix comment spelling - - - - - bedd38b0 by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/nonmoving: Use atomic operations to update bd->flags - - - - - 215d6841 by Ben Gamari at 2025-10-11T14:06:47-04:00 nonmoving: Use get_itbl instead of explicit loads This is cleaner and also fixes unnecessary (and unsound) use of `volatile`. - - - - - 2c94aa3a by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/Scav: Handle WHITEHOLEs in scavenge_one `scavenge_one`, used to scavenge mutable list entries, may encounter `WHITEHOLE`s when the non-moving GC is in use via two paths: 1. when an MVAR is being marked concurrently 2. when the object belongs to a chain of selectors being short-cutted. Fixes #26204. - - - - - 6bd8155c by Matthew Pickering at 2025-10-11T14:07:29-04:00 Add support for generating bytecode objects This commit adds the `-fwrite-byte-code` option which makes GHC emit a `.gbc` file which contains a serialised representation of bytecode. The bytecode can be loaded by the compiler to avoid having to reinterpret a module when using the bytecode interpreter (for example, in GHCi). There are also the new options: * -gbcdir=<DIR>: Specify the directory to place the gbc files * -gbcsuf=<suffix>: Specify the suffix for gbc files The option `-fbyte-code-and-object-code` now implies `-fwrite-byte-code`. These performance tests fail due to https://github.com/haskell/directory/issues/204 ------------------------- Metric Increase: MultiComponentModules MultiLayerModules MultiComponentModulesRecomp MultiLayerModulesRecomp MultiLayerModulesTH_Make MultiLayerModulesTH_OneShot T13701 ------------------------- The bytecode serialisation part was implemented by Cheng Shao Co-authored-by: Cheng Shao <terrorjack(a)type.dance> - - - - - dc8f9599 by Matthew Pickering at 2025-10-11T14:07:30-04:00 Revert "Add a perf test for #26425" This test has a large memory spike currently, which makes the test sensitive, since if you allocate a little more or less, the precise location where GC happens shifts and you observe a different part of the spike. Andreas told me to revert the patch for now, and he will add it back when he fixes the memory spike. This reverts commit 41bdb16fd083110a06507248f648c507a2feb4af. - - - - - 297e4e90 by Andreas Klebinger at 2025-10-14T14:54:12+02:00 OccAnal: Be stricter. * When combining usageDetails. * When constructing core expressions. In combineUsageDetails when combining the underlying adds we compute a new `LocalOcc` for each entry by combining the two existing ones. Rather than wait for those entries to be forced down the road we now force them immediately. Speeding up T26425 by about 10% with little effect on the common case. We also force CoreExprs we construct in order to prevent them from captuing the OccAnal Env massively reducing residency in some cases. For T26425 residency went down by a factor of ~10x. ------------------------- Metric Decrease: T26425 ------------------------- - - - - - 75 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Data/FlatBag.hs - compiler/GHC/Data/Graph/UnVar.hs - compiler/GHC/Data/SmallArray.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backpack.hs - + compiler/GHC/Driver/ByteCode.hs - compiler/GHC/Driver/Config/Finder.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Messager.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Types/Unique/FM.hs - compiler/GHC/Types/Var/Env.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/Module/Graph.hs - compiler/GHC/Unit/Module/Location.hs - compiler/GHC/Unit/Module/ModSummary.hs - compiler/GHC/Unit/Module/WholeCoreBindings.hs - compiler/GHC/Utils/Binary.hs - compiler/ghc.cabal.in - docs/users_guide/phases.rst - docs/users_guide/separate_compilation.rst - rts/include/rts/storage/Block.h - rts/sm/NonMoving.c - rts/sm/NonMovingMark.c - rts/sm/Scav.c - testsuite/tests/bytecode/T24634/T24634a.stdout - testsuite/tests/bytecode/T24634/T24634b.stdout - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/driver/bytecode-object/A.hs - + testsuite/tests/driver/bytecode-object/BytecodeForeign.c - + testsuite/tests/driver/bytecode-object/BytecodeForeign.hs - + testsuite/tests/driver/bytecode-object/BytecodeMain.hs - + testsuite/tests/driver/bytecode-object/BytecodeTest.hs - + testsuite/tests/driver/bytecode-object/Makefile - + testsuite/tests/driver/bytecode-object/all.T - + testsuite/tests/driver/bytecode-object/bytecode_object12.stderr - + testsuite/tests/driver/bytecode-object/bytecode_object13.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object14.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object15.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object16.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object17.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object18.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object19.script - + testsuite/tests/driver/bytecode-object/bytecode_object19.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object25.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object4.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object5.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object6.stdout - testsuite/tests/driver/fat-iface/T22405/T22405.stdout - testsuite/tests/driver/fat-iface/T22405/T22405b.stdout - testsuite/tests/driver/fat-iface/fat011.stderr - testsuite/tests/perf/compiler/Makefile - + testsuite/tests/perf/compiler/MultiLayerModulesDefsGhciWithBytecodeFiles.script - − testsuite/tests/perf/compiler/T26425.hs - testsuite/tests/perf/compiler/all.T - testsuite/tests/simplStg/should_compile/T22840.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8e2e19a7d28d27d3e1208c6335f79e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8e2e19a7d28d27d3e1208c6335f79e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/t23703] 2 commits: Refactor distinct constructor tables map construction
by Hannes Siebenhandl (＠fendor) 15 Oct '25

15 Oct '25

Hannes Siebenhandl pushed to branch wip/fendor/t23703 at Glasgow Haskell Compiler / GHC Commits: 68a16b97 by Fendor at 2025-10-15T11:44:25+02:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - 5be55c19 by Fendor at 2025-10-15T11:47:09+02:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - 33 changed files: - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c7cb007224cbcbe07255163a04c89d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c7cb007224cbcbe07255163a04c89d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/fix-haddock-stackanno
by Hannes Siebenhandl (＠fendor) 15 Oct '25

15 Oct '25

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

1 0