- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Polish code in the finder
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 8363b1a8 by Wolfgang Jeltsch at 2026-04-29T16:43:54+03:00 Polish code in the finder - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -77,7 +77,8 @@ import GHC.Driver.Config.Finder import GHC.Types.Unique.Set import qualified Data.List as L(sort) import Data.List.NonEmpty ( NonEmpty (..) ) -import qualified Data.Set as Set +import Data.Set (Set) +import qualified Data.Set as Set (empty, intersection, difference, null, toList) import qualified System.Directory as SD import qualified System.OsPath as OsPath import qualified Data.List.NonEmpty as NE @@ -214,74 +215,104 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit | otherwise -> pprPanic "findImportModule" (ppr mod_name $$ ppr mb_pkg $$ ppr (homeUnitId <$> mb_home_unit) $$ ppr uid $$ ppr (map fst all_opts)) OtherPkg _ -> pkg_import where + + mb_home_unit_id :: Maybe UnitId mb_home_unit_id = homeUnitId <$> mb_home_unit + + all_opts :: [(UnitId, FinderOpts)] all_opts = case mb_home_unit_id of - Nothing -> other_fopts - Just home_unit_id -> (home_unit_id, fopts) : other_fopts + Nothing -> other_fopts + Just home_unit_id -> (home_unit_id, fopts) : other_fopts + home_import :: IO FindResult home_import = case mb_home_unit of - Just home_unit -> findHomeModule fc fopts home_unit mod_name - Nothing -> pure $ NoPackage (panic "findImportedModule: no home-unit") - - + Just home_unit -> findHomeModule fc fopts home_unit mod_name + Nothing -> pure $ + NoPackage (panic "findImportedModule: no home-unit") + + {- + If the module is reexported, then look for it as if it was from the + perspective of that package which reexports it. + -} + home_pkg_import :: (UnitId, FinderOpts) -> IO FindResult home_pkg_import (uid, opts) - -- If the module is reexported, then look for it as if it was from the perspective - -- of that package which reexports it. - | Just real_mod_name <- lookupUniqMap (finder_reexportedModules opts) mod_name = - findImportedModuleNoHsc fc opts ue home_module_name_providers_map (Just $ DefiniteHomeUnit uid Nothing) real_mod_name NoPkgQual - | elementOfUniqSet mod_name (finder_hiddenModules opts) = - return (mkHomeHidden uid) - | otherwise = - findHomePackageModule fc opts uid mod_name - - -- Do not be smart and change this to `foldr orIfNotFound home_import hs` as - -- that is not the same!! home_import is first because we need to look within ourselves - -- first before looking at the packages in order. - any_home_import = foldr1 orIfNotFound (home_import :| map home_pkg_import other_fopts) - - pkg_import = findExposedPackageModule fc fopts units mod_name mb_pkg - - unqual_import = any_home_import - `orIfNotFound` - findExposedPackageModule fc fopts units mod_name NoPkgQual - - units = case mb_home_unit_id of - Nothing -> ue_homeUnitState ue - Just home_unit_id -> HUG.homeUnitEnv_units $ ue_findHomeUnitEnv home_unit_id ue - - hpt_deps :: Set.Set UnitId - hpt_deps = homeUnitDepends units - - sorted_deps = rankedHomeUnits home_module_name_providers_map mod_name hpt_deps - - other_fopts = - [ (uid, initFinderOpts (homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue))) - | uid <- sorted_deps - ] - -rankedHomeUnits :: HomeModuleNameProvidersMap - -> ModuleName - -> Set.Set UnitId - -> [UnitId] -rankedHomeUnits _ _ hpt_deps | Set.null hpt_deps + | Just real_mod_name + <- lookupUniqMap (finder_reexportedModules opts) mod_name + = findImportedModuleNoHsc fc opts ue home_module_name_providers_map + (Just $ DefiniteHomeUnit uid Nothing) + real_mod_name + NoPkgQual + | elementOfUniqSet mod_name (finder_hiddenModules opts) + = return (mkHomeHidden uid) + | otherwise + = findHomePackageModule fc opts uid mod_name + + any_home_import :: IO FindResult + any_home_import = foldr1 orIfNotFound $ + home_import :| map home_pkg_import other_fopts + {- + Do not try to be smart and change this to `foldr orIfNotFound + home_import (map home_pkg_import other_fopts)`, as that would not be the + same. `home_import` is first because we need to first look within the + current unit before looking at the other units in order. + -} + + pkg_import :: IO FindResult + pkg_import = findExposedPackageModule fc fopts unit_state mod_name mb_pkg + + unqual_import :: IO FindResult + unqual_import + = any_home_import + `orIfNotFound` + findExposedPackageModule fc fopts unit_state mod_name NoPkgQual + + unit_state :: UnitState + unit_state = case mb_home_unit_id of + Nothing -> ue_homeUnitState ue + Just home_unit_id -> HUG.homeUnitEnv_units $ + ue_findHomeUnitEnv home_unit_id ue + + home_unit_deps :: Set UnitId + home_unit_deps = homeUnitDepends unit_state + + ranked_home_unit_deps :: [UnitId] + ranked_home_unit_deps = rankedHomeUnitDeps home_module_name_providers_map + mod_name + home_unit_deps + + other_fopts :: [(UnitId, FinderOpts)] + other_fopts + = [ + (uid, opts) | + uid <- ranked_home_unit_deps, + let opts = initFinderOpts $ + homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue) + ] + +rankedHomeUnitDeps :: HomeModuleNameProvidersMap + -> ModuleName + -> Set UnitId + -> [UnitId] +rankedHomeUnitDeps _ _ home_unit_deps | Set.null home_unit_deps = [] -rankedHomeUnits home_module_name_providers_map mod_name hpt_deps +rankedHomeUnitDeps home_module_name_providers_map mod_name home_unit_deps = Set.toList cached_deps ++ Set.toList uncached_deps where - cached_providers :: Set.Set UnitId + cached_providers :: Set UnitId cached_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_deps :: Set.Set UnitId - cached_deps = Set.intersection hpt_deps cached_providers + cached_deps :: Set UnitId + cached_deps = Set.intersection home_unit_deps cached_providers - uncached_deps :: Set.Set UnitId - uncached_deps = Set.difference hpt_deps cached_providers + uncached_deps :: Set UnitId + uncached_deps = Set.difference home_unit_deps cached_providers {- - The special handling of the case that the dependency set is empty does not - change the result, but it avoids triggering evaluation of the module graph. + The special handling of the situation where the dependency set is empty does + not change the result, but it avoids triggering evaluation of the module + graph. -} -- | Locate a plugin module requested by the user, for a compiler View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8363b1a8844ca5bdd07181af8042c4d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8363b1a8844ca5bdd07181af8042c4d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/27162/rts-explicit-dllimport_work] 3 commits: Use __attribute__((dllimport)) for external RTS symbol declarations
by David Eichmann (＠DavidEichmann) 29 Apr '26

29 Apr '26

David Eichmann pushed to branch wip/27162/rts-explicit-dllimport_work at Glasgow Haskell Compiler / GHC Commits: 44097d50 by Duncan Coutts at 2026-04-29T14:19:15+01:00 Use __attribute__((dllimport)) for external RTS symbol declarations This is needed to be hygenic about DLL symbol imports and exports. The attribute is ignored on platforms other than Windows. Use of the attribute however means that external data symbols do not have a compile-time constant address (they are loaded using an indirection). This means we have to adjust the rtsSyms initial linker table so that it is a local constant in a function, rather than a global constant. We now define it within a function that pre-populates the symbol table with the RTS symbols. - - - - - f8e077e5 by Duncan Coutts at 2026-04-29T14:19:15+01:00 Fix the rts linker declarations for a few data symbols and ensure that the (windows only) rts_IOManagerIsWin32Native data symbol is marked as externally visible. - - - - - 4184154d by David Eichmann at 2026-04-29T14:19:15+01:00 Hadrian: Disable runtime pseudo relocations for RTS on windows hosts - - - - - 5 changed files: - hadrian/src/Settings/Packages.hs - rts/IOManager.h - rts/Linker.c - rts/RtsSymbols.c - rts/RtsSymbols.h Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -321,6 +321,7 @@ rtsPackageArgs = package rts ? do , Profiling `wayUnit` way ? arg "-DPROFILING" , Threaded `wayUnit` way ? arg "-DTHREADED_RTS" , notM targetSupportsSMP ? arg "-optc-DNOSMP" + , isWinHost ? arg "-optl-Wl,--disable-runtime-pseudo-reloc" -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs -- ===================================== rts/IOManager.h ===================================== @@ -21,6 +21,15 @@ #include "sm/GC.h" // for evac_fn +#if defined(mingw32_HOST_OS) +/* Global var (only on Windows) that is exported (hence before BeginPrivate.h) + * to be shared with the I/O code in the base library to tell us which style + * of I/O manager we are using: one that uses the Windows native API HANDLEs, + * or one that uses Posix style fds. + */ +extern bool rts_IOManagerIsWin32Native; +#endif + #include "BeginPrivate.h" /* The ./configure gives us a set of CPP flags, one for each named I/O manager: @@ -160,14 +169,6 @@ typedef enum { /* Global var to tell us which I/O manager impl we are using */ extern IOManagerType iomgr_type; -#if defined(mingw32_HOST_OS) -/* Global var (only on Windows) that is exported to be shared with the I/O code - * in the base library to tell us which style of I/O manager we are using: one - * that uses the Windows native API HANDLEs, or one that uses Posix style fds. - */ -extern bool rts_IOManagerIsWin32Native; -#endif - /* The CapIOManager is the per-capability data structure belonging to the I/O * manager. It is defined in full in IOManagerInternals.h. The opaque forward ===================================== rts/Linker.c ===================================== @@ -478,6 +478,7 @@ initLinker_ (int retain_cafs) symhash = allocStrHashTable(); /* populate the symbol table with stuff from the RTS */ + RtsSymbolVal* rtsSyms = initRtsSyms(); IF_DEBUG(linker, debugBelch("populating linker symbol table with built-in RTS symbols\n")); for (const RtsSymbolVal *sym = rtsSyms; sym->lbl != NULL; sym++) { IF_DEBUG(linker, debugBelch("initLinker: inserting rts symbol %s, %p\n", sym->lbl, sym->addr)); @@ -489,6 +490,7 @@ initLinker_ (int retain_cafs) } IF_DEBUG(linker, debugBelch("done with built-in RTS symbols\n")); + /* Add extra symbols. rtsExtraSyms() is a weakly defined symbol in the rts, * that can be overrided by linking in an object with a corresponding * definition later. This is useful to build an external-interpreter or some ===================================== rts/RtsSymbols.c ===================================== @@ -9,6 +9,8 @@ #include "ghcplatform.h" #include "Rts.h" #include "RtsSymbols.h" +#include "LinkerInternals.h" +#include "PathUtils.h" #include "TopHandler.h" #include "HsFFI.h" @@ -51,6 +53,19 @@ extern char **environ; /* ----------------------------------------------------------------------------- * Symbols to be inserted into the RTS symbol table. + * + * Note [Naming Scheme for Symbol Macros] + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * SymI_*: symbol is internal to the RTS. It resides in an object + * file/library that is statically. + * SymE_*: symbol is external to the RTS library. It might be linked + * dynamically. + * + * Sym*_HasProto : the symbol prototype is imported in an include file + * or defined explicitly + * Sym*_NeedsProto: the symbol is undefined and we add a dummy + * default proto extern void sym(void); */ #define Maybe_Stable_Names SymI_HasProto(stg_mkWeakzh) \ @@ -162,7 +177,7 @@ extern char **environ; SymI_HasProto(stg_asyncWritezh) \ SymI_HasProto(stg_asyncDoProczh) \ SymI_HasProto(rts_InstallConsoleEvent) \ - SymI_HasProto(rts_IOManagerIsWin32Native) \ + SymI_HasDataProto(rts_IOManagerIsWin32Native) \ SymI_HasProto(rts_ConsoleHandlerDone) \ SymI_NeedsProto(__mingw_module_is_dll) \ RTS_WIN64_ONLY(SymI_NeedsProto(___chkstk_ms)) \ @@ -913,7 +928,7 @@ extern char **environ; SymI_HasProto(freeExecPage) \ SymI_HasProto(getAllocations) \ SymI_HasProto(revertCAFs) \ - SymI_HasProto(RtsFlags) \ + SymI_HasDataProto(RtsFlags) \ SymI_NeedsDataProto(rts_breakpoint_io_action) \ SymI_NeedsDataProto(rts_stop_next_breakpoint) \ SymI_NeedsDataProto(rts_stop_on_exception) \ @@ -924,9 +939,9 @@ extern char **environ; SymI_NeedsProto(rts_enableStopAfterReturn) \ SymI_NeedsProto(rts_disableStopAfterReturn) \ SymI_HasProto(stopTimer) \ - SymI_HasProto(n_capabilities) \ - SymI_HasProto(max_n_capabilities) \ - SymI_HasProto(enabled_capabilities) \ + SymI_HasDataProto(n_capabilities) \ + SymI_HasDataProto(max_n_capabilities) \ + SymI_HasDataProto(enabled_capabilities) \ SymI_HasDataProto(stg_traceEventzh) \ SymI_HasDataProto(stg_traceMarkerzh) \ SymI_HasDataProto(stg_traceBinaryEventzh) \ @@ -1144,12 +1159,27 @@ extern char **environ; SymI_HasProto(hs_word2float64) -/* entirely bogus claims about types of these symbols */ -#define SymI_NeedsProto(vvv) extern void vvv(void); -#define SymI_NeedsDataProto(vvv) extern StgWord vvv[]; -#define SymE_NeedsProto(vvv) SymI_NeedsProto(vvv); -#define SymE_NeedsDataProto(vvv) SymI_NeedsDataProto(vvv); -#define SymE_HasProto(vvv) SymI_HasProto(vvv); +/* Declare prototypes for the symbols that need it, so we can refer + * to them in the rtsSyms table below. + * + * In particular, for the external ones (SymE_*) we use the dllimport attribute + * to indicate that (on Windows) they come from external DLLs. This attribute + * is ignored on other platforms. + * + * The claims about the types of these symbols are entirely bogus. + */ +#if defined(mingw32_HOST_OS) && defined(DYNAMIC) +#define DLLIMPORT __attribute__((dllimport)) +#else +#define DLLIMPORT /**/ +#endif + +#define SymI_NeedsProto(vvv) extern void vvv(void); +#define SymI_NeedsDataProto(vvv) extern StgWord vvv[]; +#define SymE_NeedsProto(vvv) extern DLLIMPORT void vvv(void); +#define SymE_NeedsDataProto(vvv) extern DLLIMPORT StgWord vvv[]; + +#define SymE_HasProto(vvv) /**/ #define SymI_HasProto(vvv) /**/ #define SymI_HasDataProto(vvv) /**/ #define SymI_HasProto_redirect(vvv,xxx,strength,ty) /**/ @@ -1178,6 +1208,8 @@ RTS_SYMBOLS_PRIM #undef SymE_NeedsProto #undef SymE_NeedsDataProto +/* See Note [Naming Scheme for Symbol Macros] */ + #define SymI_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE }, #define SymI_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ @@ -1198,22 +1230,40 @@ RTS_SYMBOLS_PRIM { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ (void*)(&(xxx)), strength, ty }, -RtsSymbolVal rtsSyms[] = { - RTS_SYMBOLS - RTS_RET_SYMBOLS - RTS_POSIX_ONLY_SYMBOLS - RTS_MINGW_ONLY_SYMBOLS - RTS_DARWIN_ONLY_SYMBOLS - RTS_OPENBSD_ONLY_SYMBOLS - RTS_LIBGCC_SYMBOLS - RTS_ARCH_LIBGCC_SYMBOLS - RTS_FINI_ARRAY_SYMBOLS - RTS_LIBFFI_SYMBOLS - RTS_ARM_OUTLINE_ATOMIC_SYMBOLS - RTS_SYMBOLS_PRIM - SymI_HasDataProto(nonmoving_write_barrier_enabled) - { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE } /* sentinel */ -}; + +static RtsSymbolVal* rtsSyms; + +/* Initialize (if not already initialized) and return an array of symbols with stuff from the RTS. */ +RtsSymbolVal* initRtsSyms(void) { + if(!rtsSyms) { + /* The address of data symbols with the dllimport attribute are not + * compile-time constants and so cannot be used in constant initialisers. + * For this reason, rtsSyms is a local variable within this function + * rather than a global constant (as it was historically). + */ + const RtsSymbolVal localRtsSyms[] = { + RTS_SYMBOLS + RTS_RET_SYMBOLS + RTS_POSIX_ONLY_SYMBOLS + RTS_MINGW_ONLY_SYMBOLS + RTS_DARWIN_ONLY_SYMBOLS + RTS_OPENBSD_ONLY_SYMBOLS + RTS_LIBGCC_SYMBOLS + RTS_ARCH_LIBGCC_SYMBOLS + RTS_FINI_ARRAY_SYMBOLS + RTS_LIBFFI_SYMBOLS + RTS_ARM_OUTLINE_ATOMIC_SYMBOLS + RTS_SYMBOLS_PRIM + SymI_HasDataProto(nonmoving_write_barrier_enabled) + { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE } /* sentinel */ + }; + + rtsSyms = malloc(sizeof(localRtsSyms)); + memcpy(rtsSyms, localRtsSyms, sizeof(localRtsSyms)); + } + + return rtsSyms; +} // Note [Extra RTS symbols] ===================================== rts/RtsSymbols.h ===================================== @@ -46,7 +46,7 @@ typedef struct _RtsSymbolVal { SymType type; } RtsSymbolVal; -extern RtsSymbolVal rtsSyms[]; +extern RtsSymbolVal* initRtsSyms(void); extern RtsSymbolVal* __attribute__((weak)) rtsExtraSyms(void); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1390d42ff29cb369fc327f8afb2663… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1390d42ff29cb369fc327f8afb2663… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26989] 42 commits: NCG: Implement constant folding for vector simd ops (Issue #25030)
by Simon Peyton Jones (＠simonpj) 29 Apr '26

29 Apr '26

Simon Peyton Jones pushed to branch wip/T26989 at Glasgow Haskell Compiler / GHC Commits: 72d6dc74 by aparker at 2026-04-20T20:15:44-04:00 NCG: Implement constant folding for vector simd ops (Issue #25030) - - - - - b9cab907 by sheaf at 2026-04-20T20:15:44-04:00 Mark some SIMD tests as broken on i386 optllvm As seen in #25498, several SIMD tests are broken on i386 in the optllvm way. This commit marks them as "expect_broken". - - - - - 76528cc3 by Wolfgang Jeltsch at 2026-04-20T20:16:25-04:00 Move most of the `System.IO` implementation into `base` This involves a rewrite of the `combine` helper function to avoid the use of `last`, which would now be flagged as an error. Metric Decrease: LinkableUsage01 T3294 Metric Increase: T12227 T12707 T5642 - - - - - 04d143c0 by Luite Stegeman at 2026-04-21T14:05:33-04:00 rts: add a few missing i386 relocations in the rts linker - - - - - 014087e7 by Luite Stegeman at 2026-04-21T14:05:34-04:00 CodeOutput: Fix finalizers on multiple platforms - ELF platforms: emit .fini_array section - wasm32/Darwin: emit initializer with __cxa_atexit call - Windows: use -Wl,--whole-archive to prevent dropping finalizer symbols - rts linker: fix crash/assertion failure unloading objects with finalizers fixes #27072 - - - - - 915bba6f by Simon Jakobi at 2026-04-21T14:06:16-04:00 Add regression test for #10531 Closes #10531. - - - - - 86a646a6 by Andreas Klebinger at 2026-04-22T13:00:05-04:00 Revert use of generic instances for compiler time perf reasons. Revert "Derive Semigroup/Monoid for instances believed could be derived in #25871" This reverts commit 11a04cbb221cc404fe00d65d7c951558ede4caa9. Revert "add Ghc.Data.Pair deriving" This reverts commit 15d9ce449e1be8c01b89fd39bdf1e700ea7d1dce. - - - - - bc9ee1cf by Wen Kokke at 2026-04-22T13:00:51-04:00 hadrian: Fix docs to remove static flavour In 638f6548, the static flavour was turned into into the fully_static flavour transformer. However, this commit did not update flavours.md. - - - - - cc9cc6d5 by Cheng Shao at 2026-04-23T09:40:46+00:00 configure: bump LlvmMaxVersion to 23 This patch bumps `LlvmMaxVersion` to 23 to support LLVM 22.x releases. - - - - - 2ea7ef8e by Cheng Shao at 2026-04-23T09:46:26+00:00 changelog: add llvm 22.x support - - - - - 5574ee10 by Cheng Shao at 2026-04-24T08:24:30-04:00 compiler: avoid unused temporary `appendFS` operands This patch fixes unused temporary `appendFS` operands in the codebase that are retained in the `FastString` table after concatenation. Rewrite rules are added so that if an operand is `fsLit`/`mkFastString`, the `appendFS` application is rewritten to append the `ShortByteString` operands first. The patch also fixes `sconcat` behavior to align with `mconcat` for the same reason. Fixes #27205. - - - - - 4ed78760 by mangoiv at 2026-04-24T08:25:13-04:00 contributing: adjust MR template to be less verbose - MR template only shows text that is relevant for submissiong - MR template was rewritten so it's readable from a user's and reviewer's perspective Resolves #27165 Co-Authored-By: @sheaf - - - - - 87db83e2 by Cheng Shao at 2026-04-24T14:37:21-04:00 ci: bump freebsd boot ghc to 9.10.3 This commit bumps freebsd boot ghc to 9.10.3 to align with other platforms and prevent outdated boot libs in boot ghc to block the freebsd job. - - - - - 17e3a0b7 by Cheng Shao at 2026-04-24T14:37:21-04:00 compiler: improve Binary instance of Array This patch improves the `Binary` instance of `Array`: - We no longer allocate intermediate lists. When serializing an `Array`, we iterate over the elements directly; when deserializing it, we allocate the result `Array` and fill it in a loop. - Now we only serialize the array bounds tuple; the length field is not needed. Closes #27109. - - - - - 2d30f7d3 by sheaf at 2026-04-24T14:38:23-04:00 Vendor mini-QuickCheck for testsuite This commit extracts the vendored QuickCheck implementation from the foundation testsuite to make it more broadly available in the GHC testsuite, and makes use of it in the simd006 test (which also used a vendored QuickCheck implementation). On the way, we update the linear congruential generator to avoid the shortcoming of only generating 31 bit large numbers. Fixes #25990 and #25969. - - - - - 1350271b by sheaf at 2026-04-27T09:32:53-04:00 Ensure TcM plugins are only initialised once This commit ensures we keep TcM plugins (typechecker plugins, defaulting plugins and hole fit plugins) running all the way through desugaring, instead of stopping them at the end of typechecking. To do this, the "stop" actions of TcPlugin and DefaultingPlugin are split into two: one for the "post-typecheck" action, and one for the final shutdown action (after desugaring). This allows the plugins to be invoked by the pattern match checker (during desugaring) without having to be repeatedly re-initialised and stopped, fixing #26839. In the process, this commit modifies 'initTc' and 'initTcInteractive', adding an extra argument that describes whether to start/stop the 'TcM' plugins. See Note [Stop TcM plugins after desugaring] for an overview. - - - - - 42549222 by sheaf at 2026-04-27T09:33:50-04:00 Hadrian: add --keep-response-files This commit adds a Hadrian flag that allows response files to be retained. This is useful for debugging a failing Hadrian command line. - - - - - 40564e8d by sheaf at 2026-04-27T09:34:46-04:00 hadrian/build-cabal.bat: fix build on Windows Commit 8cb99552f6 introduced a warning for a missing package index. However, the logic was faulty on Windows: the piping was broken, and "remote-repo-cache:" was being interpreted as a (malformed) drive letter, leading to the error: The filename, directory name, or volume label syntax is incorrect. This commit fixes that by using a temporary file instead of piping. - - - - - 14bc71e4 by Sven Tennie at 2026-04-28T13:22:47-04:00 ghc: Distinguish between having an interpreter and having an internal one Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter Splitting the logic solves compiler warnings and expresses the intent better. - - - - - df691563 by Vladislav Zavialov at 2026-04-28T13:23:29-04:00 Refactor HsWildCardTy to use HoleKind (#27111) The payload of this patch is that the extension fields of HsWildCardTy and HsHole now match: type instance XWildCardTy Ghc{Ps,Rn} = HoleKind type instance XHole Ghc{Ps,Rn} = HoleKind This is progress towards unification of HsExpr and HsType. Test case: T25121_status In addition to that, exact-printing of infix holes is fixed. Test case: PprInfixHole - - - - - f3485446 by fendor at 2026-04-28T13:24:12-04:00 Expose startupHpc as an rts symbol - - - - - 28f07d70 by fendor at 2026-04-28T13:24:12-04:00 Make HPC work with bytecode interpreter Add support to generate .tix files from bytecode objects and the bytecode interpreter. Conceptually, we insert HPC ticks into the bytecode similar to how we insert breakpoints. HPC and breakpoints do not share the same tick array but we use a separate tick-array for hpc/breakpoint ticks during bytecode generation. We teach the bytecode interpreter to handle hpc ticks. The implementation is quite trivial, simply increment the counter in the global hpc_ticks array for the respective module. This hpc_ticks array is generated as part of the `CStub`, so we can rely on it existing. A tricky bit is "registering" a bytecode object for HPC instrumentation. In the compiled case, this is achieved via CStub and initializer/finalizers `.init` sections which are called when the executable is run. After the initializers have been invoked, which is before `hs_init_ghc`, we then call `startup_hpc` in `hs_init_ghc` iff any modules were "registered" for hpc instrumentation via `hs_hpc_module`. Since bytecode objects are loaded after starting up GHCi, this workflow doesn't work for supporting `hpc` and the `hpc` run-time is never started, even if a module is added for instrumentation. We fix this issue by employing the same technique as is for `SptEntry`s: * We introduce a new field to `CompiledByteCode`, called `ByteCodeHpcInfo` which contains enough information to call `hs_hpc_module`, allowing us to register the module for `hpc` instrumentation`. * After registering the module, we unconditionally call `startupHpc`, to make sure the .tix file is written. Calling `startupHpc` multiple times is safe. Calling `hs_hpc_module` multiple times for the same module is also safe. If we didn't register the hpc module in this way, evaluating a bytecode object instrumented with `-fhpc` without registering it in the `hpc` run-time will simply not generate any `.tix` files for this bytecode object. However, this shouldn't happen if everything is set up correctly. Closes #27036 - - - - - 950879f0 by Vladislav Zavialov at 2026-04-28T13:24:55-04:00 Move NamespaceSpecifier from x-fields into the AST proper (#26678) This refactoring moves NamespaceSpecifier out of extension fields and into the AST proper, as it is part of the user-written source, and is not pass-specific. Summary of changes: * Move NamespaceSpecifier from GHC/Hs/Basic.hs to Language/Haskell/Syntax/ImpExp.hs and parameterise it by the compiler pass, creating the necessary extension points * Move NamespaceSpecifier out of XFixitySig into FixitySig * Move NamespaceSpecifier out of XIEThingAll (IEThingAllExt) into IEThingAll * Move NamespaceSpecifier out of XIEWholeNamespace (IEWholeNamespaceExt) into IEWholeNamespace This is a pure refactoring with no change in behaviour. - - - - - 9797052b by Simon Peyton Jones at 2026-04-28T13:25:37-04:00 Fix assertion check in checkResultTy As #27210 shows, the assertion was a little bit too eager. I refactored a bit by moving some code from GHC.Tc.Gen.App to GHC.Tc.Utils.Unify; see the new function tcSubTypeApp, which replaces tcSubTypeDS - - - - - d5bb0a03 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Improve knownCon Eliminate simplInVar Just a refactoring to simplify the code - - - - - cbcbdca0 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Wibbles [skip ci] - - - - - f9d74d99 by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Getting there [skip ci] - - - - - 381a7f8d by Simon Peyton Jones at 2026-04-29T13:18:08+01:00 Wibbles [skip ci] - - - - - 6c8e22c7 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More wibbles This now works - - - - - 40ff4c18 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibble - - - - - 6cd07658 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles Better management of casts - - - - - 63512d20 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 25493b85 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More small wibbles The important change here is in preInlineUnconditionally - - - - - 86ab76e8 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibble [skip ci] - - - - - e0def67f by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 wibbles - - - - - fccbe00a by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Refactor the Simplifier's handling of DupFlag ...and how it deals with re-simplification of argumnets - - - - - 88c503fe by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Update stderr tests ...mainly as a result of printing names for dead lambda binders (A debug-output change only.) - - - - - c71e3891 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Add MOutCoercion to ApplyToVal Nicer... but lets see what CI says - - - - - 4429fa64 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 1625b330 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Do not use mkCast during typechecking This commit fixes #27219. The problem was that the typechecker was using `mkCast`, whose assertion checks legitimately fail when applied to types that contain unification variables. - - - - - 4832bba6 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 More improvements * pushCoValArg and pushCoTyArg return tyL, which is helpful for the caller * Don't optimise coercions if the type-substitution is empty. See Note [Optimising coercions] - - - - - f95593f6 by Simon Peyton Jones at 2026-04-29T13:18:09+01:00 Wibbles - - - - - 289 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/merge_request_templates/Default.md - + changelog.d/T19174.md - + changelog.d/binary-array-no-list - + changelog.d/bytecode-interpreter-hpc-support - + changelog.d/fix-finalizers-27072 - + changelog.d/ghc-api-holes-ast-27111 - + changelog.d/ghc-api-namespace-specifier-26678 - + changelog.d/hadrian-response-files.md - + changelog.d/llvm-22 - + changelog.d/simd_constant_folding - + changelog.d/tcplugin_init.md - + changelog.d/tcplugins-pmc.md - + changelog.d/typecheckModule-API.md - + changelog.d/withTcPlugins.md - compiler/GHC.hs - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Binary.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Cmm/Opt.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Data/FastString.hs - compiler/GHC/Data/Pair.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Config/Core/Lint.hs - compiler/GHC/Driver/Env/Types.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Pipeline/Monad.hs - compiler/GHC/Driver/Pipeline/Phases.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Basic.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Coverage.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/HsToCore/Types.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Linker/Executable.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Interpreter.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/Tc/Errors/Hole.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Rewrite.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Utils/Backpack.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/ForeignStubs.hs - compiler/GHC/Types/HpcInfo.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/Unique/DSet.hs - compiler/GHC/Unit/Module/ModGuts.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Misc.hs - compiler/GHC/Utils/Ppr/Colour.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - configure.ac - docs/users_guide/extending_ghc.rst - ghc/GHC/Driver/Session/Mode.hs - ghc/GHCi/UI.hs - ghc/GHCi/UI/Info.hs - ghc/Main.hs - ghc/ghc-bin.cabal.in - hadrian/build-cabal.bat - hadrian/doc/flavours.md - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Settings/Packages.hs - libraries/base/src/Control/Concurrent.hs - libraries/base/src/GHC/IO/Handle.hs - libraries/base/src/Prelude.hs - libraries/base/src/System/IO.hs - libraries/base/src/Text/Printf.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - + libraries/ghci/GHCi/Coverage.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/Run.hs - libraries/ghci/ghci.cabal.in - rts/Disassembler.c - rts/Hpc.c - rts/Interpreter.c - rts/Linker.c - rts/LinkerInternals.h - rts/RtsSymbols.c - rts/include/rts/Bytecodes.h - rts/linker/Elf.c - testsuite/driver/testlib.py - + testsuite/tests/MiniQuickCheck.hs - testsuite/tests/codeGen/should_compile/T25177.stderr - + testsuite/tests/codeGen/should_run/T27072d.hs - + testsuite/tests/codeGen/should_run/T27072d.stdout - + testsuite/tests/codeGen/should_run/T27072d_c.c - + testsuite/tests/codeGen/should_run/T27072d_check.c - + testsuite/tests/codeGen/should_run/T27072w.hs - + testsuite/tests/codeGen/should_run/T27072w.stdout - + testsuite/tests/codeGen/should_run/T27072w_c.c - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/deSugar/should_compile/T13208.stdout - + testsuite/tests/driver/T10531/A.hs - + testsuite/tests/driver/T10531/B.hs - + testsuite/tests/driver/T10531/C.hs - + testsuite/tests/driver/T10531/Makefile - + testsuite/tests/driver/T10531/all.T - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/ghc-api/T26910.hs - testsuite/tests/ghc-api/T6145.hs - testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/hpc/Makefile - testsuite/tests/hpc/T17073.stdout → testsuite/tests/hpc/T17073a.stdout - + testsuite/tests/hpc/T17073b.stdout - testsuite/tests/hpc/T20568.stdout → testsuite/tests/hpc/T20568a.stdout - + testsuite/tests/hpc/T20568b.stdout - testsuite/tests/hpc/all.T - testsuite/tests/hpc/fork/Makefile - testsuite/tests/hpc/function/Makefile - testsuite/tests/hpc/function/test.T - + testsuite/tests/hpc/function/tough1.stderr - + testsuite/tests/hpc/function/tough1.stdout - testsuite/tests/hpc/function2/test.T - + testsuite/tests/hpc/function2/tough3.script - + testsuite/tests/hpc/ghc_ghci/BytecodeMain.hs - testsuite/tests/hpc/ghc_ghci/Makefile - + testsuite/tests/hpc/ghc_ghci/hpc_ghc_ghci_bytecode.stdout - + testsuite/tests/hpc/ghc_ghci/hpc_ghci01.stdout - + testsuite/tests/hpc/ghc_ghci/hpc_ghci02.stdout - testsuite/tests/hpc/ghc_ghci/test.T - testsuite/tests/hpc/simple/Makefile - + testsuite/tests/hpc/simple/hpc002.hs - + testsuite/tests/hpc/simple/hpc002.stdout - + testsuite/tests/hpc/simple/hpc003.hs - + testsuite/tests/hpc/simple/hpc003.script - + testsuite/tests/hpc/simple/hpc003.stdout - testsuite/tests/hpc/simple/test.T - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/numeric/should_compile/T15547.stderr - testsuite/tests/numeric/should_compile/T20347.stderr - testsuite/tests/numeric/should_compile/T20374.stderr - testsuite/tests/numeric/should_compile/T20376.stderr - testsuite/tests/numeric/should_run/all.T - testsuite/tests/numeric/should_run/foundation.hs - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/plugins/defaulting-plugin/DefaultInterference.hs - testsuite/tests/plugins/defaulting-plugin/DefaultInvalid.hs - testsuite/tests/plugins/defaulting-plugin/DefaultLifted.hs - testsuite/tests/plugins/defaulting-plugin/DefaultMultiParam.hs - testsuite/tests/plugins/echo-plugin/Echo.hs - testsuite/tests/printer/Makefile - + testsuite/tests/printer/PprInfixHole.hs - testsuite/tests/printer/T18052a.stderr - testsuite/tests/printer/all.T - testsuite/tests/quasiquotation/T7918.hs - + testsuite/tests/rts/linker/T27072/Lib.c - + testsuite/tests/rts/linker/T27072/Makefile - + testsuite/tests/rts/linker/T27072/T27072.stdout - + testsuite/tests/rts/linker/T27072/all.T - + testsuite/tests/rts/linker/T27072/main.c - + testsuite/tests/simd/should_run/Makefile - + testsuite/tests/simd/should_run/T25030.hs - + testsuite/tests/simd/should_run/T25030.stdout - testsuite/tests/simd/should_run/all.T - testsuite/tests/simd/should_run/simd006.hs - testsuite/tests/simplCore/should_compile/DsSpecPragmas.stderr - testsuite/tests/simplCore/should_compile/RewriteHigherOrderPatterns.stderr - testsuite/tests/simplCore/should_compile/T18668.stderr - testsuite/tests/simplCore/should_compile/T19246.stderr - testsuite/tests/simplCore/should_compile/T19599.stderr - testsuite/tests/simplCore/should_compile/T19599a.stderr - testsuite/tests/simplCore/should_compile/T21917.stderr - testsuite/tests/simplCore/should_compile/T23074.stderr - testsuite/tests/simplCore/should_compile/T25160.stderr - testsuite/tests/simplCore/should_compile/T25718c.stderr-ws-64 - testsuite/tests/simplCore/should_compile/T26051.stderr - testsuite/tests/simplCore/should_compile/T26116.stderr - testsuite/tests/simplCore/should_compile/T8331.stderr - testsuite/tests/simplCore/should_compile/T8848a.stderr - testsuite/tests/tcplugins/Common.hs - testsuite/tests/tcplugins/RewritePerfPlugin.hs - testsuite/tests/tcplugins/T11462_Plugin.hs - testsuite/tests/tcplugins/T11525_Plugin.hs - testsuite/tests/tcplugins/T26395_Plugin.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.script - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.stderr - + testsuite/tests/tcplugins/TcPlugin_InitStop_Ghci.stdout - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.hs-boot - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode.stderr - + testsuite/tests/tcplugins/TcPlugin_InitStop_NoCode_aux.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Warn.hs - + testsuite/tests/tcplugins/TcPlugin_InitStop_Warn.stderr - testsuite/tests/tcplugins/all.T - + testsuite/tests/tcplugins/tc-plugin-initstop/Makefile - + testsuite/tests/tcplugins/tc-plugin-initstop/Setup.hs - + testsuite/tests/tcplugins/tc-plugin-initstop/TcPlugin_InitStop_Plugin.hs - + testsuite/tests/tcplugins/tc-plugin-initstop/tc-plugin-initstop.cabal - testsuite/tests/th/all.T - testsuite/tests/typecheck/should_compile/T13032.stderr - testsuite/tests/typecheck/should_compile/T9497a.stderr - testsuite/tests/typecheck/should_compile/holes.stderr - testsuite/tests/typecheck/should_compile/holes3.stderr - testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr - + testsuite/tests/typecheck/should_fail/T27210.hs - + testsuite/tests/typecheck/should_fail/T27210.stderr - testsuite/tests/typecheck/should_fail/T9497d.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_run/T9497a-run.stderr - testsuite/tests/typecheck/should_run/T9497b-run.stderr - testsuite/tests/typecheck/should_run/T9497c-run.stderr - testsuite/tests/wasm/should_run/control-flow/LoadCmmGroup.hs - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug973.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/DefaultSignatures.html - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/PatternSyns.html - utils/haddock/html-test/ref/PatternSyns2.html - utils/haddock/html-test/ref/QuasiExpr.html - utils/haddock/html-test/ref/Test.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bd1503ad5f3a70b0543be3c2ab9415… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bd1503ad5f3a70b0543be3c2ab9415… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] 2 commits: Polish the code for home module ranking
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 6ab43ba8 by Wolfgang Jeltsch at 2026-04-29T14:52:41+03:00 Polish the code for home module ranking - - - - - 46de7d57 by Wolfgang Jeltsch at 2026-04-29T14:52:52+03:00 Make the `mg_home_module_name_providers_map` field lazy - - - - - 2 changed files: - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Module/Graph.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -252,25 +252,37 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit hpt_deps :: Set.Set UnitId hpt_deps = homeUnitDepends units - sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps + sorted_deps = rankedHomeUnits home_module_name_providers_map mod_name hpt_deps other_fopts = [ (uid, initFinderOpts (homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue))) | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] +rankedHomeUnits :: HomeModuleNameProvidersMap + -> ModuleName + -> Set.Set UnitId + -> [UnitId] +rankedHomeUnits _ _ hpt_deps | Set.null hpt_deps + = [] +rankedHomeUnits home_module_name_providers_map mod_name hpt_deps + = Set.toList cached_deps ++ Set.toList uncached_deps + where + + cached_providers :: Set.Set UnitId + cached_providers = lookupWithDefaultUniqMap home_module_name_providers_map + Set.empty + mod_name + + cached_deps :: Set.Set UnitId + cached_deps = Set.intersection hpt_deps cached_providers + + uncached_deps :: Set.Set UnitId + uncached_deps = Set.difference hpt_deps cached_providers {- - With the above shortcut, evaluation of the module graph will not be - triggered. + The special handling of the case that the dependency set is empty does not + change the result, but it avoids triggering evaluation of the module graph. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = - let - cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) - uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as ===================================== compiler/GHC/Unit/Module/Graph.hs ===================================== @@ -206,7 +206,7 @@ data ModuleGraph = ModuleGraph -- Cached computation, whether any of the ModuleGraphNode are isHoleModule, -- This is only used for a hack in GHC.Iface.Load to do with backpack, please -- remove this at the earliest opportunity. - , mg_home_module_name_providers_map :: !HomeModuleNameProvidersMap + , mg_home_module_name_providers_map :: HomeModuleNameProvidersMap -- ^ For each module name, which home units provide it. } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54eb5564af32c490e9493d966c67be… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54eb5564af32c490e9493d966c67be… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/T27202
by Hannes Siebenhandl (＠fendor) 29 Apr '26

29 Apr '26

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

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Polish the code for home module ranking
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 54eb5564 by Wolfgang Jeltsch at 2026-04-29T13:56:48+03:00 Polish the code for home module ranking - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -259,18 +259,30 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] +rankedHomeUnits :: HomeModuleNameProvidersMap + -> ModuleName + -> Set.Set UnitId + -> [UnitId] +rankedHomeUnits _ _ hpt_deps | Set.null hpt_deps + = [] +rankedHomeUnits home_module_name_providers_map mod_name hpt_deps + = Set.toList cached_deps ++ Set.toList uncached_deps + where + + cached_providers :: Set.Set UnitID + cached_providers = lookupWithDefaultUniqMap home_module_name_providers_map + Set.empty + mod_name + + cached_deps :: Set.Set UnitID + cached_deps = Set.intersection hpt_deps cached_providers + + uncached_deps :: Set.Set UnitID + uncached_deps = Set.difference hpt_deps cached_providers {- - With the above shortcut, evaluation of the module graph will not be - triggered. + The special handling of the case that the dependency set is empty does not + change the result, but it avoids triggering evaluation of the module graph. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = - let - cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) - uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54eb5564af32c490e9493d966c67be0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54eb5564af32c490e9493d966c67be0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Remove the sorted-dependencies `assertPpr`
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 36e0da1f by Wolfgang Jeltsch at 2026-04-29T13:17:06+03:00 Remove the sorted-dependencies `assertPpr` After the recent code simplifications, the assertion is now obviously true. - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -270,16 +270,7 @@ sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - - all_deps = cached_providing_deps ++ uncached_providing_deps - in - assertPpr - (hpt_deps == Set.fromList all_deps) - ( text "Sorting must not remove HomeUnits" - $$ text "Module:" <+> ppr mod_name - $$ text "Original:" <+> ppr hpt_deps - $$ text "Sorted: " <+> ppr (Set.fromList all_deps)) - all_deps + in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/36e0da1fb67cae7f0902a8a35d19317… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/36e0da1fb67cae7f0902a8a35d19317… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Remove the sorted-dependencies `assertPpr`
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 47572cf0 by Wolfgang Jeltsch at 2026-04-29T13:14:14+03:00 Remove the sorted-dependencies `assertPpr` The assertion is now obviously true. - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -270,16 +270,7 @@ sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) - - all_deps = cached_providing_deps ++ uncached_providing_deps - in - assertPpr - (hpt_deps == Set.fromList all_deps) - ( text "Sorting must not remove HomeUnits" - $$ text "Module:" <+> ppr mod_name - $$ text "Original:" <+> ppr hpt_deps - $$ text "Sorted: " <+> ppr (Set.fromList all_deps)) - all_deps + in cached_providing_deps ++ uncached_providing_deps -- | Locate a plugin module requested by the user, for a compiler -- plugin. This consults the same set of exposed packages as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47572cf0fb890fc8d830342c442a1d0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47572cf0fb890fc8d830342c442a1d0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/more-efficient-home-unit-imports-finding] Drop the removal of any home unit from the dependencies
by Wolfgang Jeltsch (＠jeltsch) 29 Apr '26

29 Apr '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/more-efficient-home-unit-imports-finding at Glasgow Haskell Compiler / GHC Commits: 24433502 by Wolfgang Jeltsch at 2026-04-29T13:07:28+03:00 Drop the removal of any home unit from the dependencies - - - - - 1 changed file: - compiler/GHC/Unit/Finder.hs Changes: ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -252,32 +252,26 @@ findImportedModuleNoHsc fc fopts ue home_module_name_providers_map mb_home_unit hpt_deps :: Set.Set UnitId hpt_deps = homeUnitDepends units - sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mb_home_unit_id mod_name hpt_deps + sorted_deps = sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps other_fopts = [ (uid, initFinderOpts (homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue))) | uid <- sorted_deps ] -sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> Maybe UnitId -> ModuleName -> Set.Set UnitId -> [UnitId] -sortHomeUnitsByLikelihoodFor _ _ _ hpt_deps | Set.null hpt_deps = [] +sortHomeUnitsByLikelihoodFor :: HomeModuleNameProvidersMap -> ModuleName -> Set.Set UnitId -> [UnitId] +sortHomeUnitsByLikelihoodFor _ _ hpt_deps | Set.null hpt_deps = [] {- With the above shortcut, evaluation of the module graph will not be triggered. -} -sortHomeUnitsByLikelihoodFor home_module_name_providers_map mb_home_unit_id mod_name hpt_deps = +sortHomeUnitsByLikelihoodFor home_module_name_providers_map mod_name hpt_deps = let cached_module_providers = lookupWithDefaultUniqMap home_module_name_providers_map Set.empty mod_name - cached_providing_deps = Set.intersection cached_module_providers hpt_deps - other_cached_providing_deps = - Set.toList $ - maybe cached_providing_deps (\u -> Set.delete u cached_providing_deps) mb_home_unit_id - uncached_providing_deps = - let candidates = Set.difference hpt_deps cached_module_providers - excluded = maybe Set.empty Set.singleton mb_home_unit_id - in Set.toList (Set.difference candidates excluded) - - all_deps = other_cached_providing_deps ++ uncached_providing_deps + cached_providing_deps = Set.toList (Set.intersection hpt_deps cached_module_providers) + uncached_providing_deps = Set.toList (Set.difference hpt_deps cached_module_providers) + + all_deps = cached_providing_deps ++ uncached_providing_deps in assertPpr (hpt_deps == Set.fromList all_deps) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/244335024d8774223e57bb857567fb7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/244335024d8774223e57bb857567fb7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-dlls-experimental] Only build the ghc lib the dynamic way if supported
by Duncan Coutts (＠dcoutts) 29 Apr '26

29 Apr '26

Duncan Coutts pushed to branch wip/dcoutts/windows-dlls-experimental at Glasgow Haskell Compiler / GHC Commits: 276642f7 by Duncan Coutts at 2026-04-29T10:28:59+01:00 Only build the ghc lib the dynamic way if supported It is not supported on Windows, yet. The problem is that we hit the 64k limit on the number of exported symbols for a single dll. We delegate to the defaultDynamicGhcPrograms predicate to decide if it is supported. - - - - - 2 changed files: - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs Changes: ===================================== hadrian/src/Packages.hs ===================================== @@ -13,6 +13,7 @@ module Packages ( transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, + ghcApiPackages, isGhcApiPackage, -- * Package information crossPrefix, programName, nonHsMainPackage, programPath, timeoutPath, @@ -49,6 +50,16 @@ ghcPackages = isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) +-- | This package list contains the ghc api package (called 'compiler' here), +-- and all the libraries (not programs) that depend on the ghc api package. +-- This is used to special-case things for the ghc api package and its deps. +-- +ghcApiPackages :: [Package] +ghcApiPackages = [compiler, haddockApi] + +isGhcApiPackage :: Package -> Bool +isGhcApiPackage = (`elem` ghcApiPackages) + -- | Package definitions, see 'Package'. array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -226,6 +226,7 @@ defaultLibraryWays = do [ pure [vanilla] , notStage0 ? pure [profiling] , notStage0 ? platformSupportsSharedLibs + ? onlyDynGhcLibIfSupported ? pure [dynamic, profilingDynamic] ] @@ -233,6 +234,16 @@ defaultLibraryWays = do else do stage <- getStage Set.singleton <$> expr (programWay stage pkg) +-- | Only build the ghc library (and libs that depend on it) the dynamic way, +-- if the platform supports it. +-- +onlyDynGhcLibIfSupported :: Predicate +onlyDynGhcLibIfSupported = do + pkg <- getPackage + if isGhcApiPackage pkg + then expr defaultDynamicGhcPrograms + else pure True + -- | Default build ways for the RTS. defaultRtsWays :: Ways defaultRtsWays = Set.fromList <$> @@ -323,7 +334,7 @@ defaultDynamicGhcPrograms = do supportsShared <- platformSupportsSharedLibs winTarget <- isWinTarget -- For now, don't build dynamic ghc on windows because we hit dll - -- symbol limits for the ghc library. + -- symbol limits for the ghc library. See issue #27162. return (supportsShared && not winTarget) -- | All 'Builder'-dependent command line arguments. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/276642f7382f269346d8a22e6c21e59… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/276642f7382f269346d8a22e6c21e59… You're receiving this email because of your account on gitlab.haskell.org.

1 0