- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 7 commits: Don't prematurely final-zonk PatSyn declarations
by Marge Bot (＠marge-bot) 18 Oct '25

18 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: c85c845d by sheaf at 2025-10-17T22:35:32-04:00 Don't prematurely final-zonk PatSyn declarations This commit makes GHC hold off on the final zonk for pattern synonym declarations, in 'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. This accommodates the fact that pattern synonym declarations without a type signature can contain unfilled metavariables, e.g. if the RHS of the pattern synonym involves view-patterns whose type mentions promoted (level 0) metavariables. Just like we do for ordinary function bindings, we should allow these metavariables to be settled later, instead of eagerly performing a final zonk-to-type. Now, the final zonking-to-type for pattern synonyms is performed in GHC.Tc.Module.zonkTcGblEnv. Fixes #26465 - - - - - 6daf7dbd by Rodrigo Mesquita at 2025-10-18T06:46:40-04: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 - - - - - 1a77881c by Ben Gamari at 2025-10-18T06:46:40-04: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> Co-authored-by: Cheng Shao <terrorjack(a)type.dance> - - - - - 600b2f57 by Ben Gamari at 2025-10-18T06:46:40-04:00 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. - - - - - 1af0caf6 by Ben Gamari at 2025-10-18T06:46:40-04:00 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. - - - - - 25e00507 by Ben Gamari at 2025-10-18T06:46:40-04:00 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. - - - - - 87846a20 by Diego Antonio Rosario Palomino at 2025-10-18T06:46:46-04:00 Cmm Parser: Fix incorrect example in comment The Parser.y file contains a comment with an incorrect example of textual Cmm (used in .cmm files). This commit updates the comment to ensure it reflects valid textual Cmm syntax. Fixes #26313 - - - - - 69 changed files: - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToC.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/PatSyn.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/Language/Haskell/Syntax/Binds.hs - 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/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/Types.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/wasm/JSFFI.c - rts/wasm/scheduler.cmm - rts/win32/libHSghc-internal.def - + testsuite/tests/patsyn/should_compile/T26465b.hs - + testsuite/tests/patsyn/should_compile/T26465c.hs - + testsuite/tests/patsyn/should_compile/T26465d.hs - + testsuite/tests/patsyn/should_compile/T26465d.stderr - testsuite/tests/patsyn/should_compile/all.T - + testsuite/tests/patsyn/should_fail/T26465.hs - + testsuite/tests/patsyn/should_fail/T26465.stderr - testsuite/tests/patsyn/should_fail/all.T - testsuite/tests/th/T8761.stderr - utils/deriveConstants/Main.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8bc5f2e923871e97f9fe63751b3da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a8bc5f2e923871e97f9fe63751b3da… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Don't prematurely final-zonk PatSyn declarations
by Marge Bot (＠marge-bot) 18 Oct '25

18 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: c85c845d by sheaf at 2025-10-17T22:35:32-04:00 Don't prematurely final-zonk PatSyn declarations This commit makes GHC hold off on the final zonk for pattern synonym declarations, in 'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. This accommodates the fact that pattern synonym declarations without a type signature can contain unfilled metavariables, e.g. if the RHS of the pattern synonym involves view-patterns whose type mentions promoted (level 0) metavariables. Just like we do for ordinary function bindings, we should allow these metavariables to be settled later, instead of eagerly performing a final zonk-to-type. Now, the final zonking-to-type for pattern synonyms is performed in GHC.Tc.Module.zonkTcGblEnv. Fixes #26465 - - - - - 16 changed files: - compiler/GHC/Core/Make.hs - compiler/GHC/Core/PatSyn.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/Language/Haskell/Syntax/Binds.hs - + testsuite/tests/patsyn/should_compile/T26465b.hs - + testsuite/tests/patsyn/should_compile/T26465c.hs - + testsuite/tests/patsyn/should_compile/T26465d.hs - + testsuite/tests/patsyn/should_compile/T26465d.stderr - testsuite/tests/patsyn/should_compile/all.T - + testsuite/tests/patsyn/should_fail/T26465.hs - + testsuite/tests/patsyn/should_fail/T26465.stderr - testsuite/tests/patsyn/should_fail/all.T - testsuite/tests/th/T8761.stderr Changes: ===================================== compiler/GHC/Core/Make.hs ===================================== @@ -111,7 +111,7 @@ sortQuantVars vs = sorted_tcvs ++ ids -- | Bind a binding group over an expression, using a @let@ or @case@ as -- appropriate (see "GHC.Core#let_can_float_invariant") -mkCoreLet :: CoreBind -> CoreExpr -> CoreExpr +mkCoreLet :: HasDebugCallStack => CoreBind -> CoreExpr -> CoreExpr mkCoreLet (NonRec bndr rhs) body -- See Note [Core let-can-float invariant] = bindNonRec bndr rhs body mkCoreLet bind body @@ -133,7 +133,7 @@ mkCoreTyLams binders body = mkCast lam co -- | Bind a list of binding groups over an expression. The leftmost binding -- group becomes the outermost group in the resulting expression -mkCoreLets :: [CoreBind] -> CoreExpr -> CoreExpr +mkCoreLets :: HasDebugCallStack => [CoreBind] -> CoreExpr -> CoreExpr mkCoreLets binds body = foldr mkCoreLet body binds -- | Construct an expression which represents the application of a number of ===================================== compiler/GHC/Core/PatSyn.hs ===================================== @@ -9,7 +9,7 @@ module GHC.Core.PatSyn ( -- * Main data types - PatSyn, PatSynMatcher, PatSynBuilder, mkPatSyn, + PatSyn(..), PatSynMatcher, PatSynBuilder, mkPatSyn, -- ** Type deconstruction patSynName, patSynArity, patSynVisArity, ===================================== compiler/GHC/HsToCore/Utils.hs ===================================== @@ -259,12 +259,12 @@ wrapBind new old body -- NB: this function must deal with term seqVar :: Var -> CoreExpr -> CoreExpr seqVar var body = mkDefaultCase (Var var) var body -mkCoLetMatchResult :: CoreBind -> MatchResult CoreExpr -> MatchResult CoreExpr +mkCoLetMatchResult :: HasDebugCallStack => CoreBind -> MatchResult CoreExpr -> MatchResult CoreExpr mkCoLetMatchResult bind = fmap (mkCoreLet bind) -- (mkViewMatchResult var' viewExpr mr) makes the expression -- let var' = viewExpr in mr -mkViewMatchResult :: Id -> CoreExpr -> MatchResult CoreExpr -> MatchResult CoreExpr +mkViewMatchResult :: HasDebugCallStack => Id -> CoreExpr -> MatchResult CoreExpr -> MatchResult CoreExpr mkViewMatchResult var' viewExpr = fmap $ mkCoreLet $ NonRec var' viewExpr mkEvalMatchResult :: Id -> Type -> MatchResult CoreExpr -> MatchResult CoreExpr ===================================== compiler/GHC/Tc/Module.hs ===================================== @@ -579,7 +579,7 @@ tcRnSrcDecls explicit_mod_hdr export_ies decls -- Zonk the final code. This must be done last. -- Even simplifyTop may do some unification. -- This pass also warns about missing type signatures - ; (id_env, ev_binds', binds', fords', imp_specs', rules') + ; (id_env, ev_binds', binds', fords', imp_specs', rules', pat_syns') <- zonkTcGblEnv new_ev_binds tcg_env --------- Run finalizers -------------- @@ -597,6 +597,7 @@ tcRnSrcDecls explicit_mod_hdr export_ies decls , tcg_imp_specs = [] , tcg_rules = [] , tcg_fords = [] + , tcg_patsyns = [] , tcg_type_env = tcg_type_env tcg_env `plusTypeEnv` id_env } ; (tcg_env, tcl_env) <- setGblEnv init_tcg_env @@ -628,7 +629,7 @@ tcRnSrcDecls explicit_mod_hdr export_ies decls -- Zonk the new bindings arising from running the finalisers, -- and main. This won't give rise to any more finalisers as you -- can't nest finalisers inside finalisers. - ; (id_env_mf, ev_binds_mf, binds_mf, fords_mf, imp_specs_mf, rules_mf) + ; (id_env_mf, ev_binds_mf, binds_mf, fords_mf, imp_specs_mf, rules_mf, patsyns_mf) <- zonkTcGblEnv main_ev_binds tcg_env ; let { !final_type_env = tcg_type_env tcg_env @@ -642,24 +643,26 @@ tcRnSrcDecls explicit_mod_hdr export_ies decls , tcg_ev_binds = ev_binds' `unionBags` ev_binds_mf , tcg_imp_specs = imp_specs' ++ imp_specs_mf , tcg_rules = rules' ++ rules_mf - , tcg_fords = fords' ++ fords_mf } } ; + , tcg_fords = fords' ++ fords_mf + , tcg_patsyns = pat_syns' ++ patsyns_mf } } ; ; setGlobalTypeEnv tcg_env' final_type_env } zonkTcGblEnv :: Bag EvBind -> TcGblEnv -> TcM (TypeEnv, Bag EvBind, LHsBinds GhcTc, - [LForeignDecl GhcTc], [LTcSpecPrag], [LRuleDecl GhcTc]) + [LForeignDecl GhcTc], [LTcSpecPrag], [LRuleDecl GhcTc], [PatSyn]) zonkTcGblEnv ev_binds tcg_env@(TcGblEnv { tcg_binds = binds , tcg_ev_binds = cur_ev_binds , tcg_imp_specs = imp_specs , tcg_rules = rules - , tcg_fords = fords }) + , tcg_fords = fords + , tcg_patsyns = pat_syns }) = {-# SCC "zonkTopDecls" #-} setGblEnv tcg_env $ -- This sets the GlobalRdrEnv which is used when rendering -- error messages during zonking (notably levity errors) do { let all_ev_binds = cur_ev_binds `unionBags` ev_binds - ; zonkTopDecls all_ev_binds binds rules imp_specs fords } + ; zonkTopDecls all_ev_binds binds rules imp_specs fords pat_syns } -- | Runs TH finalizers and renames and typechecks the top-level declarations -- that they could introduce. ===================================== compiler/GHC/Tc/TyCl/PatSyn.hs ===================================== @@ -23,7 +23,6 @@ import GHC.Hs import GHC.Tc.Gen.Pat import GHC.Tc.Utils.Env import GHC.Tc.Utils.TcMType -import GHC.Tc.Zonk.Type import GHC.Tc.Errors.Types import GHC.Tc.Utils.Monad import GHC.Tc.Zonk.TcType @@ -37,10 +36,10 @@ import GHC.Tc.Types.Origin import GHC.Tc.TyCl.Build import GHC.Core.Multiplicity -import GHC.Core.Type ( typeKind, isManyTy, mkTYPEapp ) +import GHC.Core.Type ( typeKind, isManyTy, mkTYPEapp, definitelyLiftedType ) import GHC.Core.TyCo.Subst( extendTvSubstWithClone ) -import GHC.Core.TyCo.Tidy( tidyForAllTyBinders, tidyTypes, tidyType ) import GHC.Core.Predicate +import GHC.Core.TyCo.Tidy import GHC.Types.Name import GHC.Types.Name.Reader @@ -51,7 +50,7 @@ import GHC.Utils.Panic import GHC.Utils.Outputable import GHC.Data.FastString import GHC.Types.Var -import GHC.Types.Var.Env( emptyTidyEnv, mkInScopeSetList ) +import GHC.Types.Var.Env( mkInScopeSetList, emptyTidyEnv ) import GHC.Types.Id import GHC.Types.Id.Info( RecSelParent(..) ) import GHC.Tc.Gen.Bind @@ -672,27 +671,31 @@ tc_patsyn_finish lname dir is_infix lpat' prag_fn (ex_tvs, ex_tys, prov_theta, prov_dicts) (args, arg_tys) pat_ty field_labels - = do { -- Zonk everything. We are about to build a final PatSyn - -- so there had better be no unification variables in there - - (univ_tvs, req_theta, ex_tvs, prov_theta, arg_tys, pat_ty) <- - initZonkEnv NoFlexi $ - runZonkBndrT (zonkTyVarBindersX univ_tvs) $ \ univ_tvs' -> - do { req_theta' <- zonkTcTypesToTypesX req_theta - ; runZonkBndrT (zonkTyVarBindersX ex_tvs) $ \ ex_tvs' -> - do { prov_theta' <- zonkTcTypesToTypesX prov_theta - ; pat_ty' <- zonkTcTypeToTypeX pat_ty - ; arg_tys' <- zonkTcTypesToTypesX arg_tys + = do { -- Don't do a final zonk-to-type yet, as the pattern synonym may still + -- contain unfilled metavariables. + -- See Note [Metavariables in pattern synonyms]. + + -- We still need to zonk, however, in order for instantiation to work + -- correctly. If we don't zonk, we are at risk of quantifying + -- 'alpha -> beta' to 'forall a. a -> beta' even though 'beta := alpha'. + ; (univ_tvs, req_theta, ex_tvs, prov_theta, arg_tys, pat_ty) <- + liftZonkM $ + do { univ_tvs' <- traverse zonkInvisTVBinder univ_tvs + ; req_theta' <- zonkTcTypes req_theta + ; ex_tvs' <- traverse zonkInvisTVBinder ex_tvs + ; prov_theta' <- zonkTcTypes prov_theta + ; pat_ty' <- zonkTcType pat_ty + ; arg_tys' <- zonkTcTypes arg_tys ; let (env1, univ_tvs) = tidyForAllTyBinders emptyTidyEnv univ_tvs' + req_theta = tidyTypes env1 req_theta' (env2, ex_tvs) = tidyForAllTyBinders env1 ex_tvs' - req_theta = tidyTypes env2 req_theta' prov_theta = tidyTypes env2 prov_theta' arg_tys = tidyTypes env2 arg_tys' pat_ty = tidyType env2 pat_ty' ; return (univ_tvs, req_theta, - ex_tvs, prov_theta, arg_tys, pat_ty) } } + ex_tvs, prov_theta, arg_tys, pat_ty) } ; traceTc "tc_patsyn_finish {" $ ppr (unLoc lname) $$ ppr (unLoc lpat') $$ @@ -734,6 +737,48 @@ tc_patsyn_finish lname dir is_infix lpat' prag_fn ; traceTc "tc_patsyn_finish }" empty ; return (matcher_bind, tcg_env) } +{- Note [Metavariables in pattern synonyms] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Unlike data constructors, the types of pattern synonyms are allowed to contain +metavariables, because of view patterns. Example (from ticket #26465): + + f :: Eq a => a -> Maybe a + f = ... + + g = f + -- Due to the monomorphism restriction, we infer + -- g :: alpha -> Maybe alpha, with [W] Eq alpha + + pattern P x <- (g -> Just x) + -- Infer: P :: alpha -> alpha + +Note that: + + 1. 'g' is a top-level function binding whose inferred type contains metavariables + (due to type variable promotion, as described in Note [Deciding quantification] in GHC.Tc.Solver) + 2. 'P' is a pattern synonym without a type signature which uses 'g' in a view pattern. + +In this way, promoted metavariables of top-level functions can sneak their way +into pattern synonym definitions. + +To account for this fact, we do not attempt a final zonk-to-type in +'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. Indeed, GHC may fill in the metavariables +when typechecking the rest of the module. Following on from the above example, +we might have a later binding: + + y = g 'c' + -- fixes alpha := Char + +or + + h (P b) = not b + -- fixes alpha := Bool + +We instead perform the final zonk-to-type at the very end, in the call +to 'GHC.Tc.Zonk.Type.zonkPatSyn' in 'GHC.Tc.Zonk.Type.zonkTopDecls'. In this way, +pattern synonyms are treated the same as top-level function bindings. +-} + {- ************************************************************************ * * @@ -870,9 +915,11 @@ mkPatSynBuilder dir (L _ name) | otherwise = do { builder_name <- newImplicitBinder name mkBuilderOcc ; let theta = req_theta ++ prov_theta - need_dummy_arg = isUnliftedType pat_ty && null arg_tys && null theta - -- NB: pattern arguments cannot be representation-polymorphic, - -- as checked in 'tcPatSynSig'. So 'isUnliftedType' is OK here. + need_dummy_arg = null arg_tys && null theta && not (definitelyLiftedType pat_ty) + -- At this point, the representation of 'pat_ty' might still be unknown (see T26465c), + -- so use a conservative test that handles an unknown representation. + -- Ideally, we'd defer making the builder until the representation is settled, + -- but that would be a lot more work. builder_sigma = add_void need_dummy_arg $ mkInvisForAllTys univ_bndrs $ mkInvisForAllTys ex_bndrs $ ===================================== compiler/GHC/Tc/Zonk/Type.hs ===================================== @@ -37,9 +37,6 @@ module GHC.Tc.Zonk.Type ( import GHC.Prelude import GHC.Builtin.Types - -import GHC.Core.TyCo.Ppr ( pprTyVar ) - import GHC.Hs import {-# SOURCE #-} GHC.Tc.Gen.Splice (runTopSplice) @@ -60,8 +57,11 @@ import GHC.Tc.Zonk.TcType , checkCoercionHole , zonkCoVar ) -import GHC.Core.Type import GHC.Core.Coercion +import GHC.Core.ConLike +import GHC.Core.PatSyn (PatSyn(..)) +import GHC.Core.TyCo.Ppr ( pprTyVar ) +import GHC.Core.Type import GHC.Core.TyCon import GHC.Utils.Outputable @@ -93,6 +93,7 @@ import Control.Monad import Control.Monad.Trans.Class ( lift ) import Data.List.NonEmpty ( NonEmpty ) import Data.Foldable ( toList ) +import Data.Traversable ( for ) {- Note [What is zonking?] ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -470,7 +471,7 @@ commitFlexi DefaultFlexi tv zonked_kind ; return manyDataConTy } | Just (ConcreteFRR origin) <- isConcreteTyVar_maybe tv = do { addErr $ TcRnZonkerMessage (ZonkerCannotDefaultConcrete origin) - ; return (anyTypeOfKind zonked_kind) } + ; newZonkAnyType zonked_kind } | otherwise = do { traceTc "Defaulting flexi tyvar to ZonkAny:" (pprTyVar tv) -- See Note [Any types] in GHC.Builtin.Types, esp wrinkle (Any4) @@ -647,23 +648,25 @@ zonkTopDecls :: Bag EvBind -> LHsBinds GhcTc -> [LRuleDecl GhcTc] -> [LTcSpecPrag] -> [LForeignDecl GhcTc] + -> [PatSyn] -> TcM (TypeEnv, Bag EvBind, LHsBinds GhcTc, [LForeignDecl GhcTc], [LTcSpecPrag], - [LRuleDecl GhcTc]) -zonkTopDecls ev_binds binds rules imp_specs fords + [LRuleDecl GhcTc], + [PatSyn]) +zonkTopDecls ev_binds binds rules imp_specs fords pat_syns = initZonkEnv DefaultFlexi $ runZonkBndrT (zonkEvBinds ev_binds) $ \ ev_binds' -> runZonkBndrT (zonkRecMonoBinds binds) $ \ binds' -> -- Top level is implicitly recursive - do { rules' <- zonkRules rules - ; specs' <- zonkLTcSpecPrags imp_specs - ; fords' <- zonkForeignExports fords - ; ty_env <- zonkEnvIds <$> getZonkEnv - ; return (ty_env, ev_binds', binds', fords', specs', rules') } - + do { rules' <- zonkRules rules + ; specs' <- zonkLTcSpecPrags imp_specs + ; fords' <- zonkForeignExports fords + ; pat_syns' <- traverse zonkPatSyn pat_syns + ; ty_env <- zonkEnvIds <$> getZonkEnv + ; return (ty_env, ev_binds', binds', fords', specs', rules', pat_syns') } --------------------------------------------- zonkLocalBinds :: HsLocalBinds GhcTc @@ -1549,7 +1552,8 @@ zonk_pat (SumPat tys pat alt arity ) ; pat' <- zonkPat pat ; return (SumPat tys' pat' alt arity) } -zonk_pat p@(ConPat { pat_args = args +zonk_pat p@(ConPat { pat_con = L con_loc con + , pat_args = args , pat_con_ext = p'@(ConPatTc { cpt_tvs = tyvars , cpt_dicts = evs @@ -1568,8 +1572,15 @@ zonk_pat p@(ConPat { pat_args = args ; new_binds <- zonkTcEvBinds binds ; new_wrapper <- zonkCoFn wrapper ; new_args <- zonkConStuff args + ; new_con <- case con of + RealDataCon {} -> return con + -- Data constructors never contain metavariables: they are + -- fully zonked before we look at any value bindings. + PatSynCon ps -> PatSynCon <$> noBinders (zonkPatSyn ps) + -- Pattern synonyms can contain metavariables, see e.g. T26465c. ; pure $ p - { pat_args = new_args + { pat_con = L con_loc new_con + , pat_args = new_args , pat_con_ext = p' { cpt_arg_tys = new_tys , cpt_tvs = new_tyvars @@ -1615,14 +1626,14 @@ zonk_pat (InvisPat ty tp) ; return (InvisPat ty' tp) } zonk_pat (XPat ext) = case ext of - { ExpansionPat orig pat-> + { ExpansionPat orig pat -> do { pat' <- zonk_pat pat ; return $ XPat $ ExpansionPat orig pat' } ; CoPat co_fn pat ty -> - do { co_fn' <- zonkCoFn co_fn - ; pat' <- zonkPat (noLocA pat) - ; ty' <- noBinders $ zonkTcTypeToTypeX ty - ; return (XPat $ CoPat co_fn' (unLoc pat') ty') + do { co_fn' <- zonkCoFn co_fn + ; pat' <- zonk_pat pat + ; ty' <- noBinders $ zonkTcTypeToTypeX ty + ; return (XPat $ CoPat co_fn' pat' ty') } } zonk_pat pat = pprPanic "zonk_pat" (ppr pat) @@ -1653,6 +1664,45 @@ zonkPats = traverse zonkPat {-# SPECIALISE zonkPats :: [LPat GhcTc] -> ZonkBndrTcM [LPat GhcTc] #-} {-# SPECIALISE zonkPats :: NonEmpty (LPat GhcTc) -> ZonkBndrTcM (NonEmpty (LPat GhcTc)) #-} +--------------------------- + +-- | Perform a final zonk-to-type for a pattern synonym. +-- +-- See Note [Metavariables in pattern synonyms] in GHC.Tc.TyCl.PatSyn. +zonkPatSyn :: PatSyn -> ZonkTcM PatSyn +zonkPatSyn + ps@( MkPatSyn + { psArgs = arg_tys + , psUnivTyVars = univ_tvs + , psReqTheta = req_theta + , psExTyVars = ex_tvs + , psProvTheta = prov_theta + , psResultTy = res_ty + , psMatcher = (matcherNm, matcherTy, matcherDummyArg) + , psBuilder = mbBuilder + }) = + runZonkBndrT (zonkTyVarBindersX univ_tvs) $ \ univ_tvs' -> + do { req_theta' <- zonkTcTypesToTypesX req_theta + ; res_ty' <- zonkTcTypeToTypeX res_ty + ; runZonkBndrT (zonkTyVarBindersX ex_tvs) $ \ ex_tvs' -> + do { prov_theta' <- zonkTcTypesToTypesX prov_theta + ; arg_tys' <- zonkTcTypesToTypesX arg_tys + ; matcherTy' <- zonkTcTypeToTypeX matcherTy + ; mbBuilder' <- for mbBuilder $ \ (builderNm, builderTy, builderDummyArg) -> + do { builderTy' <- zonkTcTypeToTypeX builderTy + ; return (builderNm, builderTy', builderDummyArg) } + ; return $ + ps + { psArgs = arg_tys' + , psUnivTyVars = univ_tvs' + , psReqTheta = req_theta' + , psExTyVars = ex_tvs' + , psProvTheta = prov_theta' + , psResultTy = res_ty' + , psMatcher = (matcherNm, matcherTy', matcherDummyArg) + , psBuilder = mbBuilder' + } } } + {- ************************************************************************ * * ===================================== compiler/Language/Haskell/Syntax/Binds.hs ===================================== @@ -233,7 +233,7 @@ data HsBindLR idL idR var_rhs :: LHsExpr idR -- ^ Located only for consistency } - -- | Patterns Synonym Binding + -- | Pattern Synonym Binding | PatSynBind (XPatSynBind idL idR) (PatSynBind idL idR) ===================================== testsuite/tests/patsyn/should_compile/T26465b.hs ===================================== @@ -0,0 +1,16 @@ +{-# LANGUAGE PatternSynonyms, ViewPatterns #-} + +module T26465b where + +-- Variant of T26465 which should be accepted + +f :: Eq a => a -> Maybe a +f _ = Nothing + +-- Monomorphism restriction bites +-- Eq a[tau:0] => a[tau:0] -> Maybe a[tau:0] +g = f + +pattern P x <- ( g -> Just x ) + +x = g (1 :: Int) ===================================== testsuite/tests/patsyn/should_compile/T26465c.hs ===================================== @@ -0,0 +1,45 @@ + +{-# LANGUAGE PatternSynonyms, ViewPatterns #-} + +{-# LANGUAGE UnboxedSums, UnboxedTuples, MagicHash #-} + +module T26465c where + +-- Rep-poly variant of T26465b + +import Data.Kind + ( Constraint ) +import GHC.Exts + ( TYPE, Int#, isTrue#, (>=#) ) + + +type HasP :: forall r. TYPE r -> Constraint +class HasP a where + getP :: a -> (# (# #) | (# #) #) + mk :: (# #) -> a + +instance HasP Int where + getP i = if i >= 0 then (# | (# #) #) else (# (# #) | #) + mk _ = 1 +instance HasP Int# where + getP i# = if isTrue# ( i# >=# 0# ) then (# | (# #) #) else (# (# #) | #) + mk _ = 1# + +g1 = getP +g2 = getP + +m1 = mk +m2 = mk + +-- NB: deliberately use no arguments to make this test harder (so that we run +-- into the 'need_dummy_arg' logic of 'GHC.Tc.TyCl.PatSyn.mkPatSynBuilder'). +pattern P1 <- ( g1 -> (# | (# #) #) ) + where P1 = m1 (# #) +pattern P2 <- ( g2 -> (# | (# #) #) ) + where P2 = m2 (# #) + +y1 :: Int -> Int +y1 P1 = P1 + +y2 :: Int# -> Int# +y2 P2 = P2 ===================================== testsuite/tests/patsyn/should_compile/T26465d.hs ===================================== @@ -0,0 +1,28 @@ + +{-# LANGUAGE PatternSynonyms, ViewPatterns #-} + +{-# LANGUAGE UnboxedSums, UnboxedTuples, MagicHash #-} + +module T26465d where + +-- Should-fail variant of T26465c (but with -fdefer-type-errors) + +import Data.Kind + ( Constraint ) +import GHC.Exts + ( TYPE ) + +type HasP :: forall r. TYPE r -> Constraint +class HasP a where + getP :: a -> (# (# #) | (# #) #) + mk :: (# #) -> a + +g = getP +m = mk + +-- NB: deliberately use no arguments to make this test harder (so that we run +-- into the 'need_dummy_arg' logic of 'GHC.Tc.TyCl.PatSyn.mkPatSynBuilder'). +pattern P1 <- ( g -> (# | (# #) #) ) + where P1 = m (# #) + +test P1 = P1 ===================================== testsuite/tests/patsyn/should_compile/T26465d.stderr ===================================== @@ -0,0 +1,10 @@ +T26465d.hs:20:5: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] + • No instance for ‘HasP a0’ arising from a use of ‘getP’ + • In the expression: getP + In an equation for ‘g’: g = getP + +T26465d.hs:21:5: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] + • No instance for ‘HasP a0’ arising from a use of ‘mk’ + • In the expression: mk + In an equation for ‘m’: m = mk + ===================================== testsuite/tests/patsyn/should_compile/all.T ===================================== @@ -73,6 +73,9 @@ test('T13752a', normal, compile, ['']) test('T13768', normal, compile, ['']) test('T14058', [extra_files(['T14058.hs', 'T14058a.hs'])], multimod_compile, ['T14058', '-v0']) +test('T26465b', normal, compile, ['']) +test('T26465c', normal, compile, ['']) +test('T26465d', normal, compile, ['-fdefer-type-errors']) test('T14326', normal, compile, ['']) test('T14380', normal, compile, ['']) test('T14394', normal, ghci_script, ['T14394.script']) ===================================== testsuite/tests/patsyn/should_fail/T26465.hs ===================================== @@ -0,0 +1,12 @@ +{-# LANGUAGE PatternSynonyms, ViewPatterns #-} + +module T26465 where + +f :: Eq a => a -> Maybe a +f _ = Nothing + +-- Monomorphism restriction bites +-- Eq a[tau:0] => a[tau:0] -> Maybe a[tau:0] +g = f + +pattern P x <- ( g -> Just x ) ===================================== testsuite/tests/patsyn/should_fail/T26465.stderr ===================================== @@ -0,0 +1,15 @@ +T26465.hs:10:5: error: [GHC-39999] + • Ambiguous type variable ‘a0’ arising from a use of ‘f’ + prevents the constraint ‘(Eq a0)’ from being solved. + Relevant bindings include + g :: a0 -> Maybe a0 (bound at T26465.hs:10:1) + Probable fix: use a type annotation to specify what ‘a0’ should be. + Potentially matching instances: + instance Eq Ordering -- Defined in ‘GHC.Internal.Classes’ + instance Eq Integer -- Defined in ‘GHC.Internal.Bignum.Integer’ + ...plus 24 others + ...plus five instances involving out-of-scope types + (use -fprint-potential-instances to see them all) + • In the expression: f + In an equation for ‘g’: g = f + ===================================== testsuite/tests/patsyn/should_fail/all.T ===================================== @@ -35,6 +35,7 @@ test('T12165', normal, compile_fail, ['']) test('T12819', normal, compile_fail, ['']) test('UnliftedPSBind', normal, compile_fail, ['']) test('T15695', normal, compile, ['']) # It has -fdefer-type-errors inside +test('T26465', normal, compile_fail, ['']) test('T13349', normal, compile_fail, ['']) test('T13470', normal, compile_fail, ['']) test('T14112', normal, compile_fail, ['']) ===================================== testsuite/tests/th/T8761.stderr ===================================== @@ -123,29 +123,29 @@ T8761.hs:(71,1)-(105,39): Splicing declarations pattern Puep x y <- (MkExProv y, x) pattern T8761.P :: GHC.Internal.Types.Bool pattern T8761.Pe :: () => forall (a_0 :: *) . a_0 -> T8761.Ex -pattern T8761.Pu :: forall (a_0 :: *) . a_0 -> a_0 -pattern T8761.Pue :: forall (a_0 :: *) . () => forall (b_1 :: *) . - a_0 -> b_1 -> (a_0, T8761.Ex) -pattern T8761.Pur :: forall (a_0 :: *) . (GHC.Internal.Num.Num a_0, - GHC.Internal.Classes.Eq a_0) => - a_0 -> [a_0] -pattern T8761.Purp :: forall (a_0 :: *) (b_1 :: *) . (GHC.Internal.Num.Num a_0, - GHC.Internal.Classes.Eq a_0) => - GHC.Internal.Show.Show b_1 => - a_0 -> b_1 -> ([a_0], T8761.UnivProv b_1) -pattern T8761.Pure :: forall (a_0 :: *) . (GHC.Internal.Num.Num a_0, - GHC.Internal.Classes.Eq a_0) => - forall (b_1 :: *) . a_0 -> b_1 -> ([a_0], T8761.Ex) -pattern T8761.Purep :: forall (a_0 :: *) . (GHC.Internal.Num.Num a_0, - GHC.Internal.Classes.Eq a_0) => +pattern T8761.Pu :: forall (a0_0 :: *) . a0_0 -> a0_0 +pattern T8761.Pue :: forall (a0_0 :: *) . () => forall (b_1 :: *) . + a0_0 -> b_1 -> (a0_0, T8761.Ex) +pattern T8761.Pur :: forall (a0_0 :: *) . (GHC.Internal.Num.Num a0_0, + GHC.Internal.Classes.Eq a0_0) => + a0_0 -> [a0_0] +pattern T8761.Purp :: forall (a0_0 :: *) (b0_1 :: *) . (GHC.Internal.Num.Num a0_0, + GHC.Internal.Classes.Eq a0_0) => + GHC.Internal.Show.Show b0_1 => + a0_0 -> b0_1 -> ([a0_0], T8761.UnivProv b0_1) +pattern T8761.Pure :: forall (a0_0 :: *) . (GHC.Internal.Num.Num a0_0, + GHC.Internal.Classes.Eq a0_0) => + forall (b_1 :: *) . a0_0 -> b_1 -> ([a0_0], T8761.Ex) +pattern T8761.Purep :: forall (a0_0 :: *) . (GHC.Internal.Num.Num a0_0, + GHC.Internal.Classes.Eq a0_0) => forall (b_1 :: *) . GHC.Internal.Show.Show b_1 => - a_0 -> b_1 -> ([a_0], T8761.ExProv) + a0_0 -> b_1 -> ([a0_0], T8761.ExProv) pattern T8761.Pep :: () => forall (a_0 :: *) . GHC.Internal.Show.Show a_0 => a_0 -> T8761.ExProv -pattern T8761.Pup :: forall (a_0 :: *) . () => GHC.Internal.Show.Show a_0 => - a_0 -> T8761.UnivProv a_0 -pattern T8761.Puep :: forall (a_0 :: *) . () => forall (b_1 :: *) . GHC.Internal.Show.Show b_1 => - a_0 -> b_1 -> (T8761.ExProv, a_0) +pattern T8761.Pup :: forall (a0_0 :: *) . () => GHC.Internal.Show.Show a0_0 => + a0_0 -> T8761.UnivProv a0_0 +pattern T8761.Puep :: forall (a0_0 :: *) . () => forall (b_1 :: *) . GHC.Internal.Show.Show b_1 => + a0_0 -> b_1 -> (T8761.ExProv, a0_0) T8761.hs:(108,1)-(117,25): Splicing declarations do infos <- mapM reify View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c85c845dc5ad539bf28f1b8c5c1dbb3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c85c845dc5ad539bf28f1b8c5c1dbb3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag
by Marge Bot (＠marge-bot) 18 Oct '25

18 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: f85058d3 by Zubin Duggal at 2025-10-17T13:50:52+05:30 compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag Fixes #26264 Metric Decrease: T9233 - - - - - 41 changed files: - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/JS/JStg/Monad.hs - compiler/GHC/Platform/Reg.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToJS/CodeGen.hs - compiler/GHC/StgToJS/Ids.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Name/Cache.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/Supply.hs - + testsuite/tests/ghc-api/T26264.hs - + testsuite/tests/ghc-api/T26264.stdout - testsuite/tests/ghc-api/all.T - testsuite/tests/overloadedrecflds/should_compile/BootFldReexport.stderr - testsuite/tests/overloadedrecflds/should_fail/T16745.stderr - testsuite/tests/overloadedrecflds/should_fail/T18999_NoDisambiguateRecordFields.stderr - testsuite/tests/perf/should_run/UniqLoop.hs - testsuite/tests/regalloc/regalloc_unit_tests.hs - testsuite/tests/simplCore/should_compile/rule2.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f85058d3361cc9030265c716d5d1b8e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f85058d3361cc9030265c716d5d1b8e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag
by Marge Bot (＠marge-bot) 17 Oct '25

17 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: f85058d3 by Zubin Duggal at 2025-10-17T13:50:52+05:30 compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag Fixes #26264 Metric Decrease: T9233 - - - - - a8bc5f2e by sheaf at 2025-10-17T15:24:15-04:00 Don't prematurely final-zonk PatSyn declarations This commit makes GHC hold off on the final zonk for pattern synonym declarations, in 'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. This accommodates the fact that pattern synonym declarations without a type signature can contain unfilled metavariables, e.g. if the RHS of the pattern synonym involves view-patterns whose type mentions promoted (level 0) metavariables. Just like we do for ordinary function bindings, we should allow these metavariables to be settled later, instead of eagerly performing a final zonk-to-type. Now, the final zonking-to-type for pattern synonyms is performed in GHC.Tc.Module.zonkTcGblEnv. Fixes #26465 - - - - - 57 changed files: - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/Core/PatSyn.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/JS/JStg/Monad.hs - compiler/GHC/Platform/Reg.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToJS/CodeGen.hs - compiler/GHC/StgToJS/Ids.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Name/Cache.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/Supply.hs - compiler/Language/Haskell/Syntax/Binds.hs - + testsuite/tests/ghc-api/T26264.hs - + testsuite/tests/ghc-api/T26264.stdout - testsuite/tests/ghc-api/all.T - testsuite/tests/overloadedrecflds/should_compile/BootFldReexport.stderr - testsuite/tests/overloadedrecflds/should_fail/T16745.stderr - testsuite/tests/overloadedrecflds/should_fail/T18999_NoDisambiguateRecordFields.stderr - + testsuite/tests/patsyn/should_compile/T26465b.hs - + testsuite/tests/patsyn/should_compile/T26465c.hs - + testsuite/tests/patsyn/should_compile/T26465d.hs - + testsuite/tests/patsyn/should_compile/T26465d.stderr - testsuite/tests/patsyn/should_compile/all.T - + testsuite/tests/patsyn/should_fail/T26465.hs - + testsuite/tests/patsyn/should_fail/T26465.stderr - testsuite/tests/patsyn/should_fail/all.T - testsuite/tests/perf/should_run/UniqLoop.hs - testsuite/tests/regalloc/regalloc_unit_tests.hs - testsuite/tests/simplCore/should_compile/rule2.stderr - testsuite/tests/th/T8761.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/def2832f4920537cd35ecf00f57eea… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/def2832f4920537cd35ecf00f57eea… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 2 commits: Improve equality checking for foralls a bit
by Simon Peyton Jones (＠simonpj) 17 Oct '25

17 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 0fe38b69 by Simon Peyton Jones at 2025-10-17T13:38:17+01:00 Improve equality checking for foralls a bit ...by re-using the TcEvBindsVar - - - - - 25c7f66e by Simon Peyton Jones at 2025-10-17T14:57:35+01:00 Comments on rewriter sets - - - - - 3 changed files: - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/Evidence.hs Changes: ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -554,24 +554,21 @@ can_eq_nc_forall ev eq_rel s1 s2 ; traceTcS "Trying to solve the implication" (ppr s1 $$ ppr s2 $$ ppr wanteds) -- Solve the `wanteds` in a nested context - ; ev_binds_var <- newNoTcEvBinds + -- Use the /same/ TcEvBinds var as the context; we do not expect any dict binds + -- but we do want to record any used Given coercions (in `evb_tcvs`) so that + -- they are kept alive by `neededEvVars`. Admittedly they are free in `all_co`, + -- but only if we zonk it, which `neededEvVars` does not do (see test T7196). + ; ev_binds_var <- getTcEvBindsVar ; residual_wanted <- nestImplicTcS skol_info_anon ev_binds_var tclvl $ solveSimpleWanteds wanteds ; return (all_co, isSolvedWC residual_wanted) } - -- Kick out any inerts constraints that mention unified type variables ; kickOutAfterUnification unifs ; if solved - then do { all_co <- zonkCo all_co - -- setWantedEq will add `all_co` to the `ebv_tcvs`, to record - -- that `all_co` is used. But if `all_co` contains filled - -- CoercionHoles, from the nested solve, and we may miss the - -- use of CoVars. Test T7196 showed this up - - ; setWantedEq orig_dest emptyCoHoleSet all_co + then do { setWantedEq orig_dest emptyCoHoleSet all_co -- emptyCoHoleSet: fully solved, so all_co has no holes ; stopWith ev "Polytype equality: solved" } ===================================== compiler/GHC/Tc/Types/Constraint.hs ===================================== @@ -2568,42 +2568,41 @@ Note [Wanteds rewrite Wanteds] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Should one Wanted constraint be allowed to rewrite another? -This example (along with #8450) suggests not: - f :: a -> Bool - f x = ( [x,'c'], [x,True] ) `seq` True -Here we get - [W] a ~ Char - [W] a ~ Bool -but we do not want to complain about Bool ~ Char! - -This example suggests yes (indexed-types/should_fail/T4093a): - type family Foo a - f :: (Foo e ~ Maybe e) => Foo e -In the ambiguity check, we get - [G] g1 :: Foo e ~ Maybe e - [W] w1 :: Foo alpha ~ Foo e - [W] w2 :: Foo alpha ~ Maybe alpha -w1 gets rewritten by the Given to become - [W] w3 :: Foo alpha ~ Maybe e -Now, the only way to make progress is to allow Wanteds to rewrite Wanteds. -Rewriting w3 with w2 gives us - [W] w4 :: Maybe alpha ~ Maybe e -which will soon get us to alpha := e and thence to victory. - -TL;DR we want equality saturation. +This example (along with #8450) suggests "no": + f :: a -> Bool + f x = ( [x,'c'], [x,True] ) `seq` True + Here we get + [W] a ~ Char + [W] a ~ Bool + but we do not want to complain about Bool ~ Char! + +This example suggests "yes" (indexed-types/should_fail/T4093a): + type family Foo a + f :: (Foo e ~ Maybe e) => Foo e + In the ambiguity check, we get + [G] g1 :: Foo e ~ Maybe e + [W] w1 :: Foo alpha ~ Foo e + [W] w2 :: Foo alpha ~ Maybe alpha + w1 gets rewritten by the Given to become + [W] w3 :: Foo alpha ~ Maybe e + Now, the only way to make progress is to allow Wanteds to rewrite Wanteds. + Rewriting w3 with w2 gives us + [W] w4 :: Maybe alpha ~ Maybe e + which will soon get us to alpha := e and thence to victory. + TL;DR we want equality saturation. We thus want Wanteds to rewrite Wanteds in order to accept more programs, but we don't want Wanteds to rewrite Wanteds because doing so can create inscrutable error messages. To solve this dilemma: -(WRW1) The rewriters of a Wanted. We do allow Wanteds to rewrite Wanteds, but each - unsolved Wanted tracks +(WRW1) ctev_rewriters: the rewriters of a Wanted. We /do/ allow Wanteds to + rewrite Wanteds, but each unsolved Wanted tracks the set of Wanteds that it has been rewritten by in its CoHoleSet, stored in the `ctev_rewriters` field of the CtWanted constructor of CtEvidence. (Only Wanteds have CoHoleSets.) - If the rewriter set is empty, then the constaint has been not been rewritten - by any unsolved constraint. + Key point: if the rewriter set is empty, then the constaint has been not been + rewritten by any unsolved constraint. (WRW2) A CoHoleSet is just a set of CoercionHoles. This is sufficient because only equalities (evidenced by coercion holes) are used for rewriting; other ===================================== compiler/GHC/Tc/Types/Evidence.hs ===================================== @@ -392,6 +392,8 @@ data EvBindsVar -- so that we can report unused given constraints, -- in GHC.Tc.Solver.neededEvVars -- See Note [Tracking redundant constraints] in GHC.Tc.Solver + -- Also: we garbage-collect unused bindings in `neededEvVars`, + -- so this matters for correctness too. } | CoEvBindsVar { -- See Note [Coercion evidence only] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f4875d9048c3097dfb7d69e2b873ff… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f4875d9048c3097dfb7d69e2b873ff… You're receiving this email because of your account on gitlab.haskell.org.

1 0

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

17 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 1e1a415a by Ben Gamari at 2025-10-17T14:43:36+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> Co-authored-by: Cheng Shao <terrorjack(a)type.dance> - - - - - 9bf29ef7 by Ben Gamari at 2025-10-17T14:44:12+01:00 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. - - - - - 78241a8f by Ben Gamari at 2025-10-17T14:44:12+01:00 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. - - - - - f0773a9a by Ben Gamari at 2025-10-17T14:44:12+01:00 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. - - - - - 39 changed files: - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/CmmToC.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/Wasm.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/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/Types.h - rts/include/stg/Prim.h - rts/posix/Signals.c - rts/prim/int64x2minmax.c - rts/prim/vectorQuotRem.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/wasm/JSFFI.c - rts/wasm/scheduler.cmm - rts/win32/libHSghc-internal.def - utils/deriveConstants/Main.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/38e5246978fea0712115b40b71a8db… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/38e5246978fea0712115b40b71a8db… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] chore: revise existing notes
by Cheng Shao (＠TerrorJack) 17 Oct '25

17 Oct '25

Cheng Shao pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 38e52469 by Cheng Shao at 2025-10-17T15:21:54+02:00 chore: revise existing notes - - - - - 2 changed files: - rts/RtsToHsIface.c - rts/wasm/JSFFI.c Changes: ===================================== rts/RtsToHsIface.c ===================================== @@ -18,16 +18,17 @@ * // etc. * }; * - * `ghc_hs_iface` is initialized during program loading via the - * `init_ghc_hs_iface` constructor in `ghc-interface` + * `ghc_hs_iface` is initialized via the `init_ghc_hs_iface` function + * in `ghc-internal` cbits, when it is invoked by `hs_init_ghc` during + * GHC RTS initialization: * - * const struct HsIface the_hs_iface = { + * struct HsIface the_hs_iface = { * .runIO = &ghczminternal_GHCziInternalziTopHandler_runIO_closure, * .Z0T = &ghczminternal_GHCziInternalziTuple_Z0T_closure, * // etc. * }; * - * void __attribute__((constructor)) init_ghc_hs_iface() { + * void init_ghc_hs_iface(void) { * ghc_hs_iface = &the_hs_iface; * } * @@ -36,7 +37,7 @@ * side-effect of making the interface between the RTS and `ghc-internal` * explicit. * - * Note that the ((constructor)) symbol is explicitly included in the final + * Note that the init_ghc_hs_iface symbol is explicitly included in the final * binary via the linker flag `-uinit_ghc_hs_iface`, when an executable is * linked against ghc-internal by GHC. * @@ -45,11 +46,15 @@ * (since, otherwise, only objects members which provide undefined symbols * needed by the executable are included in the final object). * - * When `ghc-internal` is a dynamic dependency of an executable, the - * constructor will run when the shared object for `ghc-internal` is loaded. - * When the executable is statically linked against `ghc-internal`, the - * constructor will be run when the program is loaded (since the constructor - * symbol was forcibly included as described in the paragraph above). + * CAUTION: there may be constructors invoked before hs_init_ghc, and + * those constructors will see an uninitialized ghc_hs_iface! For now + * we're fine: when GHC generates a constructor that references + * certain closures or info tables, the generated references don't go + * through ghc_hs_iface redirection, and they are not forward + * references to other objects not compiled yet. Still, always keep + * the no-ghc_hs_iface restriction in mind when doing work related to + * constructors, be it the compiler-generated ones or explicitly + * written ones in RTS. */ #include "Rts.h" ===================================== rts/wasm/JSFFI.c ===================================== @@ -68,6 +68,15 @@ static void __init_ghc_hs_iface_jsffi(void) { // Therefore, on wasm32, we designate priority 101 to ctors generated // by the GHC codegen, and priority 102 to the initialization logic // here to ensure hs_init_ghc() sees everything it needs to see. +// +// It's simpler when it comes to shared libraries: we'll need to load +// them via dyld written in JS anyway, and hence we always compile the +// rts shared library with JSVal functionality. The constructors here +// are only for non-shared objects, so that the user would only need +// to invoke _initialize for all the RTS initialization logic to be +// done before invoking user-specified exports; for the shared library +// case, we explicitly export __ghc_wasm_jsffi_init to be invoked by +// dyld, after at least rts & ghc-internal has been loaded. #if defined(__PIC__) __attribute__((export_name("__ghc_wasm_jsffi_init"))) void __ghc_wasm_jsffi_init(void); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/38e5246978fea0712115b40b71a8db3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/38e5246978fea0712115b40b71a8db3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25262] Use template-haskell-lift/quasiquoter in boot libraries
by Teo Camarasu (＠teo) 17 Oct '25

17 Oct '25

Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC Commits: cf4f916e by Teo Camarasu at 2025-10-17T12:12:34+01:00 Use template-haskell-lift/quasiquoter in boot libraries - - - - - 9 changed files: - + libraries/addupstreams.py - libraries/bytestring - libraries/containers - libraries/exceptions - libraries/filepath - libraries/ghc-compact/ghc-compact.cabal - libraries/os-string - libraries/text - libraries/time Changes: ===================================== libraries/addupstreams.py ===================================== @@ -0,0 +1,135 @@ +#!/usr/bin/env python3 + +from pathlib import Path +import subprocess +import logging +import re + +logging.basicConfig(level=logging.INFO) + +IGNORE = 1 # ignore submodule +GITHUB_HASKELL = 2 # in the haskell github org +ORIGIN = 3 # upstream remote == origin remote + +def github(owner: str, name: str) -> str: + return f'https://github.com/{owner}/{name}' + +def github_haskell(name: str) -> str: + return github('haskell', name) + +def gitlab_ssh(owner: str, name: str) -> str: + return f'git@gitlab.haskell.org:{owner}/{name}' + +upstreams = { + '.arc-linters/arcanist-external-json-linter': IGNORE, + 'libffi-tarballs': IGNORE, + 'libraries/array': GITHUB_HASKELL, + 'libraries/binary': GITHUB_HASKELL, + 'libraries/bytestring': GITHUB_HASKELL, + 'libraries/Cabal': GITHUB_HASKELL, + 'libraries/containers': GITHUB_HASKELL, + 'libraries/deepseq': GITHUB_HASKELL, + 'libraries/directory': GITHUB_HASKELL, + 'libraries/file-io': GITHUB_HASKELL, + 'libraries/filepath': GITHUB_HASKELL, + 'libraries/ghc-bignum/gmp/gmp-tarballs': ORIGIN, + 'libraries/ghc-internal/gmp/gmp-tarballs': ORIGIN, + 'libraries/haskeline': GITHUB_HASKELL, + 'libraries/hpc': ORIGIN, + 'libraries/integer-gmp/gmp/gmp-tarballs': ORIGIN, + 'libraries/mtl': GITHUB_HASKELL, + 'libraries/os-string': GITHUB_HASKELL, + 'libraries/parallel': GITHUB_HASKELL, + 'libraries/parsec': GITHUB_HASKELL, + 'libraries/pretty': GITHUB_HASKELL, + 'libraries/primitive': GITHUB_HASKELL, + 'libraries/process': GITHUB_HASKELL, + 'libraries/semaphore-compat': ORIGIN, + 'libraries/stm': GITHUB_HASKELL, + 'libraries/terminfo': GITHUB_HASKELL, + 'libraries/text': GITHUB_HASKELL, + 'libraries/time': GITHUB_HASKELL, + 'libraries/transformers': IGNORE, # darcs mirror + 'libraries/unix': GITHUB_HASKELL, + 'libraries/Win32': GITHUB_HASKELL, + 'nofib': 'https://gitlab.haskell.org/ghc/nofib', + 'utils/hpc': GITHUB_HASKELL, + 'utils/haddock': GITHUB_HASKELL, +} + +all_submods = [ + line.split()[1] + for line in subprocess.check_output(['git', 'submodule'], encoding='UTF-8').split('\n') + if len(line.split()) > 0 +] + +packages = { + line.split()[0]: line.split()[3] + for line in open('packages').read().split('\n') + if not line.startswith('#') + if len(line.split()) == 4 + if line.split()[3] != '-' +} + +def get_remote_url(submod: str, remote: str): + p = subprocess.run(['git', '-C', submod, 'remote', 'get-url', remote], + encoding='UTF-8', + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + if p.returncode == 0: + return p.stdout + else: + return None + +def add_remote(submod: str, remote: str, url: str): + old_url = get_remote_url(submod, remote) + if old_url is None: + logging.info(f'{submod}: adding remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'add', remote, url]) + elif old_url == url: + return + else: + logging.info(f'{submod}: updating remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'set-url', remote, url]) + + #update_remote(submod, remote) + +def update_remote(submod: str, remote: str): + subprocess.check_call(['git', '-C', submod, 'remote', 'update', remote]) + +def main(): + for submod in all_submods: + print(submod) + upstream = None + if submod in upstreams: + upstream = upstreams[submod] + elif submod in packages: + upstream = packages[submod] + + if upstream == ORIGIN: + upstream = subprocess.check_output(['git', '-C', submod, 'remote', 'get-url', 'origin'], encoding='UTF-8').strip() + elif upstream == GITHUB_HASKELL: + upstream = github_haskell(Path(submod).name) + elif upstream == IGNORE: + continue + + if upstream is None: + print(f'Unknown upstream for {submod}') + raise ValueError('unknown upstream') + else: + print(f'Upstream of {submod} is {upstream}') + add_remote(submod, 'upstream', upstream) + + origin = get_remote_url(submod, 'origin') + m = re.match('https://gitlab.haskell.org/(.*)', origin) + if m is not None: + push = f'git@gitlab.haskell.org:{m.group(1)}' + print(f'origin-push of {submod} is {push}') + add_remote(submod, 'origin-push', push) + + name = Path(submod).name + add_remote(submod, 'teo', f'git@github.com:TeofilC/{name}') + +if __name__ == '__main__': + main() + ===================================== libraries/bytestring ===================================== @@ -1 +1 @@ -Subproject commit d984ad00644c0157bad04900434b9d36f23633c5 +Subproject commit 99ec2e9ef46c2e4cef7bf0d4505d66725ea0a842 ===================================== libraries/containers ===================================== @@ -1 +1 @@ -Subproject commit 801b06e5d4392b028e519d5ca116a2881d559721 +Subproject commit 6fd4a83966fca76eac5b0ac7ad0d2232bf9d1f93 ===================================== libraries/exceptions ===================================== @@ -1 +1 @@ -Subproject commit b6c4290124eb1138358bf04ad9f33e67f6c5c1d8 +Subproject commit 9fbde92331ba64ffc49f90d49a3bfb26b6bf197c ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit e4cc73a60a7fa0111715292626fd0e1b01d4d39e ===================================== libraries/ghc-compact/ghc-compact.cabal ===================================== @@ -40,7 +40,7 @@ library CPP build-depends: base >= 4.9.0 && < 4.23, - bytestring >= 0.10.6.0 && <0.13 + bytestring >= 0.10.6.0 && <0.14 ghc-options: -Wall exposed-modules: GHC.Compact ===================================== libraries/os-string ===================================== @@ -1 +1 @@ -Subproject commit 2e693aad07540173a0169971b27c9acac28eeff1 +Subproject commit 13b7bef9c40cd454a6e7b357dece7262e5276744 ===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67 +Subproject commit b2f86f8a010dabcbdfb32f4b7f3d95259d9107fa ===================================== libraries/time ===================================== @@ -1 +1 @@ -Subproject commit 507f50844802f1469ba6cadfeefd4e3fecee0416 +Subproject commit 4ae1bbd587bcbe0c643cefb00337ce85e0ff2507 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf4f916eacd3294e09d72463815ac5a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf4f916eacd3294e09d72463815ac5a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] 23 commits: T22859: Increase threadDelay for small machines
by Cheng Shao (＠TerrorJack) 17 Oct '25

17 Oct '25

Cheng Shao pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: e10dcd65 by Sven Tennie at 2025-10-12T10:24:56+00:00 T22859: Increase threadDelay for small machines The previously used thread delay led to failures on my RISC-V test setups. - - - - - d59ef6b6 by Hai / @BestYeen at 2025-10-14T21:51:14-04:00 Change Alex and Happy m4 scripts to display which version was found in the system, adapt small formatting details in Happy script to be more like the Alex script again. - - - - - c98abb6a by Hai / @BestYeen at 2025-10-14T21:52:08-04:00 Update occurrences of return to pure and add a sample for redefining :m to mean :main - - - - - 70ee825a by Cheng Shao at 2025-10-14T21:52:50-04:00 testsuite: fix T3586 for non-SSE3 platforms `T3586.hs` contains `-fvia-C -optc-msse3` which I think is a best-effort basis to harvest the C compiler's auto vectorization optimizations via the C backend back when the test was added. The `-fvia-C` part is now a deprecated no-op because GHC can't fall back to the C backend on a non-unregisterised build, and `-optc-msse3` might actually cause the test to fail on non x86/x64 platforms, e.g. recent builds of wasi-sdk would report `wasm32-wasi-clang: error: unsupported option '-msse3' for target 'wasm32-unknown-wasi'`. So this patch cleans up this historical cruft. `-fvia-C` is removed, and `-optc-msse3` is only passed when cpuid contains `pni` (which indicates support of SSE3). - - - - - 4be32153 by Teo Camarasu at 2025-10-15T08:06:09-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 0c00c9c3 by Ben Gamari at 2025-10-15T08:06:51-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - d9f5f2fb by Rodrigo Mesquita at 2025-10-17T11:52:36+02: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 - - - - - 719b2b67 by Ben Gamari at 2025-10-17T11:52:36+02: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> - - - - - aa4bd63c by Cheng Shao at 2025-10-17T11:52:36+02:00 WIP partial fixes for wasm - - - - - 24da4c54 by Rodrigo Mesquita at 2025-10-17T11:52:36+02:00 fixup! rts: Avoid static symbol references to ghc-internal - - - - - 37ea6152 by Rodrigo Mesquita at 2025-10-17T11:52:36+02:00 fixup! rts: Avoid static symbol references to ghc-internal - - - - - e649f421 by Cheng Shao at 2025-10-17T11:52:36+02:00 WIP: more wasm fixes - - - - - 5a1f1ae4 by Ben Gamari at 2025-10-17T11:52:36+02:00 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. - - - - - a77c6ce0 by Ben Gamari at 2025-10-17T11:52:36+02:00 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. - - - - - 3a914a5a by Ben Gamari at 2025-10-17T11:52:36+02:00 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. - - - - - ca0abad6 by Cheng Shao at 2025-10-17T11:52:36+02:00 WIP: fix all remaining wasm regressions for now - - - - - e559d275 by Cheng Shao at 2025-10-17T11:52:37+02:00 WIP: remove wasm dyld hack - - - - - 1e7e4506 by Cheng Shao at 2025-10-17T11:52:37+02:00 WIP: don't make init_ghc_hs_iface a constructor & remove driver hack - - - - - 3199d13b by Rodrigo Mesquita at 2025-10-17T11:52:37+02:00 re-include -u_init_ghc_hs_iface flag, see comments on #26166 - - - - - 5040c1ed by Cheng Shao at 2025-10-17T13:10:13+02:00 chore: misc cleanup - drop unused unpackCStringzh_closure from HsIface - drop duplicate I64zh_con_info in Prelude.h - prefer using macros defined in Prelude.h, instead of directly writing ghc_hs_iface->foo - - - - - 102 changed files: - .gitmodules - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToC.hs - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - docs/users_guide/ghci.rst - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter - m4/fptools_alex.m4 - m4/fptools_happy.m4 - rts/BuiltinClosures.c - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Prelude.h - rts/PrimOps.cmm - rts/Printer.c - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.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/Types.h - rts/include/stg/Prim.h - rts/posix/OSMem.c - 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/wasm/JSFFI.c - rts/wasm/scheduler.cmm - rts/win32/libHSghc-internal.def - testsuite/driver/cpu_features.py - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/perf/should_run/T3586.hs - testsuite/tests/perf/should_run/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 - utils/deriveConstants/Main.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa0d27886c2a5d72a04de6291366a4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa0d27886c2a5d72a04de6291366a4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Refactor distinct constructor tables map construction
by Marge Bot (＠marge-bot) 17 Oct '25

17 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - 2c11d56e by sheaf at 2025-10-17T06:50:17-04:00 Don't prematurely final-zonk PatSyn declarations This commit makes GHC hold off on the final zonk for pattern synonym declarations, in 'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. This accommodates the fact that pattern synonym declarations without a type signature can contain unfilled metavariables, e.g. if the RHS of the pattern synonym involves view-patterns whose type mentions promoted (level 0) metavariables. Just like we do for ordinary function bindings, we should allow these metavariables to be settled later, instead of eagerly performing a final zonk-to-type. Now, the final zonking-to-type for pattern synonyms is performed in GHC.Tc.Module.zonkTcGblEnv. Fixes #26465 - - - - - def2832f by Matthew Pickering at 2025-10-17T06:50:18-04:00 driver: Properly handle errors during LinkNode steps Previously we were not properly catching errors during the LinkNode step (see T9930fail test). This is fixed by wrapping the `LinkNode` action in `wrapAction`, the same handler which is used for module compilation. Fixes #26496 - - - - - 52 changed files: - compiler/GHC/Core/Make.hs - compiler/GHC/Core/PatSyn.hs - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghc-e/should_fail/T9930fail.stderr - + testsuite/tests/patsyn/should_compile/T26465b.hs - + testsuite/tests/patsyn/should_compile/T26465c.hs - + testsuite/tests/patsyn/should_compile/T26465d.hs - + testsuite/tests/patsyn/should_compile/T26465d.stderr - testsuite/tests/patsyn/should_compile/all.T - + testsuite/tests/patsyn/should_fail/T26465.hs - + testsuite/tests/patsyn/should_fail/T26465.stderr - testsuite/tests/patsyn/should_fail/all.T - + 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/th/T8761.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/42ae5b19970267490380d05bb35876… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/42ae5b19970267490380d05bb35876… You're receiving this email because of your account on gitlab.haskell.org.

1 0