- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new tag ghc-9.14.1-alpha3
by Ben Gamari (＠bgamari) 14 Oct '25

14 Oct '25

Ben Gamari pushed new tag ghc-9.14.1-alpha3 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/ghc-9.14.1-alpha3 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/remove-hscInsertHPT-call
by Matthew Pickering (＠mpickering) 14 Oct '25

14 Oct '25

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

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 9 commits: rts/nonmoving: Fix comment spelling
by Marge Bot (＠marge-bot) 14 Oct '25

14 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job 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. - - - - - eb93f1af by Finley McIlwaine at 2025-10-14T04:23:45-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookupWithKey` to support fusion of distinct constructor data insertion and lookup during the construction of the data con map in `GHC.Stg.Debug.numberDataCon`. - - - - - 7413e9b7 by Finley McIlwaine at 2025-10-14T04:23:45-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 - - - - - 7deec054 by Sven Tennie at 2025-10-14T04:23:46-04:00 T22859: Increase threadDelay for small machines The previously used thread delay led to failures on my RISC-V test setups. - - - - - 99 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Data/FlatBag.hs - compiler/GHC/Data/SmallArray.hs - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.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/Config/Stg/Debug.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/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.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/debug-info.rst - 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/rts/T22859.hs - + 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 - 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/d68db1e463886564dbcef1b527ed3d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d68db1e463886564dbcef1b527ed3d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED_BEFORE_REBASE
by Sven Tennie (＠supersven) 14 Oct '25

14 Oct '25

Sven Tennie pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED_BEFORE_REBASE at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/romes/hadrian-cross-stage2-re… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] WIP partial fixes for wasm
by Cheng Shao (＠TerrorJack) 14 Oct '25

14 Oct '25

Cheng Shao pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: e0ffb03a by Cheng Shao at 2025-10-13T18:54:49+02:00 WIP partial fixes for wasm - - - - - 5 changed files: - libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/RtsStartup.c - rts/include/rts/RtsToHsIface.h - rts/wasm/JSFFI.c Changes: ===================================== libraries/ghc-internal/cbits/RtsIface.c ===================================== @@ -8,7 +8,15 @@ #include "Rts.h" -void init_ghc_hs_iface(void) __attribute__((constructor)); +#if defined(wasm32_HOST_ARCH) +// See Note [JSFFI initialization], on wasm we must ensure this +// constructor has the highest priority among all GHC related +// constructors +__attribute__((constructor(100))) +#else +__attribute__((constructor)) +#endif +void init_ghc_hs_iface(void); // Forward declarations #define CLOSURE(module, symbol) \ ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -62,10 +62,6 @@ INFO_TBL(GHCziInternalziCString, unpackCStringzh_info) INFO_TBL(GHCziInternalziCString, unpackCStringUtf8zh_info) #if defined(wasm32_HOST_ARCH) CLOSURE(GHCziInternalziWasmziPrimziImports, raiseJSException_closure) -CLOSURE(GHCziInternalziWasmziPrim, JSVal_con_info) -CLOSURE(GHCziInternalziWasmziPrim, threadDelay_closure) -#else -UNDEF_CLOSURE(GHCziInternalziWasmziPrimziImports, raiseJSException_closure) -UNDEF_CLOSURE(GHCziInternalziWasmziPrim, JSVal_con_info) -UNDEF_CLOSURE(GHCziInternalziWasmziPrim, threadDelay_closure) +INFO_TBL(GHCziInternalziWasmziPrimziTypes, JSVal_con_info) +CLOSURE(GHCziInternalziWasmziPrimziConcziInternal, threadDelay_closure) #endif ===================================== rts/RtsStartup.c ===================================== @@ -236,6 +236,8 @@ hs_init_with_rtsopts(int *argc, char **argv[]) hs_init_ghc(argc, argv, rts_opts); } +void init_ghc_hs_iface(void); + void hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config) { @@ -263,10 +265,7 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config) setlocale(LC_CTYPE,""); - if (ghc_hs_iface == NULL) { - errorBelch("hs_init_ghc: ghc_hs_iface is uninitialized"); - stg_exit(1); - } + init_ghc_hs_iface(); /* Initialise the stats department, phase 0 */ initStats0(); ===================================== rts/include/rts/RtsToHsIface.h ===================================== @@ -61,9 +61,11 @@ typedef struct { StgClosure *unpackCStringzh_closure; // GHC.Internal.CString.unpackCStringzh_closure StgInfoTable *unpackCStringzh_info; // GHC.Internal.CString.unpackCStringzh_info StgInfoTable *unpackCStringUtf8zh_info; // GHC.Internal.CString.unpackCStringUtf8zh_info +#if defined(wasm32_HOST_ARCH) StgClosure *raiseJSException_closure; // GHC.Internal.Wasm.Prim.Imports.raiseJSException_closure - StgClosure *JSVal_con_info; // GHC.Internal.Wasm.Prim.JSVal_con_info - StgClosure *threadDelay_closure; // GHC.Internal.Wasm.Prim.threadDelay_closure + 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; ===================================== rts/wasm/JSFFI.c ===================================== @@ -11,8 +11,6 @@ extern HsBool rts_JSFFI_flag; extern HsStablePtr rts_threadDelay_impl; -extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure; -extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure; __attribute__((__weak__)) int __main_argc_argv(int argc, char *argv[]); @@ -124,7 +122,6 @@ typedef __externref_t HsJSVal; typedef StgInt JSValKey; extern const StgInfoTable stg_JSVAL_info; -extern const StgInfoTable ghczminternal_GHCziInternalziWasmziPrimziTypes_JSVal_con_info; // See Note [JSVal representation for wasm] for detailed explanation. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e0ffb03a773415a286a7d0f583a130a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e0ffb03a773415a286a7d0f583a130a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] rts: Avoid static symbol references to ghc-internal
by Rodrigo Mesquita (＠alt-romes) 14 Oct '25

14 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 98d1c8e6 by Ben Gamari at 2025-10-13T17:02:09+01:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 31 changed files: - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Static.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/BuiltinClosures.c - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Prelude.h - rts/PrimOps.cmm - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.c - rts/Schedule.c - rts/StgStdThunks.cmm - rts/configure.ac - − rts/external-symbols.list.in - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - + rts/include/rts/RtsToHsIface.h - rts/posix/Signals.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/wasm/JSFFI.c - rts/win32/libHSghc-internal.def - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/98d1c8e65d4fbe0163d18abb60ecc9a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/98d1c8e65d4fbe0163d18abb60ecc9a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 3 commits: Wibbles
by Simon Peyton Jones (＠simonpj) 13 Oct '25

13 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 5d658dd6 by Simon Peyton Jones at 2025-10-13T07:55:47+01:00 Wibbles - - - - - 8e5e75c3 by Simon Peyton Jones at 2025-10-13T16:47:43+01:00 Wibble defaulting repr eqs - - - - - 467db3c2 by Simon Peyton Jones at 2025-10-13T16:47:56+01:00 Improve kick-out after filling coercion holes The Note needs updating if CI is happy - - - - - 8 changed files: - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Zonk/TcType.hs - testsuite/tests/rep-poly/RepPolyNPlusK.stderr - testsuite/tests/rep-poly/T14561b.stderr - testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr Changes: ===================================== compiler/GHC/Tc/Solver/Default.hs ===================================== @@ -485,13 +485,14 @@ defaultEquality encl_eqs ct ReprEq -- See Note [Defaulting representational equalities] - -- Don't even try this for definitely-insoluble representational - -- equalities such as Int ~R# Bool. + -- Don't even try this for definitely-insoluble + -- representational equalities such as Int ~R# Bool. | CIrredCan (IrredCt { ir_reason }) <- ct , isInsolubleReason ir_reason -> return False -- Nor if there are enclosing equalities + -- See (DRE1) in Note [Defaulting representational equalities] | encl_eqs -> return False @@ -697,15 +698,7 @@ Wrinkles: See #10009, and Note [Limited defaulting in the ambiguity check]. - -Note [Must simplify after defaulting] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -We may have a deeply buried constraint - (t:*) ~ (a:Open) -which we couldn't solve because of the kind incompatibility, and 'a' is free. -Then when we default 'a' we can solve the constraint. And we want to do -that before starting in on type classes. We MUST do it before reporting -errors, because it isn't an error! #7967 was due to this. +(DE7) For representational equalities see Note [Defaulting representational equalities] Note [Defaulting representational equalities] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -766,6 +759,23 @@ in which case unifying alpha := Int would be wrong, as the correct solution is alpha := Age. This worry doesn't concern us in top-level defaulting, because defaulting takes place after generalisation; it is fully monomorphic. +(DRE1) Suppose we have (see test UnliftedNewtypesCoerceFail) + [G] Coercible a b + [W] alpha ~R# beta + Then we don't want to make alpha:=beta, because we probably should really solve it + from the Given Coercible constraint. So we check first for the absence of enclosing + equalities. This is a bit ad-hoc, but so is all of defaulting really. + +Note [Must simplify after defaulting] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +We may have a deeply buried constraint + (t:*) ~ (a:Open) +which we couldn't solve because of the kind incompatibility, and 'a' is free. +Then when we default 'a' we can solve the constraint. And we want to do +that before starting in on type classes. We MUST do it before reporting +errors, because it isn't an error! #7967 was due to this. + + ********************************************************************************* * * * Type-class defaulting ===================================== compiler/GHC/Tc/Solver/InertSet.hs ===================================== @@ -24,7 +24,7 @@ module GHC.Tc.Solver.InertSet ( -- * Inert equalities InertEqs, foldTyEqs, delEq, findEq, - partitionInertEqs, partitionFunEqs, + partitionInertEqs, partitionFunEqs, transformAndPartitionTyVarEqs, filterInertEqs, filterFunEqs, foldFunEqs, addEqToCans, @@ -1359,27 +1359,30 @@ findEq icans (TyVarLHS tv) = findTyEqs icans tv findEq icans (TyFamLHS fun_tc fun_args) = concat @Maybe (findFunEq (inert_funeqs icans) fun_tc fun_args) -{-# INLINE partition_eqs_container #-} -partition_eqs_container - :: forall container - . container -- empty container - -> (forall b. (EqCt -> b -> b) -> container -> b -> b) -- folder - -> (EqCt -> container -> container) -- extender - -> (EqCt -> Bool) - -> container - -> ([EqCt], container) -partition_eqs_container empty_container fold_container extend_container pred orig_inerts - = fold_container folder orig_inerts ([], empty_container) +transformAndPartitionTyVarEqs + :: (EqCt -> Either EqCt EqCt) -- Left => chuck out, Right => keep + -> InertEqs + -> ([EqCt], InertEqs) -- (chuck-out, keep) +transformAndPartitionTyVarEqs pred orig_inerts + = foldTyEqs folder orig_inerts ([], emptyTyEqs) where - folder :: EqCt -> ([EqCt], container) -> ([EqCt], container) + folder :: EqCt -> ([EqCt], InertEqs) -> ([EqCt], InertEqs) folder eq_ct (acc_true, acc_false) - | pred eq_ct = (eq_ct : acc_true, acc_false) - | otherwise = (acc_true, extend_container eq_ct acc_false) + = case pred eq_ct of + Left eq_ct' -> (eq_ct' : acc_true, acc_false) + Right eq_ct' -> (acc_true, addInertEqs eq_ct' acc_false) partitionInertEqs :: (EqCt -> Bool) -- EqCt will always have a TyVarLHS -> InertEqs -> ([EqCt], InertEqs) -partitionInertEqs = partition_eqs_container emptyTyEqs foldTyEqs addInertEqs +partitionInertEqs pred orig_inerts + = foldTyEqs folder orig_inerts ([], emptyTyEqs) + where + folder :: EqCt -> ([EqCt], InertEqs) -> ([EqCt], InertEqs) + folder eq_ct (acc_true, acc_false) + = case pred eq_ct of + True -> (eq_ct : acc_true, acc_false) + False -> (acc_true, addInertEqs eq_ct acc_false) addInertEqs :: EqCt -> InertEqs -> InertEqs -- Precondition: CanEqLHS is a TyVarLHS @@ -1412,7 +1415,14 @@ foldFunEqs k fun_eqs z = foldTcAppMap (\eqs z -> foldr k z eqs) fun_eqs z partitionFunEqs :: (EqCt -> Bool) -- EqCt will have a TyFamLHS -> InertFunEqs -> ([EqCt], InertFunEqs) -partitionFunEqs = partition_eqs_container emptyFunEqs foldFunEqs addFunEqs +partitionFunEqs pred orig_inerts + = foldFunEqs folder orig_inerts ([], emptyFunEqs) + where + folder :: EqCt -> ([EqCt], InertFunEqs) -> ([EqCt], InertFunEqs) + folder eq_ct (acc_true, acc_false) + = case pred eq_ct of + True -> (eq_ct : acc_true, acc_false) + False -> (acc_true, addFunEqs eq_ct acc_false) addFunEqs :: EqCt -> InertFunEqs -> InertFunEqs -- Precondition: EqCt is a TyFamLHS @@ -1424,12 +1434,11 @@ addFunEqs other _ = pprPanic "extendFunEqs" (ppr other) filterFunEqs :: (EqCt -> Bool) -> InertFunEqs -> InertFunEqs filterFunEqs f = mapMaybeTcAppMap g where - g xs = - let filtered = filter f xs - in - if null filtered - then Nothing - else Just filtered + g xs | null filtered = Nothing + | otherwise = Just filtered + where + filtered = filter f xs + {- ********************************************************************* * * ===================================== compiler/GHC/Tc/Solver/Monad.hs ===================================== @@ -190,7 +190,6 @@ import GHC.Types.DefaultEnv ( DefaultEnv ) import GHC.Types.Var import GHC.Types.Var.Set import GHC.Types.Unique.Supply -import GHC.Types.Unique.Set( elementOfUniqSet ) import GHC.Types.Id import GHC.Types.Basic (allImportLevels) import GHC.Types.ThLevelIndex (thLevelIndexFromImportLevel) @@ -458,15 +457,16 @@ kickOutAfterUnification tv_set ; traceTcS "kickOutAfterUnification" (ppr tv_set $$ text "n_kicked =" <+> ppr n_kicked) ; return n_kicked } -kickOutAfterFillingCoercionHole :: CoercionHole -> TcS () +kickOutAfterFillingCoercionHole :: CoercionHole -> Coercion -> TcS () -- See Wrinkle (URW2) in Note [Unify only if the rewriter set is empty] -- in GHC.Tc.Solver.Equality -- -- It's possible that this could just go ahead and unify, but could there -- be occurs-check problems? Seems simpler just to kick out. -kickOutAfterFillingCoercionHole hole +kickOutAfterFillingCoercionHole hole co = do { ics <- getInertCans - ; let (kicked_out, ics') = kick_out ics + ; new_holes <- liftZonkTcS $ TcM.freeHolesOfCoercion co + ; let (kicked_out, ics') = kick_out new_holes ics n_kicked = length kicked_out ; unless (n_kicked == 0) $ @@ -479,20 +479,25 @@ kickOutAfterFillingCoercionHole hole ; setInertCans ics' } where - kick_out :: InertCans -> ([EqCt], InertCans) - kick_out ics@(IC { inert_eqs = eqs }) + kick_out :: RewriterSet -> InertCans -> ([EqCt], InertCans) + kick_out new_holes ics@(IC { inert_eqs = eqs }) = (eqs_to_kick, ics { inert_eqs = eqs_to_keep }) where - (eqs_to_kick, eqs_to_keep) = partitionInertEqs kick_out_eq eqs + (eqs_to_kick, eqs_to_keep) = transformAndPartitionTyVarEqs (kick_out_eq new_holes) eqs - kick_out_eq :: EqCt -> Bool -- True: kick out; False: keep. - kick_out_eq (EqCt { eq_ev = ev ,eq_lhs = lhs }) - | CtWanted (WantedCt { ctev_rewriters = RewriterSet rewriters }) <- ev + kick_out_eq :: RewriterSet -> EqCt -> Either EqCt EqCt + kick_out_eq new_holes eq_ct@(EqCt { eq_ev = ev, eq_lhs = lhs }) + | CtWanted (wev@(WantedCt { ctev_rewriters = rewriters })) <- ev , TyVarLHS tv <- lhs , isMetaTyVar tv - = hole `elementOfUniqSet` rewriters + , hole `elemRewriterSet` rewriters + , let holes' = (rewriters `delRewriterSet` hole) `mappend` new_holes + eq_ct' = eq_ct { eq_ev = CtWanted (wev { ctev_rewriters = holes' }) } + = if isEmptyRewriterSet holes' + then Left eq_ct' -- Kick out + else Right eq_ct' -- Keep, but with trimmed holes | otherwise - = False + = Right eq_ct -------------- insertSafeOverlapFailureTcS :: InstanceWhat -> DictCt -> TcS () @@ -1990,7 +1995,7 @@ Yuk! fillCoercionHole :: CoercionHole -> Coercion -> TcS () fillCoercionHole hole co = do { wrapTcS $ TcM.fillCoercionHole hole co - ; kickOutAfterFillingCoercionHole hole } + ; kickOutAfterFillingCoercionHole hole co } setEvBindIfWanted :: CtEvidence -> CanonicalEvidence -> EvTerm -> TcS () setEvBindIfWanted ev canonical tm ===================================== compiler/GHC/Tc/Types/Constraint.hs ===================================== @@ -88,9 +88,10 @@ module GHC.Tc.Types.Constraint ( GivenCtEvidence(..), WantedCtEvidence(..), -- RewriterSet - RewriterSet(..), emptyRewriterSet, isEmptyRewriterSet, - -- exported concretely only for zonkRewriterSet + -- RewriterSet(..) is exported concretely only for zonkRewriterSet + RewriterSet(..), emptyRewriterSet, isEmptyRewriterSet, elemRewriterSet, addRewriter, unitRewriterSet, unionRewriterSet, rewriterSetFromCts, + delRewriterSet, wrapType, @@ -2506,6 +2507,12 @@ emptyRewriterSet = RewriterSet emptyUniqSet unitRewriterSet :: CoercionHole -> RewriterSet unitRewriterSet = coerce (unitUniqSet @CoercionHole) +elemRewriterSet :: CoercionHole -> RewriterSet -> Bool +elemRewriterSet = coerce (elementOfUniqSet @CoercionHole) + +delRewriterSet :: RewriterSet -> CoercionHole -> RewriterSet +delRewriterSet = coerce (delOneFromUniqSet @CoercionHole) + unionRewriterSet :: RewriterSet -> RewriterSet -> RewriterSet unionRewriterSet = coerce (unionUniqSets @CoercionHole) ===================================== compiler/GHC/Tc/Zonk/TcType.hs ===================================== @@ -43,6 +43,7 @@ module GHC.Tc.Zonk.TcType -- * Coercion holes , isFilledCoercionHole, unpackCoercionHole, unpackCoercionHole_maybe + , freeHolesOfCoercion -- * Tidying @@ -583,30 +584,33 @@ zonkCtEvRewriterSet ev@(CtWanted wtd) -- find all the free un-filled coercion holes in the coercion that fills it zonkRewriterSet :: RewriterSet -> ZonkM RewriterSet zonkRewriterSet (RewriterSet set) - = nonDetStrictFoldUniqSet go (return emptyRewriterSet) set + = unUCHM (nonDetStrictFoldUniqSet go mempty set) -- This does not introduce non-determinism, because the only -- monadic action is to read, and the combining function is -- commutative where - go :: CoercionHole -> ZonkM RewriterSet -> ZonkM RewriterSet - go hole m_acc = unionRewriterSet <$> check_hole hole <*> m_acc - - check_hole :: CoercionHole -> ZonkM RewriterSet - check_hole hole - = do { m_co <- unpackCoercionHole_maybe hole - ; case m_co of - Nothing -> return (unitRewriterSet hole) -- Not filled - Just co -> unUCHM (check_co co) } -- Filled: look inside - - check_ty :: Type -> UnfilledCoercionHoleMonoid - check_co :: Coercion -> UnfilledCoercionHoleMonoid - (check_ty, _, check_co, _) = foldTyCo folder () - - folder :: TyCoFolder () UnfilledCoercionHoleMonoid - folder = TyCoFolder { tcf_view = noView - , tcf_tyvar = \ _ tv -> check_ty (tyVarKind tv) - , tcf_covar = \ _ cv -> check_ty (varType cv) - , tcf_hole = \ _ -> UCHM . check_hole + go :: CoercionHole -> UnfilledCoercionHoleMonoid -> UnfilledCoercionHoleMonoid + go hole m_acc = freeHolesOfHole hole `mappend` m_acc + +freeHolesOfCoercion :: Coercion -> ZonkM RewriterSet +freeHolesOfCoercion co = unUCHM (freeHolesOfCo co) + +freeHolesOfHole :: CoercionHole -> UnfilledCoercionHoleMonoid +freeHolesOfHole hole + = UCHM $ do { m_co <- unpackCoercionHole_maybe hole + ; case m_co of + Nothing -> return (unitRewriterSet hole) -- Not filled + Just co -> unUCHM (freeHolesOfCo co) } -- Filled: look inside + +freeHolesOfTy :: Type -> UnfilledCoercionHoleMonoid +freeHolesOfCo :: Coercion -> UnfilledCoercionHoleMonoid +(freeHolesOfTy, _, freeHolesOfCo, _) = foldTyCo freeHolesFolder () + +freeHolesFolder :: TyCoFolder () UnfilledCoercionHoleMonoid +freeHolesFolder = TyCoFolder { tcf_view = noView + , tcf_tyvar = \ _ tv -> freeHolesOfTy (tyVarKind tv) + , tcf_covar = \ _ cv -> freeHolesOfTy (varType cv) + , tcf_hole = \ _ h -> freeHolesOfHole h , tcf_tycobinder = \ _ _ _ -> () } newtype UnfilledCoercionHoleMonoid = UCHM { unUCHM :: ZonkM RewriterSet } ===================================== testsuite/tests/rep-poly/RepPolyNPlusK.stderr ===================================== @@ -9,21 +9,21 @@ RepPolyNPlusK.hs:22:6: error: [GHC-55287] arising from the literal ‘2’ does not have a fixed runtime representation. Its type is: - a0 :: TYPE rep0 + a1 :: TYPE rep2 When unifying: - • a0 + • a1 • a - Cannot unify ‘rep1’ with the type variable ‘rep0’ + Cannot unify ‘rep1’ with the type variable ‘rep2’ because the former is not a concrete ‘RuntimeRep’. • The first argument of the rebindable syntax operator ‘(-)’ arising from the literal ‘2’ does not have a fixed runtime representation. Its type is: - a1 :: TYPE rep2 + a0 :: TYPE rep0 When unifying: - • a1 + • a0 • a - Cannot unify ‘rep1’ with the type variable ‘rep2’ + Cannot unify ‘rep1’ with the type variable ‘rep0’ because the former is not a concrete ‘RuntimeRep’. • In the pattern: bndr_a+2 In an equation for ‘foo’: foo (bndr_a+2) = () ===================================== testsuite/tests/rep-poly/T14561b.stderr ===================================== @@ -2,9 +2,9 @@ T14561b.hs:12:9: error: [GHC-55287] • The first argument of ‘coerce’ does not have a fixed runtime representation. Its type is: - a0 :: TYPE k0 + b0 :: TYPE k0 When unifying: - • a0 -> b0 + • b0 -> b0 • a -> a Cannot unify ‘r’ with the type variable ‘k0’ because the former is not a concrete ‘RuntimeRep’. ===================================== testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr ===================================== @@ -2,9 +2,9 @@ UnliftedNewtypesCoerceFail.hs:14:8: error: [GHC-55287] • The first argument of ‘coerce’ does not have a fixed runtime representation. Its type is: - b0 :: TYPE k0 + a0 :: TYPE k0 When unifying: - • b0 -> b0 + • a0 -> b0 • x -> y Cannot unify ‘rep’ with the type variable ‘k0’ because the former is not a concrete ‘RuntimeRep’. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c6ea5c8355a2600e145f0cfb833c97… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c6ea5c8355a2600e145f0cfb833c97… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] 8 commits: rts/nonmoving: Fix comment spelling
by Rodrigo Mesquita (＠alt-romes) 13 Oct '25

13 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 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. - - - - - c7b1f359 by Rodrigo Mesquita at 2025-10-13T16:46:35+01:00 Move code-gen aux symbols from ghc-internal to rts These symbols were all previously defined in ghc-internal and made the dependency structure awkward, where the rts may refer to some of these symbols and had to work around that circular dependency the way described in #26166. Moreover, the code generator will produce code that uses these symbols! Therefore, they should be available in the rts: PRINCIPLE: If the code generator may produce code which uses this symbol, then it should be defined in the rts rather than, say, ghc-internal. That said, the main motivation is towards fixing #26166. Towards #26166. Pre-requisite of !14892 - - - - - 4fdde7d0 by Ben Gamari at 2025-10-13T16:46:35+01:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 118 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/Data/FlatBag.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/Foreign/C.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.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 - hadrian/src/Settings/Packages.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/BuiltinClosures.c - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Prelude.h - rts/PrimOps.cmm - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.c - rts/Schedule.c - rts/StgStdThunks.cmm - rts/configure.ac - − rts/external-symbols.list.in - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - + rts/include/rts/RtsToHsIface.h - rts/include/rts/storage/Block.h - rts/include/stg/Prim.h - rts/posix/Signals.c - libraries/ghc-internal/cbits/atomic.c → rts/prim/atomic.c - libraries/ghc-internal/cbits/bitrev.c → rts/prim/bitrev.c - libraries/ghc-internal/cbits/bswap.c → rts/prim/bswap.c - libraries/ghc-internal/cbits/clz.c → rts/prim/clz.c - libraries/ghc-internal/cbits/ctz.c → rts/prim/ctz.c - libraries/ghc-internal/cbits/int64x2minmax.c → rts/prim/int64x2minmax.c - libraries/ghc-internal/cbits/longlong.c → rts/prim/longlong.c - libraries/ghc-internal/cbits/mulIntMayOflo.c → rts/prim/mulIntMayOflo.c - libraries/ghc-internal/cbits/pdep.c → rts/prim/pdep.c - libraries/ghc-internal/cbits/pext.c → rts/prim/pext.c - libraries/ghc-internal/cbits/popcnt.c → rts/prim/popcnt.c - libraries/ghc-internal/cbits/vectorQuotRem.c → rts/prim/vectorQuotRem.c - libraries/ghc-internal/cbits/word2float.c → rts/prim/word2float.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/sm/NonMoving.c - rts/sm/NonMovingMark.c - rts/sm/Scav.c - rts/wasm/JSFFI.c - rts/win32/libHSghc-internal.def - 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 - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa15c2a3648a51a2b40c689d1dcd9c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa15c2a3648a51a2b40c689d1dcd9c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] rts: Avoid static symbol references to ghc-internal
by Rodrigo Mesquita (＠alt-romes) 13 Oct '25

13 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: fa15c2a3 by Ben Gamari at 2025-10-13T16:46:14+01:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 4 changed files: - libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/include/Stg.h - rts/include/rts/RtsToHsIface.h - rts/win32/libHSghc-internal.def Changes: ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -23,7 +23,11 @@ CLOSURE(GHCziInternalziIOziException, cannotCompactMutable_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, nonTermination_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, nestedAtomically_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, noMatchingContinuationPrompt_closure) +#if defined(mingw32_HOST_OS) +UNDEF_CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure) +#else CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure) +#endif CLOSURE(GHCziInternalziConcziSync, runSparks_closure) CLOSURE(GHCziInternalziConcziIO, ensureIOManagerIsRunning_closure) CLOSURE(GHCziInternalziConcziIO, interruptIOManager_closure) ===================================== rts/include/Stg.h ===================================== @@ -343,9 +343,12 @@ external prototype return neither of these types to workaround #11395. * StgInfoTable, StgClosure and so on. */ #include "stg/MiscClosures.h" +/* And this is included for references to ghc_hs_iface */ +#include "rts/Types.h" +#include "rts/RtsToHsIface.h" #endif -#include "stg/Prim.h" /* ghc-internal fallbacks */ +#include "stg/Prim.h" #include "stg/SMP.h" /* ----------------------------------------------------------------------------- ===================================== rts/include/rts/RtsToHsIface.h ===================================== @@ -6,6 +6,8 @@ * See Note [RTS/ghc-internal interface]. */ +#pragma once + typedef struct { StgClosure *processRemoteCompletion_closure; // GHC.Internal.Event.Windows.processRemoteCompletion_closure StgClosure *runIO_closure; // GHC.Internal.TopHandler.runIO_closure ===================================== rts/win32/libHSghc-internal.def ===================================== @@ -44,7 +44,6 @@ EXPORTS ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure - ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure ghczminternal_GHCziInternalziExceptionziType_underflowException_closure ghczminternal_GHCziInternalziExceptionziType_overflowException_closure View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa15c2a3648a51a2b40c689d1dcd9c1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa15c2a3648a51a2b40c689d1dcd9c1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] rts: Avoid static symbol references to ghc-internal
by Rodrigo Mesquita (＠alt-romes) 13 Oct '25

13 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 847404cf by Ben Gamari at 2025-10-13T16:37:54+01:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 3 changed files: - libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/include/Stg.h - rts/include/rts/RtsToHsIface.h Changes: ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -23,7 +23,11 @@ CLOSURE(GHCziInternalziIOziException, cannotCompactMutable_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, nonTermination_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, nestedAtomically_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, noMatchingContinuationPrompt_closure) +#if defined(mingw32_HOST_OS) +UNDEF_CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure) +#else CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure) +#endif CLOSURE(GHCziInternalziConcziSync, runSparks_closure) CLOSURE(GHCziInternalziConcziIO, ensureIOManagerIsRunning_closure) CLOSURE(GHCziInternalziConcziIO, interruptIOManager_closure) ===================================== rts/include/Stg.h ===================================== @@ -343,9 +343,12 @@ external prototype return neither of these types to workaround #11395. * StgInfoTable, StgClosure and so on. */ #include "stg/MiscClosures.h" +/* And this is included for references to ghc_hs_iface */ +#include "rts/Types.h" +#include "rts/RtsToHsIface.h" #endif -#include "stg/Prim.h" /* ghc-internal fallbacks */ +#include "stg/Prim.h" #include "stg/SMP.h" /* ----------------------------------------------------------------------------- ===================================== rts/include/rts/RtsToHsIface.h ===================================== @@ -6,6 +6,8 @@ * See Note [RTS/ghc-internal interface]. */ +#pragma once + typedef struct { StgClosure *processRemoteCompletion_closure; // GHC.Internal.Event.Windows.processRemoteCompletion_closure StgClosure *runIO_closure; // GHC.Internal.TopHandler.runIO_closure View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/847404cfcfaa2e866f6b9ce97c83035… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/847404cfcfaa2e866f6b9ce97c83035… You're receiving this email because of your account on gitlab.haskell.org.

1 0