- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/ani/kill-popErrCtxt] wombat
by Apoorv Ingle (＠ani) 22 Sep '25

22 Sep '25

Apoorv Ingle pushed to branch wip/ani/kill-popErrCtxt at Glasgow Haskell Compiler / GHC Commits: 106e67d2 by Apoorv Ingle at 2025-09-22T08:14:06-05:00 wombat - - - - - 5 changed files: - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Gen/Do.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Types/LclEnv.hs - compiler/GHC/Tc/Utils/Monad.hs Changes: ===================================== compiler/GHC/Rename/Utils.hs ===================================== @@ -20,7 +20,7 @@ module GHC.Rename.Utils ( DeprecationWarnings(..), warnIfDeprecated, checkUnusedRecordWildcard, badQualBndrErr, typeAppErr, badFieldConErr, - wrapGenSpan, genHsVar, genLHsVar, genHsApp, genHsApps, genHsApps', genHsExpApps, + wrapGenSpan, wrapNoSpan, genHsVar, genLHsVar, genHsApp, genHsApps, genHsApps', genHsExpApps, genLHsApp, genAppType, genLHsLit, genHsIntegralLit, genHsTyLit, genSimpleConPat, genVarPat, genWildPat, @@ -706,6 +706,12 @@ wrapGenSpan :: (HasAnnotation an) => a -> GenLocated an a -- See Note [Rebindable syntax and XXExprGhcRn] wrapGenSpan x = L (noAnnSrcSpan generatedSrcSpan) x +wrapNoSpan :: (HasAnnotation an) => a -> GenLocated an a +-- Wrap something in a "noSrcSpan" +-- See Note [Rebindable syntax and XXExprGhcRn] +wrapNoSpan x = L (noAnnSrcSpan noSrcSpan) x + + -- | Make a 'SyntaxExpr' from a 'Name' (the "rn" is because this is used in the -- renamer). mkRnSyntaxExpr :: Name -> SyntaxExprRn ===================================== compiler/GHC/Tc/Gen/Do.hs ===================================== @@ -18,7 +18,7 @@ module GHC.Tc.Gen.Do (expandDoStmts) where import GHC.Prelude -import GHC.Rename.Utils ( wrapGenSpan, genHsExpApps, genHsApp, genHsLet, +import GHC.Rename.Utils ( wrapGenSpan, wrapNoSpan, genHsExpApps, genHsApp, genHsLet, genHsLamDoExp, genHsCaseAltDoExp, genWildPat ) import GHC.Rename.Env ( irrefutableConLikeRn ) @@ -126,7 +126,7 @@ expand_do_stmts doFlavour (stmt@(L loc (BodyStmt _ e (SyntaxExprRn then_op) _)) -- e ; stmts ~~> (>>) e stmts' do expand_stmts_expr <- expand_do_stmts doFlavour lstmts let expansion = genHsExpApps then_op -- (>>) - [ e + [ e -- Span is set becuase of statement loc , expand_stmts_expr ] return $ L loc (mkExpandedStmt stmt doFlavour expansion) ===================================== compiler/GHC/Tc/Gen/Head.hs ===================================== @@ -1109,5 +1109,4 @@ addExprCtxt e thing_inside -- f x = _ -- when we don't want to say "In the expression: _", -- because it is mentioned in the error message itself - XExpr (ExpandedThingRn o _) -> setInGeneratedCode o thing_inside _ -> addErrCtxt (ExprCtxt e) thing_inside -- no op in generated code ===================================== compiler/GHC/Tc/Types/LclEnv.hs ===================================== @@ -25,6 +25,7 @@ module GHC.Tc.Types.LclEnv ( , setLclEnvSrcCodeOrigin , setLclCtxtSrcCodeOrigin , lclEnvInGeneratedCode + , setLclCtxtInGenCode , addLclEnvErrCtxt @@ -206,6 +207,9 @@ getLclEnvSrcCodeOrigin = get_src_code_origin . tcl_err_ctxt . tcl_lcl_ctxt setLclEnvSrcCodeOrigin :: SrcCodeOrigin -> TcLclEnv -> TcLclEnv setLclEnvSrcCodeOrigin o = modifyLclCtxt (setLclCtxtSrcCodeOrigin o) +setLclCtxtInGenCode :: TcLclCtxt -> TcLclCtxt +setLclCtxtInGenCode lclCtxt = lclCtxt { tcl_in_gen_code = True } + -- See Note [ErrCtxt Stack Manipulation] setLclCtxtSrcCodeOrigin :: SrcCodeOrigin -> TcLclCtxt -> TcLclCtxt setLclCtxtSrcCodeOrigin o lclCtxt ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -985,10 +985,10 @@ inGeneratedCode = lclEnvInGeneratedCode <$> getLclEnv setSrcSpan :: SrcSpan -> TcRn a -> TcRn a -- See Note [Error contexts in generated code] setSrcSpan (RealSrcSpan loc _) thing_inside - = updLclCtxt (\env -> env { tcl_loc = loc }) thing_inside + = updLclCtxt (\env -> env { tcl_loc = loc, tcl_in_gen_code = False }) thing_inside setSrcSpan (UnhelpfulSpan _) thing_inside - = thing_inside + = updLclCtxt setLclCtxtInGenCode thing_inside getSrcCodeOrigin :: TcRn (Maybe SrcCodeOrigin) getSrcCodeOrigin = getLclEnvSrcCodeOrigin <$> getLclEnv @@ -999,6 +999,7 @@ getSrcCodeOrigin = getLclEnvSrcCodeOrigin <$> getLclEnv -- See Note [Error Context Stack] setInGeneratedCode :: SrcCodeOrigin -> TcRn a -> TcRn a setInGeneratedCode sco thing_inside = + updLclCtxt setLclCtxtInGenCode $ updLclCtxt (setLclCtxtSrcCodeOrigin sco) thing_inside setSrcSpanA :: EpAnn ann -> TcRn a -> TcRn a View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/106e67d29460c92da4fe57d1b2facc0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/106e67d29460c92da4fe57d1b2facc0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] Naming and comments only [skip ci]
by Simon Peyton Jones (＠simonpj) 22 Sep '25

22 Sep '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 1c820972 by Simon Peyton Jones at 2025-09-22T09:09:57+01:00 Naming and comments only [skip ci] - - - - - 3 changed files: - compiler/GHC/Tc/Instance/FunDeps.hs - compiler/GHC/Tc/Solver/FunDeps.hs - compiler/GHC/Tc/Solver/Monad.hs Changes: ===================================== compiler/GHC/Tc/Instance/FunDeps.hs ===================================== @@ -11,7 +11,7 @@ -- -- It's better to read it as: "if we know these, then we're going to know these" module GHC.Tc.Instance.FunDeps - ( FunDepEqn(..) + ( FunDepEqns(..) , pprEquation , improveFromInstEnv , improveFromAnother @@ -63,17 +63,17 @@ Each functional dependency with one variable in the RHS is responsible for generating a single equality. For instance: class C a b | a -> b The constraints ([Wanted] C Int Bool) and [Wanted] C Int alpha -will generate the following FunDepEqn - FDEqn { fd_qtvs = [] - , fd_eqs = [Pair Bool alpha] } +will generate the following FunDepEqns + FDEqns { fd_qtvs = [] + , fd_eqs = [Pair Bool alpha] } However notice that a functional dependency may have more than one variable in the RHS which will create more than one pair of types in fd_eqs. Example: class C a b c | a -> b c [Wanted] C Int alpha alpha [Wanted] C Int Bool beta Will generate: - FDEqn { fd_qtvs = [] - , fd_eqs = [Pair Bool alpha, Pair alpha beta] } + FDEqns { fd_qtvs = [] + , fd_eqs = [Pair Bool alpha, Pair alpha beta] } INVARIANT: Corresponding types aren't already equal That is, there exists at least one non-identity equality in FDEqs. @@ -85,8 +85,8 @@ Assume: instance C Int Bool [W] C Int ty -Then `improveFromInstEnv` should return a FDEqn with - FDEqno { fd_qtvs = [], fd_eqs = [Pair Bool ty] } +Then `improveFromInstEnv` should return a FunDepEqns with + FDEqns { fd_qtvs = [], fd_eqs = [Pair Bool ty] } describing an equality (Bool ~ ty). To do this we /match/ the instance head against the [W], using just the LHS of the fundep; if we match, we return @@ -103,8 +103,8 @@ Wrinkles: Note that although the `Int` parts match, that does not fix what `x` is. So we just make up a fresh unification variable (a meta_tv), to give the - "shape" of the RHS. So we emit the FDEqun - FDEqn { fd_qtvs = [x], fd_eqs = [Pair (Maybe x) ty] } + "shape" of the RHS. So we emit the FunDepEqns + FDEqns { fd_qtvs = [x], fd_eqs = [Pair (Maybe x) ty] } Note that the fd_qtvs can be free in the /first/ component of the Pair, but not in the second (which comes from the [W] constraint). @@ -116,36 +116,39 @@ Wrinkles: instance D Int x (Maybe x) [W] D Int Bool ty - Then we'll generate + Then we'll generate one FunDepEqns with two TypeEqns in it: FDEqn { fd_qtvs = [x0], fd_eqs = [ x0 ~ Bool, Maybe x0 ~ ty] } which generates one fresh unification variable x0 - But if the fundeps had been (a->b, a->c) we'd generate two FDEqns - FDEqn { fd_qtvs = [x1], fd_eqs = [ x1 ~ Bool ] } - FDEqn { fd_qtvs = [x2], fd_eqs = [ Maybe x2 ~ ty ] } + But if the fundeps had been (a->b, a->c) we'd generate two separate FDEqns + FDEqns { fd_qtvs = [x1], fd_eqs = [ x1 ~ Bool ] } + FDEqns { fd_qtvs = [x2], fd_eqs = [ Maybe x2 ~ ty ] } with two FDEqns, generating two separate unification variables. + This is why fd_eqs is a [TypeEqn] not just a TypeEqn + (IMP3) improveFromInstEnv doesn't return any equations that already hold. Reason: just an optimisation; the caller does the same thing, but with a bit more ceremony. -} -data FunDepEqn - = FDEqn { fd_qtvs :: [TyVar] -- Instantiate these type and kind vars +data FunDepEqns -- Plural becuase fd_eqs has multiple equations + -- See (IMP2) above + = FDEqns { fd_qtvs :: [TyVar] -- Instantiate these type and kind vars -- to fresh unification vars, -- See (IMP2) in Note [Improving against instances] - , fd_eqs :: [TypeEqn] -- Make these pairs of types equal + , fd_eqs :: [TypeEqn] -- Make these pairs of types equal -- Invariant: In each (Pair ty1 ty2), the fd_qtvs may be -- free in ty1 but not in ty2. See Wrinkle (1) of -- Note [Improving against instances] - } + } -instance Outputable FunDepEqn where +instance Outputable FunDepEqns where ppr = pprEquation -pprEquation :: FunDepEqn -> SDoc -pprEquation (FDEqn { fd_qtvs = qtvs, fd_eqs = pairs }) +pprEquation :: FunDepEqns -> SDoc +pprEquation (FDEqns { fd_qtvs = qtvs, fd_eqs = pairs }) = vcat [text "forall" <+> braces (pprWithCommas ppr qtvs), nest 2 (vcat [ ppr t1 <+> text "~" <+> ppr t2 | Pair t1 t2 <- pairs])] @@ -202,14 +205,14 @@ zipAndComputeFDEqs _ _ _ = [] -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ improveFromAnother :: PredType -- Template item (usually given, or inert) -> PredType -- Workitem [that can be improved] - -> [FunDepEqn] + -> [FunDepEqns] -- Post: FDEqs always oriented from the other to the workitem -- Equations have empty quantified variables improveFromAnother pred1 pred2 | Just (cls1, tys1) <- getClassPredTys_maybe pred1 , Just (cls2, tys2) <- getClassPredTys_maybe pred2 , cls1 == cls2 - = [ FDEqn { fd_qtvs = [], fd_eqs = eqs } + = [ FDEqns { fd_qtvs = [], fd_eqs = eqs } | let (cls_tvs, cls_fds) = classTvsFds cls1 , fd <- cls_fds , let (ltys1, rs1) = instFD fd cls_tvs tys1 @@ -226,12 +229,12 @@ improveFromAnother _ _ = [] improveFromInstEnv :: InstEnvs -> Class -> [Type] - -> [FunDepEqn] -- Needs to be a FunDepEqn because - -- of quantified variables + -> [FunDepEqns] -- Needs to be a FunDepEqn because + -- of quantified variables -- See Note [Improving against instances] -- Post: Equations oriented from the template (matching instance) to the workitem! improveFromInstEnv inst_env cls tys - = [ FDEqn { fd_qtvs = meta_tvs, fd_eqs = eqs } + = [ FDEqns { fd_qtvs = meta_tvs, fd_eqs = eqs } | fd <- cls_fds -- Iterate through the fundeps first, -- because there often are none! , let trimmed_tcs = trimRoughMatchTcs cls_tvs fd rough_tcs ===================================== compiler/GHC/Tc/Solver/FunDeps.hs ===================================== @@ -45,19 +45,19 @@ import Data.Maybe( mapMaybe ) Here is our plan for dealing with functional dependencies * When we have failed to solve a Wanted constraint, do this - 1. Generate any fundep-equalities [FunDepEqn] from that constraint. - 2. Try to solve that [FunDepEqn] + 1. Generate any fundep-equalities [FunDepEqns] from that constraint. + 2. Try to solve that [FunDepEqns] 3. If any unifications happened, send the constraint back to the start of the pipeline -* Step (1) How we generate those [FunDepEqn] varies: +* Step (1) How we generate those [FunDepEqns] varies: - tryDictFunDeps: for class constraints (C t1 .. tn) we look at top-level instances and inert Givens - tryEqFunDeps: for type-family equalities (F t1 .. tn ~ ty) we look at top-level family instances and inert Given family equalities -* Step (2). We use `solveFunDeps` to solve the [FunDepEqn] in a nested +* Step (2). We use `solveFunDeps` to solve the [FunDepEqns] in a nested solver. Key property: The ONLY effect of `solveFunDeps` is possibly to perform unifications: @@ -169,14 +169,14 @@ Why? Because if we do (YES) we'll think we have made some progress (some unification has happened), and hence go round again; but actually all we have done is to replace `alpha` with `gamma1`. -These "fresh unification variables" in fundep-equalities are ubituitous. +These "fresh unification variables" in fundep-equalities are ubiquitous. For example class C a b | a -> b instance .. => C Int [x] If we see [W] C Int alpha we'll generate a fundep-equality [W] alpha ~ [beta1] -where `beta1` is one of those "fresh unification variables +where `beta1` is one of those "fresh unification variables" This problem shows up in several guises; see (at the bottom) * Historical Note [Improvement orientation] @@ -184,10 +184,10 @@ This problem shows up in several guises; see (at the bottom) The solution is super-simple: - * A fundep-equality is described by `FunDepEqn`, whose `fd_qtvs` field explicitly + * A fundep-equality is described by `FunDepEqns`, whose `fd_qtvs` field explicitly lists the "fresh variables" - * Function `instantiateFunDepEqn` instantiates a `FunDepEqn`, and CRUCIALLY + * Function `instantiateFunDepEqn` instantiates a `FunDepEqns`, and CRUCIALLY gives the new unification variables a level one deeper than the current level. @@ -196,8 +196,8 @@ The solution is super-simple: Note [Deeper level on the left]. That ensures that the fresh `gamma1` will be eliminated in favour of `alpha`. Hooray. - * Better still, we solve the [FunDepEqn] with - solveFunDeps :: CtEvidence -> [FunDepEqn] -> TcS Bool + * Better still, we solve the [FunDepEqns] with + solveFunDeps :: CtEvidence -> [FunDepEqns] -> TcS Bool It uses `reportUnifications` to see if any unification happened at this level or outside -- that is, it does NOT report unifications to the fresh unification variables. So `solveFunDeps` returns True only if it @@ -320,7 +320,7 @@ tryDictFunDepsLocal dict_ct@(DictCt { di_cls = cls, di_ev = work_ev }) ; traceTcS "tryDictFunDepsLocal {" (ppr dict_ct) - ; let eqns :: [FunDepEqn] + ; let eqns :: [FunDepEqns] eqns = foldr ((++) . do_interaction) [] $ findDictsByClass (inert_dicts inerts) cls ; imp <- solveFunDeps work_ev eqns @@ -335,7 +335,7 @@ tryDictFunDepsLocal dict_ct@(DictCt { di_cls = cls, di_ev = work_ev }) work_pred = ctEvPred work_ev work_is_given = isGiven work_ev - do_interaction :: DictCt -> [FunDepEqn] + do_interaction :: DictCt -> [FunDepEqns] do_interaction (DictCt { di_ev = inert_ev }) -- This can be Given or Wanted | work_is_given && isGiven inert_ev -- Do not create FDs from Given/Given interactions @@ -353,7 +353,7 @@ tryDictFunDepsTop dict_ct@(DictCt { di_ev = ev, di_cls = cls, di_tys = xis }) do { inst_envs <- getInstEnvs ; traceTcS "tryDictFunDepsTop {" (ppr dict_ct) - ; let eqns :: [FunDepEqn] + ; let eqns :: [FunDepEqns] eqns = improveFromInstEnv inst_envs cls xis ; imp <- solveFunDeps ev eqns ; traceTcS "tryDictFunDepsTop }" (text "imp =" <+> ppr imp) @@ -466,7 +466,7 @@ tryFamEqFunDeps fam_tc args work_item@(EqCt { eq_ev = ev, eq_rhs = rhs }) | otherwise = nopStage () -tryFDEqns :: TyCon -> [TcType] -> EqCt -> TcS [FunDepEqn] -> SolverStage () +tryFDEqns :: TyCon -> [TcType] -> EqCt -> TcS [FunDepEqns] -> SolverStage () tryFDEqns fam_tc work_args work_item@(EqCt { eq_ev = ev, eq_rhs= rhs }) mk_fd_eqns = Stage $ do { fd_eqns <- mk_fd_eqns @@ -481,7 +481,7 @@ tryFDEqns fam_tc work_args work_item@(EqCt { eq_ev = ev, eq_rhs= rhs }) mk_fd_eq ----------------------------------------- -- User-defined type families ----------------------------------------- -mkTopUserFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqn] +mkTopUserFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] -- Implements (INJFAM:Wanted/top) mkTopUserFamEqFDs fam_tc inj_flags work_args work_rhs = do { fam_envs <- getFamInstEnvs @@ -499,7 +499,7 @@ mkTopUserFamEqFDs fam_tc inj_flags work_args work_rhs | otherwise = [] - do_one :: CoAxBranch -> Maybe FunDepEqn + do_one :: CoAxBranch -> Maybe FunDepEqns do_one branch@(CoAxBranch { cab_tvs = branch_tvs , cab_lhs = branch_lhs_tys , cab_rhs = branch_rhs }) @@ -525,7 +525,7 @@ mkTopUserFamEqFDs fam_tc inj_flags work_args work_rhs !(subst', tvs') = trim_qtvs subst1 tvs in (subst', tv':tvs') -mkLocalUserFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqn] +mkLocalUserFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] mkLocalUserFamEqFDs fam_tc inj_flags work_args work_rhs = do { fun_eqs_for_me <- getInertFamEqsFor fam_tc @@ -538,7 +538,7 @@ mkLocalUserFamEqFDs fam_tc inj_flags work_args work_rhs ; return (eqns_from_inerts ++ eqns_from_self) } where - do_one :: EqCt -> Maybe FunDepEqn + do_one :: EqCt -> Maybe FunDepEqns do_one (EqCt { eq_lhs = TyFamLHS _ inert_args, eq_rhs = inert_rhs }) | work_rhs `tcEqType` inert_rhs = Just (mk_eqn inert_args) | otherwise = Nothing @@ -604,24 +604,24 @@ tryGivenBuiltinFamEqFDs fam_tc ops work_args (EqCt { eq_ev = work_ev, eq_rhs = w do_one _ = return () -mkTopBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> Xi -> TcS [FunDepEqn] +mkTopBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> Xi -> TcS [FunDepEqns] mkTopBuiltinFamEqFDs fam_tc ops work_args work_rhs - = return [FDEqn { fd_qtvs = [] - , fd_eqs = map snd $ tryInteractTopFam ops fam_tc work_args work_rhs }] + = return [FDEqns { fd_qtvs = [] + , fd_eqs = map snd $ tryInteractTopFam ops fam_tc work_args work_rhs }] -mkLocalBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> Xi -> TcS [FunDepEqn] +mkLocalBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> Xi -> TcS [FunDepEqns] mkLocalBuiltinFamEqFDs fam_tc ops work_args work_rhs = do { fun_eqs_for_me <- getInertFamEqsFor fam_tc - ; let do_one :: EqCt -> [FunDepEqn] + ; let do_one :: EqCt -> [FunDepEqns] do_one (EqCt { eq_lhs = TyFamLHS _ inert_args, eq_rhs = inert_rhs }) | inert_rhs `tcEqType` work_rhs = [mk_eqn inert_args] | otherwise = [] do_one _ = pprPanic "interactFunEq 1" (ppr fam_tc) -- TyVarLHS - mk_eqn :: [TcType] -> FunDepEqn - mk_eqn iargs = FDEqn { fd_qtvs = [] - , fd_eqs = map snd $ tryInteractInertFam ops fam_tc + mk_eqn :: [TcType] -> FunDepEqns + mk_eqn iargs = FDEqns { fd_qtvs = [] + , fd_eqs = map snd $ tryInteractInertFam ops fam_tc work_args iargs } ; let eqns_from_inerts = concatMap do_one fun_eqs_for_me @@ -634,12 +634,12 @@ mkLocalBuiltinFamEqFDs fam_tc ops work_args work_rhs mkInjectivityFDEqn :: [Bool] -- Injectivity flags -> [TcTyVar] -- Quantify these -> [TcType] -> [TcType] -- Make these equal - -> FunDepEqn + -> FunDepEqns -- When F s1 s2 s3 ~ F t1 t2 t3, and F has injectivity info [True,False,True] --- return the FDEqn { fd_eqs = [Pair s1 t1, Pair s3 t3] } +-- return the FDEqns { fd_eqs = [Pair s1 t1, Pair s3 t3] } -- The injectivity flags [Bool] will not all be False, but nothing goes wrong if they are mkInjectivityFDEqn inj_args qtvs lhs_args rhs_args - = FDEqn { fd_qtvs = qtvs, fd_eqs = eqs } + = FDEqns { fd_qtvs = qtvs, fd_eqs = eqs } where eqs = [ Pair lhs_arg rhs_arg | (True, lhs_arg, rhs_arg) <- zip3 inj_args lhs_args rhs_args ] @@ -669,19 +669,19 @@ For /injective/, /user-defined/ type families * (INJFAM:Wanted/Self) see `mkLocalUserFamEqFDs` work item: [W] F s1 s2 ~ F t1 t2 - We can generate FDEqn (s2 ~ t2) + We can generate FunDepEqns: (s2 ~ t2) * (INJFAM:Wanted/other) see `mkLocalUserFamEqFDs` work item: [W] F s1 s2 ~ rhs -- Wanted inert: [G/W] F t2 t2 ~ rhs -- Same `rhs`, Given or Wanted - We can generate FDEqn (s2 ~ t2) + We can generate FunDepEqns: (s2 ~ t2) * (INJFAM:Wanted/top) see `mkTopUserFamEqFDs` work item: [W] F s1 s2 ~ rhs type instance forall a b c. F t1 t2 ~ top_rhs and we can /match/ the LHS, so that S(top_rhs) = rhs - then we can generate the FDEqn forall a c. s2 ~ S(t2) + then we can generate the FunDepEqns: forall a c. s2 ~ S(t2) But see wrinkle (TIF1), (TIF2) For /built-in/ type families, it's pretty similar, except that @@ -703,10 +703,10 @@ For /built-in/ type families, it's pretty similar, except that [W] F @kappa alpha beta ~ Maybe (Proxy @kappa (delta::kappa)) we match (Proxy @kappa delta) against the template (Proxy k a), succeeding - with substitution [k:->kappa, a:->delta]. We want to generate this FunDepEqn + with substitution [k:->kappa, a:->delta]. We want to generate this FunDepEqns FDEqn { fd_qtvs = [b:kappa], fd_eqs = [ beta ~ Proxy @kappa b ] } Notice that - * we must quantify the FunDepEqn over `b`, which is not matched; for this + * we must quantify the FunDepEqns over `b`, which is not matched; for this we will generate a fresh unfication variable in `instantiateFunDepEqn`. * we must substitute `k:->kappa` in the kind of `b`. This fancy footwork for `fd_qtvs` is done by `trim_qtvs` in @@ -756,7 +756,7 @@ solving. ********************************************************************* -} solveFunDeps :: CtEvidence -- The work item - -> [FunDepEqn] + -> [FunDepEqns] -> TcS Bool -- Solve a bunch of type-equality equations, generated by functional dependencies -- By "solve" we mean: (only) do unifications. We do not generate evidence, and @@ -784,12 +784,12 @@ solveFunDeps work_ev fd_eqns do_fundeps :: UnifyEnv -> TcM () do_fundeps env = mapM_ (do_one env) fd_eqns - do_one :: UnifyEnv -> FunDepEqn -> TcM () + do_one :: UnifyEnv -> FunDepEqns -> TcM () do_one uenv eqn = do { eqs <- instantiateFunDepEqn eqn ; uPairsTcM uenv eqs } -instantiateFunDepEqn :: FunDepEqn -> TcM [TypeEqn] -instantiateFunDepEqn (FDEqn { fd_qtvs = tvs, fd_eqs = eqs }) +instantiateFunDepEqn :: FunDepEqns -> TcM [TypeEqn] +instantiateFunDepEqn (FDEqns { fd_qtvs = tvs, fd_eqs = eqs }) | null tvs = return rev_eqs | otherwise ===================================== compiler/GHC/Tc/Solver/Monad.hs ===================================== @@ -1227,9 +1227,10 @@ nestFunDepsTcS (TcS thing_inside) TcM.pushTcLevelM_ $ -- pushTcLevelTcM: increase the level so that unification variables -- allocated by the fundep-creation itself don't count as useful unifications + -- See Note [Partial functional dependencies] in GHC.Tc.Solver.FunDeps do { inerts <- TcM.readTcRef inerts_var ; let nest_inerts = resetInertCans inerts - -- resetInertCasns: like nestImplicTcS + -- resetInertCans: like nestImplicTcS ; new_inert_var <- TcM.newTcRef nest_inerts ; new_wl_var <- TcM.newTcRef emptyWorkList ; let nest_env = env { tcs_inerts = new_inert_var View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1c8209726ea8e2fc992e1248688a1f0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1c8209726ea8e2fc992e1248688a1f0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new tag ghc-9.12.3-rc1
by Zubin (＠wz1000) 22 Sep '25

22 Sep '25

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

1 0

[Git][ghc/ghc][ghc-9.12] 123 commits: mkTick: Push ticks through unsafeCoerce#.
by Zubin (＠wz1000) 22 Sep '25

22 Sep '25

Zubin pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC Commits: 799e903f by Andreas Klebinger at 2025-08-20T15:29:27+05:30 mkTick: Push ticks through unsafeCoerce#. unsafeCoerce# doesn't exist at runtime so we should treat it like a Cast for the purpose of mkTick. This means if we have `{-# SCC foo #-} (unsafeCoerce# trivial_expr))` we now push the scope part of the cost centre up to `trivial_expr` at which point we can discard it completely if the expression is trivial enough. This fixes #25212. (cherry picked from commit edf3bdf57501beb3372eaa0a9602f1094cdf30d1) - - - - - 397e96ed by Simon Peyton Jones at 2025-08-20T15:29:53+05:30 Add a missing tidy in UnivCo We were failing to tidy the argument coercions of a UnivCo, which led directly to #25391. The fix is, happily, trivial. I don't have a small repro case (it came up when building horde-ad, which uses typechecker plugins). It should be possible to make a repro case, by using a plugin (which builds a UnivCo) but I decided it was not worth the bother. The bug is egregious and easily fixed. (cherry picked from commit 9f02dfb502dda37fc50c66ce7ebd55cc36350a45) - - - - - c1967c97 by Arnaud Spiwack at 2025-08-20T15:30:55+05:30 Add test for #25428 (cherry picked from commit e6c957e49260230c4cb297aeec16be3293381fb7) - - - - - 732eb9ea by Arnaud Spiwack at 2025-08-20T15:33:04+05:30 Don't bypass MonoLocalBind in empty patterns Fixes #25428 (cherry picked from commit 52d97f4ecd37bf598560dbded2d50649db5cfe1d) - - - - - bf93f50e by Sylvain Henry at 2025-08-20T15:33:52+05:30 TNTC: set CmmProc entry_label properly (#25565) Before this patch we were renaming the entry label of a CmmProc late in the CmmToAsm pass. It led to inconsistencies and to some labels being used in info tables but not being emitted (#25565). Now we set the CmmProc entry label earlier in the StgToCmm monad and we don't renamed it afterwards. (cherry picked from commit 62a2b25f6cd1947c85a7d847a8f88bb0de5d80fd) - - - - - f7000198 by ARATA Mizuki at 2025-08-20T15:34:08+05:30 LLVM: When emitting a vector literal with ppTypeLit, include the type information Fixes #25561 (cherry picked from commit 2d3a0a70def8a2044f2954b29df1a186b3f08dcc) - - - - - 46365cb8 by Ben Gamari at 2025-08-20T15:34:33+05:30 testsuite: Use math.inf instead of division-by-zero This both more directly captures the intent and also fixes #25580. (cherry picked from commit e86b1b2013e3fcf51a753d2acfee4e50f8fc69f5) - - - - - 4c287ca8 by Ben Gamari at 2025-08-20T15:34:55+05:30 rts: Fix incorrect format specifiers in era profiling Fixes #25581. (cherry picked from commit 430d965a176d6c9e629d169fa0606923275c8332) - - - - - 483c4a31 by Simon Peyton Jones at 2025-08-20T15:37:46+05:30 Preserve orientation when unifying kinds This MR fixes yet another manifestation of the trickiness caused by Note [Fundeps with instances, and equality orientation]. I wish there was a more robust way to do this, but this fix is a definite improvement. Fixes #25597 (cherry picked from commit 63d63f9d3e074c3bcf5b526ee14e50cb2b6b9d70) - - - - - 21072c17 by ARATA Mizuki at 2025-08-20T15:38:12+05:30 Fix LLVM version detection With a recent LLVM, `llc -version` emits the version on the first line if the vendor is set. It emits the version on the second line otherwise. Therefore, we need to check the both lines to detect the version. GHC now emits a warning if it fails to detect the LLVM version, so we can notice if the output of `llc -version` changes in the future. Also, the warning for using LLVM < 10 on s390x is removed, because we assume LLVM >= 13 now. This fixes the definition of __GLASGOW_HASKELL_LLVM__ macro. Fixes #25606 (cherry picked from commit a928c326011f1a6bef3289a4c36d4e19b5951229) - - - - - 5cd8d769 by Cheng Shao at 2025-08-20T15:38:33+05:30 xxhash: bump to v0.8.3 (cherry picked from commit 42826a8941ecedd329844b675e26d30bdb6cd46b) - - - - - 11941cee by ARATA Mizuki at 2025-08-20T15:40:15+05:30 x86 NCG: Use correct format for MOVD in the implementation of unpackInt64X2# MOVD takes the input format. Fixes #25658 (cherry picked from commit 5a8f35bd5d9735d7846a53bc9d08d8eeb67bccb5) - - - - - 46b5d650 by Simon Peyton Jones at 2025-08-20T15:40:43+05:30 Fix a buglet in tcSplitForAllTyVarsReqTVBindersN The problem was that an equation in `split` had two guards (one about visiblity and one about `n_req`). So it fell thorugh if /either/ was False. But the next equation then assumed an invisible binder. Simple bug, easily fixed. Fixes #25661. (cherry picked from commit 854c2f753dddeaa31d2988704cedf651f9fb7958) - - - - - cef837ef by Ben Gamari at 2025-08-20T15:43:50+05:30 compiler: Fix CPP guards around ghc_unique_counter64 The `ghc_unique_counter64` symbol was introduced in the RTS in the 64-bit unique refactor (!10568) which has been backported to %9.6.7 and %9.8.4. Update the CPP to reflect this. Fixes #25576. (cherry picked from commit 595013d41464c1e328369bb81ce0ea2814e91b68) - - - - - 11df3b8d by Jens Petersen at 2025-08-20T15:44:46+05:30 hp2ps/Utilities.c: add extern parameter types for malloc and realloc for C23 Fix build with gcc-15 which defaults to C23 standard (-std=gnu23) Fixes #25662 ``` utils/hp2ps/Utilities.c:6:14: error: warning: conflicting types for built-in function ‘malloc’; expected ‘void *(long unsigned int)’ [-Wbuiltin-declaration-mismatch] 6 | extern void* malloc(); | ^~~~~~ | 6 | extern void* malloc(); | ^ utils/hp2ps/Utilities.c:5:1: error: note: ‘malloc’ is declared in header ‘<stdlib.h>’ 4 | #include "Error.h" +++ |+#include <stdlib.h> 5 | | 5 | | ^ utils/hp2ps/Utilities.c: In function ‘xmalloc’: utils/hp2ps/Utilities.c:80:17: error: error: too many arguments to function ‘malloc’; expected 0, have 1 80 | r = (void*) malloc(n); | ^~~~~~ ~ | 80 | r = (void*) malloc(n); | ^ utils/hp2ps/Utilities.c:6:14: error: note: declared here 6 | extern void* malloc(); | ^~~~~~ | 6 | extern void* malloc(); | ^ utils/hp2ps/Utilities.c: In function ‘xrealloc’: utils/hp2ps/Utilities.c:92:18: error: warning: conflicting types for built-in function ‘realloc’; expected ‘void *(void *, long unsigned int)’ [-Wbuiltin-declaration-mismatch] 92 | extern void *realloc(); | ^~~~~~~ | 92 | extern void *realloc(); | ^ utils/hp2ps/Utilities.c:92:18: error: note: ‘realloc’ is declared in header ‘<stdlib.h>’ | 92 | extern void *realloc(); | ^ utils/hp2ps/Utilities.c:94:9: error: error: too many arguments to function ‘realloc’; expected 0, have 2 94 | r = realloc(p, n); | ^~~~~~~ ~ | 94 | r = realloc(p, n); | ^ utils/hp2ps/Utilities.c:92:18: error: note: declared here 92 | extern void *realloc(); | ^~~~~~~ | 92 | extern void *realloc(); | ^ ``` (cherry picked from commit f983a00ffc97b779eb52b10e69e254ec107f8311) - - - - - 95f31d16 by Brandon Chinn at 2025-08-20T15:45:17+05:30 Break out GHC.Parser.Lexer.Interface (cherry picked from commit 4495e48ff8024950cf4448d274c56a8eb195f69c) - - - - - d51a80e1 by Brandon Chinn at 2025-08-20T15:45:26+05:30 Fix lexing comments in multiline strings (#25609) Metric Decrease: MultiLayerModulesRecomp parsing001 (cherry picked from commit 4f8fc11e45fc5e7311572bb16a60b1f756b536c6) - - - - - c1542284 by Jens Petersen at 2025-08-20T15:46:15+05:30 hp2ps/Utilities.c: add extern parameter types for malloc and realloc for C23 use portable C types! (cherry picked from commit 70f7741acd9d50a6cc07553aeaae600afe4a72b8) - - - - - 46b13f90 by Jeffrey Young at 2025-08-20T15:47:50+05:30 base: add SrcLoc changes to changelog, 4.21.0.0 I accidentally dropped this in !13381 - closes #25614 See: - ea4587794b9e3a098f9c02bd6cea2294af2539ce (the 13381 commit) - Issue #25614 (cherry picked from commit 8071bad8b185bc9d0f71e08b6520a5d5705e2636) - - - - - 2c01680d by Matthew Pickering at 2025-08-20T15:48:06+05:30 bytecode: Do not generate `SLIDE x 0` instructions SLIDE x 0 is a no-op as it means to shift x elements of the stack by no spaces. In the interpreter, this results in a loop which copies an array element into the same place. I have instrumented GHCi to count how many of these instructions are interpreted. The workload was `ghc` compiling two simple modules. Total no-op slides: 7793476 Total slides: 11413289 Percentage useless (slides): 68% Percentage uselss of total instructions: 9% (cherry picked from commit bf8c7d6edf224c083c90ab3ddac49979ac18ad39) - - - - - c0b6e6b6 by Peter Trommler at 2025-08-20T15:50:24+05:30 RTS: Fix compile on powerpc64 ELF v1 Cabal does not know about the different ABIs for powerpc64 and compiles StgCRunAsm.S unconditionally. The old make-based build system excluded this file from the build and it was OK to signal an error when it was compiled accidentally. With this patch we compile StgCRunAsm.S to an empty file, which fixes the build. Fixes #25700 (cherry picked from commit 05e5785a3157c71e327a8e9bdc80fa7082918739) - - - - - 1fa33a1c by Jens Petersen at 2025-08-20T15:50:40+05:30 hp2ps Utilities.c: include stdlib.h instead of extern malloc and realloc (cherry picked from commit 7596675e470699f6184e13c08b268972028bc868) - - - - - 443f21d6 by Cheng Shao at 2025-08-20T15:56:17+05:30 testsuite: fix InternalCounters test with +debug_ghc The `InternalCounters` test case fails when ghc is built with `+debug_ghc`. This patch skips it in that case and allows the testsuite to pass for the `+debug_ghc` flavour transformer. (cherry picked from commit 59b9307b239f0e1058ccc90ca2fadb86552c0308) - - - - - 5346ffc3 by Cheng Shao at 2025-08-20T15:56:33+05:30 wasm: fix dyld for shared libraries created by llvm 20.x This patch fixes wasm dyld script for shared libraries created by llvm 20.x. The __wasm_apply_data_relocs function is now optional and may be omitted for shared libraries without any runtime relocatable data segments, so only call __wasm_apply_data_relocs when it's present. (cherry picked from commit cb60da245b2fea7a0c39af0e58f9ef89104a9255) - - - - - 55fd5aaf by Cheng Shao at 2025-08-20T15:56:50+05:30 driver: fix wasm backend sysroot lookup logic when -flto is passed For the wasm target, the driver calls `wasm32-wasi-clang --print-search-dirs` and finds the sysroot directory that contains libc.so etc, then passes the directory path to dyld. However, when GHC is configured with -flto as a part of C/C++ compiler flags, the clang driver would insert a llvm-lto specific directory in the --print-search-dirs output and the driver didn't take that into account. This patch fixes it and always selects the non-lto sysroot directory to be passed to dyld. This is one small step towards supporting building all cbits with lto for wasm. (cherry picked from commit 7eea38c838c9d839e9efea0e6d9f79034e99fa4f) - - - - - 153ffd53 by sheaf at 2025-08-28T15:00:11+05:30 LLVM: account for register type in funPrologue We were not properly accounting for the live register type of global registers in GHC.CmmToLlvm.CodeGen.funPrologue. This meant that we could allocated a register at type <4 x i32> but try to write to it at type <8 x i16>, which LLVM doesn't much like. This patch fixes that by inserting intermerdiate casts when necessary. Fixes #25730 (cherry picked from commit 33aca30fbff67188fd5692cf40f1e2542663bfec) - - - - - f8451a02 by Cheng Shao at 2025-08-28T15:00:11+05:30 libffi: update to 3.4.7 Bumps libffi submodule. (cherry picked from commit c318be56f69eb87f1cbb219dd660f09498857ece) - - - - - 96e12616 by sheaf at 2025-08-28T15:00:11+05:30 Propagate long distance info to guarded let binds This commit ensures that we propagate the enclosing long distance information to let bindings inside guards, in order to get accurate pattern-match checking warnings, in particular incomplete record selector warnings. Example: data D = K0 | K1 { fld :: Int } f :: D -> Int f d@(K1 {}) | let i = fld d = i f _ = 3 We now correctly recognise that the field selector 'fld' cannot fail, due to the outer pattern match which guarantees that the value 'd' has the field 'fld'. Fixes #25749 (cherry picked from commit 0f2241e9758e8b74fedfe52269a8fb1ff17858cb) - - - - - f3e9739f by Fangyi Zhou at 2025-08-28T15:00:11+05:30 wasm: use primitive opcodes for fabs and sqrt - Add new `WasmInstr` constructor `WasmSqrt` for sqrt, corresponding to primitivie operations in wasm. - When lowering CallishMachOp, use `WasmAbs` and `WasmSqrt` for F32 and F64 fabs and sqrt. (cherry picked from commit 64b0d4d061902c0f7443355fa4877ff6aad946d5) - - - - - 551a0efe by Cheng Shao at 2025-08-28T15:00:11+05:30 ghc-heap: fix HalfWord incompatible Binary instances for cross GHC ghc-heap defines HalfWord as Word32/Word16 depending on host word size. For cross GHC with different host/target word sizes, the Binary instances are incompatible and breaks iserv serialization of any message type that involves HalfWord, breaking the ghci debugger. This patch fixes the issue and has been tested to fix ghci debugger functionality of the wasm backend. Fixes #25420 #25781. (cherry picked from commit b228fcb5313e82895493a6ef7f0a2e803695de02) - - - - - a4c912f6 by Andreas Klebinger at 2025-08-28T15:00:11+05:30 cmmMachOpFoldM: Add missing pattern matches for bitcasts. Fixes #25771 (cherry picked from commit 9c1647d1557834f277fe9d4040789c60c9ef8e3d) - - - - - 432772e0 by Teo Camarasu at 2025-08-28T15:00:11+05:30 ghc-boot-th: expose all TH packages from proper GHC.Boot.* modules Previously we defined some modules here in the GHC.Internal namespace. Others were merely re-exposed from GHC.Internal. Re-exposed modules weren't handled correctly by Haddock, so the Haddocks for the `template-haskell` library couldn't see them. This change also makes the home package of these modules a bit clearer. Work towards #25705 (cherry picked from commit f2d43e11302d7f0133c025f7847ac924b6e9303c) - - - - - 53bdefeb by Teo Camarasu at 2025-08-28T15:00:11+05:30 ghc-boot-th: fix synopsis formatting `@...@` syntax doesn't seem to work in synposes and is just kept by Haddock verbatim. (cherry picked from commit 91ef82df3b15bd35c660d6ca0882d7a19c93b3a1) - - - - - dcad4750 by Brandon Chinn at 2025-08-28T15:00:11+05:30 Collapse string gaps as \& (#25784) In 9.10, "\65\ \0" would result in "A0", but in 9.12, it results in "\650", due to the string refactoring I did in !13128. Previously, we were resolving escape codes and collapsing string gaps as we come across them, but after the refactor, string processing is broken out into phases, which is both more readable and useful for multiline strings. (cherry picked from commit eb9fe1ec0a1b35e4a9ceeafd7943dc95b3180fc3) - - - - - daa2c5b8 by Brandon Chinn at 2025-08-28T15:00:11+05:30 Fix lexing "\^\" (#25937) This broke in the refactor in !13128, where the old code parsed escape codes and collapsed string gaps at the same time, but the new code collapsed gaps first, then resolved escape codes. The new code used a naive heuristic to skip escaped backslashes, but didn't account for "\^\". (cherry picked from commit 6467d61ee8cdd6b611e035b72cbe356cbf90fa35) - - - - - 0dcc4f2a by Matthew Craven at 2025-08-28T15:00:11+05:30 Cmm: Add surface syntax for Word/Float bitcast ops (cherry picked from commit 1d4c9824bb3cb4b16cbab786021aad1576a65d7e) - - - - - 1378d2a3 by Matthew Craven at 2025-08-28T15:00:11+05:30 Cmm: Add constant-folding for Word->Float bitcasts (cherry picked from commit 25c4a2a236060232c929bf7f039f5f59d108f869) - - - - - bd8f5fa9 by Matthew Craven at 2025-08-28T15:00:11+05:30 Add tests for #25771 (cherry picked from commit 30bdea67fcd9755619b1f513d199f2122591b28e) - - - - - 3dc59fc0 by Vladislav Zavialov at 2025-08-28T15:00:11+05:30 Error message with EmptyCase and RequiredTypeArguments (#25004) Fix a panic triggered by a combination of \case{} and forall t -> ghci> let f :: forall (xs :: Type) -> (); f = \case {} panic! (the 'impossible' happened) GHC version 9.10.1: Util: only The new error message looks like this: ghci> let f :: forall (xs :: Type) -> (); f = \case {} <interactive>:5:41: error: [GHC-48010] • Empty list of alternatives in \case expression checked against a forall-type: forall xs -> ... This is achieved as follows: * A new data type, BadEmptyCaseReason, is now used to describe why an empty case has been rejected. Used in TcRnEmptyCase. * HsMatchContextRn is passed to tcMatches, so that the type checker can attach the syntactic context to the error message. * tcMatches now rejects type arguments if the list of alternatives is empty. This is what fixes the bug. (cherry picked from commit cce869ea2439bb16c284ce7ed71a173d54a8c9ad) (cherry picked from commit 41db0a0bea41679875fc392a45927419c182c1d9) - - - - - 7aa3de4b by Simon Peyton Jones at 2025-08-28T15:00:11+05:30 We can't UNPACK multi-constructor GADTs This MR fixes #25672 See Note [Unpacking GADTs and existentials] in GHC.Types.Id.Make (cherry picked from commit b6d5b09103dea97351774c5ab34082165504b997) - - - - - d8816e24 by sheaf at 2025-08-28T15:00:12+05:30 user's guide: consolidate defaulting documentation This commit adds a new section on defaulting, which consolidates various parts of documentation surrounding defaulting into one central place. It explains type class defaulting in detail, extensions to it with OverloadedStrings, NamedDefaults and ExtendedDefaultRules, as well as other defaulting mechanisms (e.g. kind-based defaulting such as RuntimeRep defaulting, and defaulting of equalities). (cherry picked from commit 37d8b50b6de8ee69ea26196fd3869fe0a83e5802) - - - - - 314267e3 by sheaf at 2025-08-28T15:00:12+05:30 user's guide: flesh out XOverloadedStrings docs This commit extends the documentation of the OverloadedStrings extension with some usage information, in particular suggestions to: - use default declarations, such as `default (Text)` or `default IsString(Text)` (with the NamedDefaults extension), - enable the ExtendedDefaultRules extension to relax the requirement that a defaultable type variable must only appear in unary standard classes Fixes #23388 (cherry picked from commit 0c9fd8d48ab018739ac146420c474367c98d9ab1) - - - - - bf063686 by sheaf at 2025-08-28T15:00:12+05:30 user's guide: NamedDefaults vs ExtendedDefaultRules This commit clarifies the defaulting rules with NamedDefaults, in particular in situations where a type variable appears in other constraints than standard/unary constraints. (cherry picked from commit 2df171d40b93c666a3aa8b616a47c9acf13f7189) - - - - - 2960ffa0 by Teo Camarasu at 2025-08-28T15:00:12+05:30 template-haskell: Add explicit exports lists to all remaining modules (cherry picked from commit 8eae151de9eb8f8fd0a41c1a33e25c63b1e1bb11) - - - - - 9baeb3e7 by sheaf at 2025-08-28T15:00:12+05:30 Don't report used duplicate record fields as unused This commit fixes the bug reported in #24035 in which the import of a duplicate record field could be erroneously reported as unused. The issue is that an import of the form "import M (fld)" can import several different 'Name's, and we should only report an error if ALL of those 'Name's are unused, not if ANY are. Note [Reporting unused imported duplicate record fields] in GHC.Rename.Names explains the solution to this problem. Fixes #24035 (cherry picked from commit 0cb1db9270e11469f11a2ccf323219e032c2a312) - - - - - c7dce9fd by ARATA Mizuki at 2025-08-28T15:00:12+05:30 Fix code generation for SSE vector operations The new implementation generates correct code even if the registers overlap. Closes #25859 (cherry picked from commit 25850b22e76a2c23f549caff38ccd0da134051de) - - - - - 979ecd67 by sheaf at 2025-08-28T15:00:12+05:30 Don't cache solved [W] HasCallStack constraints This commit ensures we do not add solved Wanted constraints that mention HasCallStack or HasExceptionContext constraints to the set of solved Wanted dictionary constraints: caching them is invalid, because re-using such cached dictionaries means using an old call-stack instead of constructing a new one, as was reported in #25529. Fixes #25529. (cherry picked from commit 256ac29c8df4f17a1d50ea243408d506ebf395d6) (cherry picked from commit 3b1ef0ae473c9ae52c1280f9f1577a7cbacdf5d4) - - - - - fd643c3a by Zubin Duggal at 2025-08-28T15:00:12+05:30 In commit "Don't cache solved [W] HasCallStack constraints" (256ac29c8df4f17a1d50ea243408d506ebf395d6), we attempt to use `tryM` to avoid errors when looking up certain known-key names like CallStack while compiling ghc-prim and ghc-internal. Unfortunately, `tryM` doesn't catch module lookup errors. This manifests as a failure to build ghc-prim in `--make` mode on the GHC 9.10 branch. Instead, we explicitly avoid doing lookups when we are compiling ghc-prim or ghc-internal instead of relying on catching the exception. (cherry picked from commit 7492d00749488b628139d5c3bd5fa4b33cc2e4ad) (cherry picked from commit efe1efedca6633a09e6999e25231716f9870745e) - - - - - 061105e4 by sheaf at 2025-08-28T15:00:12+05:30 LLVM: fix typo in padLiveArgs This commit fixes a serious bug in the padLiveArgs function, which was incorrectly computing too many padding registers. This caused segfaults, e.g. in the UnboxedTuples test. Fixes #25770 Fixes #25773 (cherry picked from commit 044a6e08c2aee23ef18c60a036e01d3b77168830) - - - - - c1546376 by sheaf at 2025-08-28T15:00:12+05:30 GHC settings: always unescape escaped spaces In #25204, it was noted that GHC didn't properly deal with having spaces in its executable path, as it would compute an invalid path for the C compiler. The original fix in 31bf85ee49fe2ca0b17eaee0774e395f017a9373 used a trick: escape spaces before splitting up flags into a list. This fixed the behaviour with extra flags (e.g. -I), but forgot to also unescape for non-flags, e.g. for an executable path (such as the C compiler). This commit rectifies this oversight by consistently unescaping the spaces that were introduced in order to split up argument lists. Fixes #25204 (cherry picked from commit aa1e3b8b5c9a92592b6a49783083da37dfc69375) (cherry picked from commit cf5d5a31e3033fc2beeab8578056f096cce0eaef) - - - - - 8fe9b012 by Andreas Klebinger at 2025-08-28T15:00:12+05:30 NCG: AArch64 - Add -finter-module-far-jumps. When enabled the arm backend will assume jumps to targets outside of the current module are further than 128MB away. This will allow for code to work if: * The current module results in less than 128MB of code. * The whole program is loaded within a 4GB memory region. We have seen a few reports of broken linkers (#24648) where this flag might allow a program to compile/run successfully at a very small performance cost. ------------------------- Metric Increase: T783 ------------------------- (cherry picked from commit f32d6c2b468c67fed619f2fa1fb97eb012afbb6e) - - - - - 905f682c by Adam Gundry at 2025-08-28T15:00:12+05:30 user's guide: update specification of overlapping/incoherent instances The description of the instance resolution algorithm in the user's guide was slightly out of date, because it mentioned in-scope given constraints only at the end, whereas the implementation checks for their presence before any of the other steps. This also adds a warning to the user's guide about the impact of incoherent instances on specialisation, and more clearly documents some of the other effects of `-XIncoherentInstances`. (cherry picked from commit eec96527b7482fe8ee37dbab740f69804d063497) - - - - - 9597102b by Adam Gundry at 2025-08-28T15:00:12+05:30 Fix specialisation of incoherent instances (fixes #25883) GHC normally assumes that class constraints are canonical, meaning that the specialiser is allowed to replace one dictionary argument with another provided that they have the same type. The `-fno-specialise-incoherents` flag alters INCOHERENT instance definitions so that they will prevent specialisation in some cases, by inserting `nospec`. This commit fixes a bug in 7124e4ad76d98f1fc246ada4fd7bf64413ff2f2e, which treated some INCOHERENT instance matches as if `-fno-specialise-incoherents` was in effect, thereby unnecessarily preventing specialisation. In addition it updates the relevant `Note [Rules for instance lookup]` and adds a new `Note [Canonicity for incoherent matches]`. (cherry picked from commit 6caa6508ed43a8842fc410f7125258e84cb912b9) - - - - - ad59a011 by Adam Gundry at 2025-08-28T15:00:12+05:30 Add regression test for #23429 (cherry picked from commit 0426fd6c67dba2c1695c272e1c7bfb92789453c5) - - - - - cab81394 by Matthew Craven at 2025-08-28T15:00:12+05:30 Fix bytecode generation for `tagToEnum# <LITERAL>` Fixes #25975. (cherry picked from commit a00eeaec8f0b98ec2b8c4630f359fdeb3a6ce04e) (cherry picked from commit 873c0cdcd45466f5c73c0dc1544e1b6663db25ce) - - - - - 769e650a by Matthew Pickering at 2025-08-28T15:00:12+05:30 ghci: Use loadInterfaceForModule rather than loadSrcInterface in mkTopLevEnv loadSrcInterface takes a user given `ModuleName` and resolves it to the module which needs to be loaded (taking into account module renaming/visibility etc). loadInterfaceForModule takes a specific module and loads it. The modules in `ImpDeclSpec` have already been resolved to the actual module to get the information from during renaming. Therefore we just need to fetch the precise interface from disk (and not attempt to rename it again). Fixes #25951 (cherry picked from commit 91564dafd60445f03025c3fee4f9802e80bb09c3) - - - - - 274e3cc3 by Sven Tennie at 2025-08-28T15:00:12+05:30 RV64: Introduce J instruction (non-local jumps) and don't deallocate stack slots for J_TBL (#25738) J_TBL result in local jumps, there should not deallocate stack slots (see Note [extra spill slots].) J is for non-local jumps, these may need to deallocate stack slots. (cherry picked from commit 0eef99b07f80f81d463652d11bdc2282df3dcf33) - - - - - 787c0f9f by Zubin Duggal at 2025-08-28T15:00:12+05:30 get-win32-tarballs.py: List tarball files to be downloaded if we cannot find them Fixes #25929 (cherry picked from commit aba2a4a5913a347f7e11623ac3e6f528cf8d8c39) - - - - - 652f3c8a by Ben Gamari at 2025-08-28T15:00:12+05:30 llvmGen: Fix linkage of built-in arrays LLVM now insists that built-in arrays use Appending linkage, not Internal. Fixes #25769. (cherry picked from commit a9d0a22c0777de18446f7f1e31ec0f575d53b290) - - - - - 14d75bd1 by Zubin Duggal at 2025-09-04T17:54:57+05:30 fetch_gitlab: Ensure we copy users_guide.pdf and Haddock.pdf to the release docs directory Fixes #24093 (cherry picked from commit 9fa590a6e27545995cdcf419ed7a6504e6668b18) - - - - - 0088037f by sheaf at 2025-09-04T17:54:57+05:30 Use mkTrAppChecked in ds_ev_typeable This change avoids violating the invariant of mkTrApp according to which the argument should not be a fully saturated function type. This ensures we don't return false negatives for type equality involving function types. Fixes #25998 (cherry picked from commit 9c6d2b1bf54310b6d9755aa2ba67fbe38feeac51) - - - - - 0b1f3bf6 by Ben Gamari at 2025-09-04T17:54:57+05:30 Reapply "Division by constants optimization" This reverts commit eb2859af981415ed6bf08fcf4d8f19811bf95494. (cherry picked from commit f0499c94071c11d31d5afc996431cf4b909dbd76) - - - - - 632623d7 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker: Don't fail due to RTLD_NOW In !12264 we started using the NativeObj machinery introduced some time ago for loading of shared objects. One of the side-effects of this change is shared objects are now loaded eagerly (i.e. with `RTLD_NOW`). This is needed by NativeObj to ensure full visibility of the mappings of the loaded object, which is in turn needed for safe shared object unloading. Unfortunately, this change subtly regressed, causing compilation failures in some programs. Specifically, shared objects which refer to undefined symbols (e.g. which may be usually provided by either the executable image or libraries loaded via `dlopen`) will fail to load with eager binding. This is problematic as GHC loads all package dependencies while, e.g., evaluating TemplateHaskell splices. This results in compilation failures in programs depending upon (but not using at compile-time) packages with undefined symbol references. To mitigate this NativeObj now first attempts to load an object via eager binding, reverting to lazy binding (and disabling unloading) on failure. See Note [Don't fail due to RTLD_NOW]. Fixes #25943. (cherry picked from commit 715d2a8550418d342bea767e1a4b0c7695966463) (cherry picked from commit a9de3b73ebb6f29eeae7d170a0210f5bedeb8d85) - - - - - ce4c8735 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker: Factor out ProddableBlocks machinery (cherry picked from commit 2921131cfa185c8e0ec48ddce2c994615493ca0a) (cherry picked from commit 7d7e096504cd35272df9727b92dcbe7d94927ac8) - - - - - 3ee32ef9 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker: Improve efficiency of proddable blocks structure Previously the linker's "proddable blocks" check relied on a simple linked list of spans. This resulted in extremely poor complexity while linking objects with lots of small sections (e.g. objects built with split sections). Rework the mechanism to instead use a simple interval set implemented via binary search. Fixes #26009. (cherry picked from commit e6e69dba996f47e21391f023010f5b138dc1df9c) (cherry picked from commit b388ca86b5e56636a1862987ec1b1d3deefedc9e) - - - - - bf2d27b5 by Ben Gamari at 2025-09-04T17:54:57+05:30 testsuite: Add simple functional test for ProddableBlockSet (cherry picked from commit 915902fc09ff4b00cf676c40d31dbbbf7d1cb7d7) (cherry picked from commit dc4c540ddd39fb99b18630aebd2849ac29a4cd73) - - - - - 553dcd51 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker/PEi386: Drop check for LOAD_LIBRARY_SEARCH_*_DIRS The `LOAD_LIBRARY_SEARCH_USER_DIRS` and `LOAD_LIBRARY_SEARCH_DEFAULT_DIRS` were introduced in Windows Vista and have been available every since. As we no longer support Windows XP we can drop this check. Addresses #26009. (cherry picked from commit 1f38e2739fbbae3cbe925320fa70965004aaaca5) (cherry picked from commit 10cfa8946b76a914fb3ecd4df62d32160b64151a) - - - - - 754f5c06 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker/PEi386: Clean up code style (cherry picked from commit facf379b0f1c0d1cbc3c1896cce603c89e837481) (cherry picked from commit 92793b3799525f46373d9696c7e91c0d14860fa8) - - - - - 002ac0bf by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/Hash: Factor out hashBuffer This is a useful helper which can be used for non-strings as well. (cherry picked from commit 827961b9a724d8b2dd848222f980efc2de3996e3) (cherry picked from commit a8c1ecb0d45050491496c0d04cc022a294a075b1) - - - - - 338c6066 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker/PEi386: Fix incorrect use of break in nested for Previously the happy path of PEi386 used `break` in a double-`for` loop resulting in redundant calls to `LoadLibraryEx`. Fixes #26052. (cherry picked from commit 6fbb05cf8a999628476d0d7274f30ef45e4d3932) (cherry picked from commit 36a8bd2b7ceb0622e0aca2bed9cee7162076379c) - - - - - c3471809 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts: Correctly mark const arguments (cherry picked from commit 320d7dd3e8de62f970d23ac1d27c665093d22aaa) (cherry picked from commit 3a389cacefaffb3293f6b5f2ed5b20f2dbb9b4e3) - - - - - b79b3668 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker/PEi386: Don't repeatedly load DLLs Previously every DLL-imported symbol would result in a call to `LoadLibraryEx`. This ended up constituting over 40% of the runtime of `ghc --interactive -e 42` on Windows. Avoid this by maintaining a hash-set of loaded DLL names, skipping the call if we have already loaded the requested DLL. Addresses #26009. (cherry picked from commit e6b0067bfa49b42bf4599af8d6a3c97878302624) (cherry picked from commit b24be9b90adcf3fb9ee0c6b7e120b4bf1e77f072) - - - - - 3ebc4f8d by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/linker: Expand comment describing ProddableBlockSet (cherry picked from commit 9631a12c0b89529c3d1147d0770ec6b9023cdb17) (cherry picked from commit 6ad664de0a4ab3e1747d318aabb5035ce7c74fcd) - - - - - ca493586 by Cheng Shao at 2025-09-04T17:54:57+05:30 rts: fix rts_clearMemory logic when sanity checks are enabled This commit fixes an RTS assertion failure when invoking rts_clearMemory with +RTS -DS. -DS implies -DZ which asserts that free blocks contain 0xaa as the designated garbage value. Also adds the sanity way to rts_clearMemory test to prevent future regression. Closes #26011. ChatGPT Codex automatically diagnosed the issue and proposed the initial patch in a single shot, given a GHC checkout and the following prompt: --- Someone is reporting the following error when attempting to use `rts_clearMemory` with the RTS option `-DS`: ``` test.wasm: internal error: ASSERTION FAILED: file rts/sm/Storage.c, line 1216 (GHC version 9.12.2.20250327 for wasm32_unknown_wasi) Please report this as a GHC bug: https://www.haskell.org/ghc/reportabug ``` What's the culprit? How do I look into this issue? --- I manually reviewed & revised the patch, tested and submitted it. (cherry picked from commit 86406f48659a5ab61ce1fd2a2d427faba2dcdb09) - - - - - 280f87fe by kwxm at 2025-09-04T17:54:57+05:30 Fix bugs in `integerRecipMod` and `integerPowMod` This fixes #26017. * `integerRecipMod x 1` now returns `(# 1 | #)` for all x; previously it incorrectly returned `(# | () #)`, indicating failure. * `integerPowMod 0 e m` now returns `(# | () #)` for e<0 and m>1, indicating failure; previously it incorrectly returned `(# 0 | #)`. (cherry picked from commit 8ded23300367c6e032b3c5a635fd506b8915374b) - - - - - 905715ad by Matthew Pickering at 2025-09-04T17:54:57+05:30 interpreter: Fix INTERP_STATS profiling code The profiling code had slightly bitrotted since the last time it was used. This just fixes things so that if you toggle the INTERP_STATS macro then it just works and prints out the stats. Fixes #25695 (cherry picked from commit 66c7f65676801367f440a6a644f87d71157d2f3f) - - - - - 8033abd5 by Matthew Pickering at 2025-09-04T17:54:57+05:30 interpreter: Fix overflows and reentrancy in statistics calculation 1. Use unsigned long for counter, as they can easily overflow if you are running a long benchmark. 2. Make interp_shutdown reentrant by copying the command frequency table into an array. Fixes #25756 (cherry picked from commit c4e112fccd10ca745771dd81d2c1eb340aa8dd86) - - - - - 2759c597 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts: Tighten up invariants of PACK (cherry picked from commit aa58fc5b9745a2201707de81a91960b213ea3258) - - - - - 30cd1559 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts: Improve documentation of SLIDE bytecode instruction (cherry picked from commit 0e084029def86e9e67b89317f44fd71c823e9bca) - - - - - f5ff86f2 by Ben Gamari at 2025-09-04T17:54:57+05:30 rts/Interpreter: Assert that TEST*_P discriminators are valid (cherry picked from commit 9bf3663b9970851e7b5701d68147450272823197) - - - - - 60906d43 by Ben Gamari at 2025-09-04T17:54:58+05:30 Revert "rts/Interpreter: Assert that TEST*_P discriminators are valid" This assertion was based on the misconception that `GET_TAG` was returning the pointer tag whereas it is actually returning the constructor tag. This reverts commit 9bf3663b9970851e7b5701d68147450272823197. Fixes #25527. (cherry picked from commit dd95940639fd198f97fb3f44e84494eaca721788) - - - - - d302744c by Matthew Pickering at 2025-09-04T17:54:58+05:30 interpreter: Fix underflow frame lookups BCOs can be nested, resulting in nested BCO stack frames where the inner most stack frame can refer to variables stored on earlier stack frames via the PUSH_L instruction. |---------| | BCO_1 | -<-┐ |---------| ......... | |---------| | PUSH_L <n> | BCO_N | ->-┘ |---------| Here BCO_N is syntactically nested within the code for BCO_1 and will result in code that references the prior stack frame of BCO_1 for some of it's local variables. If a stack overflow happens between the creation of the stack frame for BCO_1 and BCO_N the RTS might move BCO_N to a new stack chunk while leaving BCO_1 in place, invalidating a simple offset based reference to the outer stack frames. Therefore `ReadSpW` first performs a bounds check to ensure that accesses onto the stack will succeed. If the target address would not be a valid location for the current stack chunk then `slow_spw` function is called, which dereferences the underflow frame to adjust the offset before performing the lookup. ┌->--x | CHK_1 | | CHK_2 | | | |---------| |---------| | └-> | BCO_1 | | UD_FLOW | -- x |---------| |---------| | | ...... | | |---------| | PUSH_L <n> | BCO_ N | ->-┘ |---------| Fixes #25750 (cherry picked from commit f4da90f11e3a3a634ec3edb6d70d96fe3515b726) - - - - - 63480835 by Ben Gamari at 2025-09-04T17:54:58+05:30 base: Note strictness changes made in 4.16.0.0 Addresses #25886. (cherry picked from commit 7722232c6f8f0b57db03d0439d77896d38191bf9) - - - - - aaff4d7c by Hécate Kleidukos at 2025-09-04T17:54:58+05:30 Expose all of Backtraces' internals for ghc-internal Closes #26049 (cherry picked from commit 16014bf84afa0d009b6254b103033bceca42233a) - - - - - 5e37fa3b by ARATA Mizuki at 2025-09-04T17:54:58+05:30 AArch64 NCG: Fix sub-word arithmetic right shift As noted in Note [Signed arithmetic on AArch64], we should zero-extend sub-word values. Fixes #26061 (cherry picked from commit 265d0024abc95be941f8e4769f24af128eedaa10) - - - - - 76b9fcbd by ARATA Mizuki at 2025-09-04T17:54:58+05:30 x86 NCG: Fix code generation of bswap64 on i386 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> Fix #25601 (cherry picked from commit bfa6b70f27dc2ce7fc890ec71103c40f66497c77) - - - - - ac4851da by Cheng Shao at 2025-09-04T17:54:58+05:30 testsuite: add T26120 marked as broken (cherry picked from commit 44b8cee2d5c114b238898ce4ee7b44ecaa0bf491) - - - - - 1abd3606 by Berk Özkütük at 2025-09-04T17:54:58+05:30 Consider `PromotedDataCon` in `tyConStupidTheta` Haddock checks data declarations for the stupid theta so as not to pretty-print them as empty contexts. Type data declarations end up as `PromotedDataCon`s by the time Haddock performs this check, causing a panic. This commit extends `tyConStupidTheta` so that it returns an empty list for `PromotedDataCon`s. This decision was guided by the fact that type data declarations never have data type contexts (see (R1) in Note [Type data declarations]). Fixes #25739. (cherry picked from commit 8d33d048dbe159a045a4c304fa92318365a3dfe2) - - - - - ebbabfb1 by Cheng Shao at 2025-09-04T17:54:58+05:30 compiler: fix GHC.SysTools.Ar archive member size writing logic This patch fixes a long-standing bug in `GHC.SysTools.Ar` that emits the wrong archive member size in each archive header. It should encode the exact length of the member payload, excluding any padding byte, otherwise malformed archive that extracts a broken object with an extra trailing byte could be created. Apart from the in-tree `T26120` test, I've also created an out-of-tree testsuite at https://github.com/TerrorJack/ghc-ar-quickcheck that contains QuickCheck roundtrip tests for `GHC.SysTools.Ar`. With this fix, simple roundtrip tests and `writeGNUAr`/GNU `ar` roundtrip test passes. There might be more bugs lurking in here, but this patch is still a critical bugfix already. Fixes #26120 #22586. Co-authored-by: Codex <codex(a)openai.com> (cherry picked from commit 894a04f3a82dd39ecef71619e2032c4dfead556e) - - - - - cf0c68dd by Teo Camarasu at 2025-09-04T17:54:58+05:30 rts/nonmovingGC: remove n_free We remove the nonmovingHeap.n_free variable. We wanted this to track the length of nonmovingHeap.free. But this isn't possible to do atomically. When this isn't accurate we can get a segfault by going past the end of the list. Instead, we just count the length of the list when we grab it in nonmovingPruneFreeSegment. Resolves #26186 (cherry picked from commit 45efaf71d97355f76fe0db5af2fc5b4b67fddf47) - - - - - 1518404f by Andreas Klebinger at 2025-09-04T17:54:58+05:30 Disable -fprof-late-overloaded-calls for join points. Currently GHC considers cost centres as destructive to join contexts. Or in other words this is not considered valid: join f x = ... in ... -> scc<tick> jmp This makes the functionality of `-fprof-late-overloaded-calls` not feasible for join points in general. We used to try to work around this by putting the ticks on the rhs of the join point rather than around the jump. However beyond the loss of accuracy this was broken for recursive join points as we ended up with something like: rec-join f x = scc<tick> ... jmp f x Which similarly is not valid as the tick once again destroys the tail call. One might think we could limit ourselves to non-recursive tail calls and do something clever like: join f x = scc<tick> ... in ... jmp f x And sometimes this works! But sometimes the full rhs would look something like: join g x = .... join f x = scc<tick> ... -> jmp g x Which, would again no longer be valid. I believe in the long run we can make cost centre ticks non-destructive to join points. Or we could keep track of where we are/are not allowed to insert a cost centre. But in the short term I will simply disable the annotation of join calls under this flag. (cherry picked from commit 7da86e165612721c4e09f772a3fdaffc733e9293) - - - - - 41829358 by Sebastian Graf at 2025-09-04T17:54:58+05:30 CprAnal: Detect recursive newtypes (#25944) While `cprTransformDataConWork` handles recursive data con workers, it did not detect the case when a newtype is responsible for the recursion. This is now detected in the `Cast` case of `cprAnal`. The same reproducer made it clear that `isRecDataCon` lacked congruent handling for `AppTy` and `CastTy`, now fixed. Furthermore, the new repro case T25944 triggered this bug via an infinite loop in `cprFix`, caused by the infelicity in `isRecDataCon`. While it should be much less likely to trigger such an infinite loop now that `isRecDataCon` has been fixed, I made sure to abort the loop after 10 iterations and emitting a warning instead. Fixes #25944. (cherry picked from commit 4bc78496406f7469640faaa46e2f311c05760124) - - - - - 36436e87 by Ben Gamari at 2025-09-04T17:54:58+05:30 configure: Allow override of CrossCompiling As noted in #26236, the current inference logic is a bit simplistic. In particular, there are many cases (e.g. building for a new libc) where the target and host triples may differ yet we are still able to run the produced artifacts as native code. Closes #26236. (cherry picked from commit 81577fe7c1913c53608bf03e48f84507be904620) - - - - - 05640047 by Simon Peyton Jones at 2025-09-12T17:02:17+05:30 Take more care in zonkEqTypes on AppTy/AppTy This patch fixes #26256. See Note [zonkEqTypes and the PKTI] in GHC.Tc.Solver.Equality (cherry picked from commit 18036d5205ac648bb245217519fed2fd931a9982) - - - - - 42de45fa by Andreas Klebinger at 2025-09-12T17:02:17+05:30 Make unexpected LLVM versions a warning rather than an error. Typically a newer LLVM version *will* work so erroring out if a user uses a newer LLVM version is too aggressive. Fixes #25915 (cherry picked from commit 50842f83f467ff54dd22470559a7af79d2025c03) - - - - - 59bd53bf by Teo Camarasu at 2025-09-12T17:02:17+05:30 rts: spin if we see a WHITEHOLE in messageBlackHole When a BLACKHOLE gets cancelled in raiseAsync, we indirect to a THUNK. GC can then shortcut this, replacing our BLACKHOLE with a fresh THUNK. This THUNK is not guaranteed to have a valid indirectee field. If at the same time, a message intended for the previous BLACKHOLE is processed and concurrently we BLACKHOLE the THUNK, thus temporarily turning it into a WHITEHOLE, we can get a segfault, since we look at the undefined indirectee field of the THUNK The fix is simple: spin if we see a WHITEHOLE, and it will soon be replaced with a valid BLACKHOLE. Resolves #26205 (cherry picked from commit 4021181ee0860aca2054883a531f3312361cc701) - - - - - ab2932da by Teo Camarasu at 2025-09-12T17:02:17+05:30 rts: ensure MessageBlackHole.link is always a valid closure We turn a MessageBlackHole into an StgInd in wakeBlockingQueue(). Therefore it's important that the link field, which becomes the indirection field, always points to a valid closure. It's unclear whether it's currently possible for the previous behaviour to lead to a crash, but it's good to be consistent about this invariant nonetheless. Co-authored-by: Andreas Klebinger <klebinger.andreas(a)gmx.at> (cherry picked from commit a8b2fbae6bcf20bc2f3fe58803096d2a9c5fc43d) - - - - - 91b7ffbc by Reed Mullanix at 2025-09-12T17:02:17+05:30 ghc-internal: Fix naturalAndNot for NB/NS case When the first argument to `naturalAndNot` is larger than a `Word` and the second is `Word`-sized, `naturalAndNot` will truncate the result: ``` >>> naturalAndNot ((2 ^ 65) .|. (2 ^ 3)) (2 ^ 3) 0 ``` In contrast, `naturalAndNot` does not truncate when both arguments are larger than a `Word`, so this appears to be a bug. Luckily, the fix is pretty easy: we just need to call `bigNatAndNotWord#` instead of truncating. Fixes #26230 (cherry picked from commit a766286fe759251eceb304c54ba52841c2a51f86) - - - - - 49148aae by Ben Gamari at 2025-09-12T17:02:17+05:30 llvmGen: Fix built-in variable predicate Previously the predicate to identify LLVM builtin global variables was checking for `$llvm` rather than `@llvm` as it should. (cherry picked from commit 6e67fa083a50684e1cfae546e07cab4d4250e871) - - - - - 1b00a659 by Brandon Chinn at 2025-09-12T17:02:17+05:30 Fix for alex-3.5.2.0 (#25623) This INLINE pragma for alexScanUser was added in 9.12, but then I ported the change to alex in 3.5.2.0 (https://github.com/haskell/alex/pull/262) I didn't realize that GHC errors on duplicate INLINE pragmas, so this ended up being a breaking change. This change should be backported into 9.12 (cherry picked from commit a1d923786baed5b001c523fd2a76f133be510b04) - - - - - c389589b by Luite Stegeman at 2025-09-12T17:02:17+05:30 Add flags for switching off speculative evaluation. We found that speculative evaluation can increase the amount of allocations in some circumstances. This patch adds new flags for selectively disabling speculative evaluation, allowing us to test the effect of the optimization. The new flags are: -fspec-eval globally enable speculative evaluation -fspec-eval-dictfun enable speculative evaluation for dictionary functions (no effect if speculative evaluation is globally disabled) The new flags are on by default for all optimisation levels. See #25284 (cherry picked from commit 2309975247543a4f77009ea5c3c7a8ebe06dc60b) - - - - - f6c00dac by ARATA Mizuki at 2025-09-16T14:38:18+05:30 x86 NCG: Make MOVD's output format explicit The old design led to inference of a wrong format, losing upper bits of a vector register. Fixes #25659 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> (cherry picked from commit 62760367dca36da5828875c5423109f9a5523337) - - - - - e0437900 by Patrick at 2025-09-16T14:38:18+05:30 Fix deadlock/loop in interface rehydration (#25858) In #25858, GHC hangs when processing modules with class defaults due to a circular dependency in the interface rehydration process. The deadlock/loop occurred when eager class defaults rehydration accessed not-yet-complete module details. To fix the immediate deadlock/loop. `tcIfaceDefaults` is refactored, we use the class name directly from the iface and use `forM` for lazy loading the class, which algins with the handling of other fields of ModDetails. This laziness ensure rehydration waits for HomePackageTable (HPT) to be updated and prevent premature evaluation of ModDetails inside `fixIO``. As suggested by Matthew, class defaults importing is also refactored to align with the compiler's established interface loading conventions. - add class defaults field to ExternalPackageState (EPS). - rehydrate and store class defaults in EPS at `loadInterface`. - Instead of using `tcIfaceDefaults` in `tcRnImports`, we add and use `tcGetClsDefaults` to read defaults directly from HPT or EPS when importing modules. Tests: - T25858, T25858v1-2: Test class hydration in defaults - T25858v3-4: Test type list hydration in defaults New Note [Tricky rehydrating IfaceDefaults loop] is added. Thanks to @sheaf (Sam), @mpickering (Matthew), and @simonpj (Simon) for their valuable input and analysis. Fixes #25858. (cherry picked from commit d5ea80c6237c735eb1fb8bcce133e009df99beec) - - - - - 4fd881a9 by sheaf at 2025-09-16T14:38:19+05:30 9.12 user's guide: NamedDefault semantic change This commit documents a semantic change in 9.12 that takes effect as part of the implementation of the NamedDefaults extension: defaulting will now take place in more situations than it did before, even when the extension is not enabled! Fixes #25777 (cherry picked from commit 0d4d6a272f569f19ce7c723dc21b73b2e0493706) - - - - - 7ddf44a8 by Zubin Duggal at 2025-09-16T14:38:19+05:30 QuickLook: do a shape test before unifying This commit ensures we do a shape test before unifying. This ensures we don't try to unify a TyVarTv with a non-tyvar, e.g. alpha[tyv] := Int Fixes #25950 (cherry picked from commit a4c0c8d32e8c29364062b199abe19b033e3d4381) Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> (cherry picked from commit 91db1d51d2d53346612fe843e863cd71f8f9d338) - - - - - 04dfd009 by Ben Gamari at 2025-09-16T14:38:19+05:30 rts/linker/LoadArchive: Use bool Improve type precision by using `bool` instead of `int` and `StgBool`. (cherry picked from commit 580a33536e6180ce1d623d0922f7de5c975b6b3e) - - - - - c497468f by Ben Gamari at 2025-09-16T14:38:19+05:30 rts/linker/LoadArchive: Don't rely on file extensions for identification Previously archive members would be identified via their file extension, as described in #13103. We now instead use a more principled approach, relying on the magic number in the member's header. As well, we refactor treatment of archive format detection to improve code clarity and error handling. Closes #13103. (cherry picked from commit 76d1041dfa4b96108cfdd22b07f2b3feb424dcbe) - - - - - 02d052f4 by Ben Gamari at 2025-09-16T14:38:19+05:30 rts/LoadArchive: Handle null terminated string tables As of `llvm-ar` now emits filename tables terminated with null characters instead of the usual POSIX `/\n` sequence. Fixes #26150. (cherry picked from commit 3b63b254cb8b1832f32751aed6d05ceaabdeb826) - - - - - 85d64f46 by Ben Gamari at 2025-09-16T14:38:19+05:30 rts/LoadArchive: Handle string table entries terminated with / llvm-ar appears to terminate string table entries with `/\n` [1]. This matters in the case of thin archives, since the filename is used. In the past this worked since `llvm-ar` would produce archives with "small" filenames when possible. However, now it appears to always use the string table. [1] https://github.com/llvm/llvm-project/blob/bfb686bb5ba503e9386dc899e1ebbe248… (cherry picked from commit 65f19293124acbc2c6493ca9c098fc74150e184a) - - - - - 533853eb by Andreas Klebinger at 2025-09-16T14:38:19+05:30 rts: Support COFF BigObj files in archives. (cherry picked from commit 01136779b1d4c1576c925ef673f55c81c45d8551) - - - - - 1d4e8c67 by Ryan Hendrickson at 2025-09-18T00:15:51+05:30 haddock: Preserve indentation in multiline examples Intended for use with :{ :}, but doesn't look for those characters. Any consecutive lines with birdtracks will only have initial whitespace stripped up to the column of the first line. (cherry picked from commit 75cadf816544408f65d3baeec8092a7356d4b720) - - - - - 4d1131df by Ryan Hendrickson at 2025-09-18T00:15:51+05:30 haddock: Fix links to type operators (cherry picked from commit a0adc30d892f14f543f39d5c45faccacbc28afb4) - - - - - 720ece2b by Ryan Hendrickson at 2025-09-18T00:15:51+05:30 haddock: Parse math even after ordinary characters Fixes a bug where math sections were not recognized if preceded by a character that isn't special (like space or a markup character). (cherry picked from commit 6558467c0e3a9b97141ec9f0cdbadf3550c5cd3c) - - - - - 7ff47bbc by Ryan Hendrickson at 2025-09-18T00:15:51+05:30 haddock: Document instances from other packages When attaching instances to `Interface`s, it isn't enough just to look for instances in the list of `Interface`s being processed. We also need to look in the modules on which they depend, including those outside of this package. Fixes #25147. Fixes #26079. (cherry picked from commit a26243fde4680271712a3d774e17f6cd6da4a652) - - - - - 2fb1342a by Zubin Duggal at 2025-09-18T00:15:51+05:30 haddock: Don't warn about missing link destinations for derived names. Fixes #26114 (cherry picked from commit 5dabc718a04bfc4d277c5ff7f815ee3d6b9670cb) - - - - - 0779eccc by Zubin Duggal at 2025-09-18T00:15:51+05:30 Bump exceptions submodule to 0.10.10 - - - - - 84381617 by Zubin Duggal at 2025-09-18T00:15:51+05:30 Bump text submodule to 2.1.3 (cherry picked from commit a802551af0caed8ecb6c7f5722dcaf7e545f0b69) - - - - - 584d2be9 by Zubin Duggal at 2025-09-18T00:15:51+05:30 bump unix to 2.8.7.0 (cherry picked from commit f3d00969a454a2f043f5571ea54e52fbdf614080) - - - - - 1e607493 by Zubin Duggal at 2025-09-18T00:15:51+05:30 Bump os-string submodule to 2.0.8 - - - - - 98bfc9d5 by Zubin Duggal at 2025-09-18T00:15:51+05:30 Set -Wno-unused-imports for os-string Metric Increase: T13035 T9198 Metric Decrease: MultiLayerModulesTH_OneShot (cherry picked from commit cc5b555001d43af3a0ae990f532ba433b7079568) - - - - - 593b5049 by Zubin Duggal at 2025-09-18T18:17:46+05:30 Bump Cabal submodule to 3.14.2.0 - - - - - 8d2bf5bd by Zubin Duggal at 2025-09-18T18:17:46+05:30 Prepare 9.12.3 - - - - - e0050c9d by Zubin Duggal at 2025-09-19T13:10:31+05:30 ci: Update nix docker images - - - - - 364 changed files: - .gitlab-ci.yml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/upload_ghc_libs.py - compiler/GHC.hs - compiler/GHC/Builtin/Names.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/Cmm/Config.hs - compiler/GHC/Cmm/MachOp.hs - compiler/GHC/Cmm/Opt.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/Reg.hs - compiler/GHC/Cmm/Sink.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToAsm/RV64/Instr.hs - compiler/GHC/CmmToAsm/RV64/Ppr.hs - compiler/GHC/CmmToAsm/Wasm/Asm.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToAsm/Wasm/Types.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - compiler/GHC/CmmToLlvm.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/CmmToLlvm/Data.hs - compiler/GHC/Core/DataCon.hs - compiler/GHC/Core/InstEnv.hs - compiler/GHC/Core/LateCC/OverloadedCalls.hs - compiler/GHC/Core/Opt/CprAnal.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/Config/Cmm.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Errors/Ppr.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/HsToCore/GuardedRHSs.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/IfaceToCore.hs-boot - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - + compiler/GHC/Parser/Lexer/Interface.hs - + compiler/GHC/Parser/Lexer/String.x - compiler/GHC/Parser/String.hs - compiler/GHC/Plugins.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/SysTools/Ar.hs - compiler/GHC/SysTools/Process.hs - compiler/GHC/SysTools/Tasks.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Arrow.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Default.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Match.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Types.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Tc/Utils/TcType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/DefaultEnv.hs - compiler/GHC/Types/Hint.hs - compiler/GHC/Types/Id/Make.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Types/Var.hs - compiler/GHC/Unit/External.hs - compiler/GHC/Unit/Module/ModDetails.hs - compiler/cbits/genSym.c - compiler/ghc.cabal.in - configure.ac - docs/users_guide/9.12.1-notes.rst - docs/users_guide/9.12.3-notes.rst - docs/users_guide/exts/instances.rst - docs/users_guide/exts/named_defaults.rst - docs/users_guide/exts/overloaded_strings.rst - docs/users_guide/exts/poly_kinds.rst - + docs/users_guide/exts/type_defaulting.rst - docs/users_guide/exts/types.rst - docs/users_guide/ghci.rst - docs/users_guide/phases.rst - docs/users_guide/profiling.rst - docs/users_guide/using-optimisation.rst - hadrian/src/Rules/SourceDist.hs - hadrian/src/Settings/Warnings.hs - libffi-tarballs - libraries/Cabal - libraries/base/base.cabal.in - libraries/base/changelog.md - libraries/exceptions - libraries/ghc-bignum/changelog.md - libraries/ghc-bignum/src/GHC/Num/Integer.hs - libraries/ghc-bignum/src/GHC/Num/Natural.hs - + libraries/ghc-boot-th/GHC/Boot/TH/Lib.hs - libraries/ghc-boot-th/GHC/Internal/TH/Lib/Map.hs → libraries/ghc-boot-th/GHC/Boot/TH/Lib/Map.hs - + libraries/ghc-boot-th/GHC/Boot/TH/Lift.hs - libraries/ghc-boot-th/GHC/Internal/TH/Ppr.hs → libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-boot-th/GHC/Internal/TH/PprLib.hs → libraries/ghc-boot-th/GHC/Boot/TH/PprLib.hs - + libraries/ghc-boot-th/GHC/Boot/TH/Quote.hs - + libraries/ghc-boot-th/GHC/Boot/TH/Syntax.hs - libraries/ghc-boot-th/ghc-boot-th.cabal.in - libraries/ghc-heap/GHC/Exts/Heap/InfoTable/Types.hsc - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/TH.hs - libraries/ghci/GHCi/TH/Binary.hs - libraries/os-string - libraries/process - libraries/template-haskell/Language/Haskell/TH/Lib.hs - libraries/template-haskell/Language/Haskell/TH/Lib/Internal.hs - libraries/template-haskell/Language/Haskell/TH/Ppr.hs - libraries/template-haskell/Language/Haskell/TH/PprLib.hs - libraries/template-haskell/Language/Haskell/TH/Quote.hs - libraries/template-haskell/Language/Haskell/TH/Syntax.hs - libraries/text - libraries/unix - m4/fp_setup_windows_toolchain.m4 - rts/Hash.c - rts/Hash.h - rts/Interpreter.c - rts/Interpreter.h - rts/Linker.c - rts/LinkerInternals.h - rts/Messages.c - rts/PathUtils.c - rts/PathUtils.h - rts/ProfHeap.c - rts/RtsMain.c - rts/StgCRunAsm.S - rts/StgMiscClosures.cmm - rts/Updates.h - rts/include/rts/storage/InfoTables.h - rts/linker/Elf.c - rts/linker/LoadArchive.c - rts/linker/LoadNativeObjPosix.c - rts/linker/MachO.c - rts/linker/PEi386.c - rts/linker/PEi386.h - + rts/linker/ProddableBlocks.c - + rts/linker/ProddableBlocks.h - rts/rts.cabal - rts/sm/NonMoving.c - rts/sm/NonMoving.h - rts/sm/NonMovingAllocate.c - rts/sm/Sanity.c - rts/sm/Storage.h - rts/xxhash.h - testsuite/driver/perf_notes.py - testsuite/driver/testlib.py - testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout - + testsuite/tests/bytecode/T25975.hs - + testsuite/tests/bytecode/T25975.stdout - testsuite/tests/bytecode/all.T - + testsuite/tests/cmm/opt/T25771.cmm - + testsuite/tests/cmm/opt/T25771.stderr - testsuite/tests/cmm/opt/all.T - + testsuite/tests/cmm/should_run/T25601.hs - + testsuite/tests/cmm/should_run/T25601.stdout - + testsuite/tests/cmm/should_run/T25601a.cmm - testsuite/tests/cmm/should_run/all.T - + testsuite/tests/codeGen/should_run/T26061.hs - + testsuite/tests/codeGen/should_run/T26061.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/cpranal/sigs/T25944.hs - + testsuite/tests/cpranal/sigs/T25944.stderr - testsuite/tests/cpranal/sigs/all.T - + testsuite/tests/default/T25858.hs - + testsuite/tests/default/T25858.stdout - + testsuite/tests/default/T25858v1.hs - + testsuite/tests/default/T25858v1.stdout - + testsuite/tests/default/T25858v1_helper.hs - + testsuite/tests/default/T25858v2.hs - + testsuite/tests/default/T25858v2.stdout - + testsuite/tests/default/T25858v2_helper.hs - + testsuite/tests/default/T25858v3.hs - + testsuite/tests/default/T25858v3.stdout - + testsuite/tests/default/T25858v3_helper.hs - + testsuite/tests/default/T25858v4.hs - + testsuite/tests/default/T25858v4.stdout - testsuite/tests/default/all.T - testsuite/tests/deriving/should_compile/T17324.stderr - testsuite/tests/driver/T20604/T20604.stdout - testsuite/tests/ffi/should_run/all.T - + testsuite/tests/ghc-api/T26120.hs - + testsuite/tests/ghc-api/T26120.stdout - testsuite/tests/ghc-api/all.T - testsuite/tests/ghc-api/settings-escape/T11938.hs → testsuite/tests/ghc-api/settings-escape/T24265.hs - testsuite/tests/ghc-api/settings-escape/T11938.stderr → testsuite/tests/ghc-api/settings-escape/T24265.stderr - + testsuite/tests/ghc-api/settings-escape/T25204.hs - + testsuite/tests/ghc-api/settings-escape/T25204.stdout - + testsuite/tests/ghc-api/settings-escape/T25204_C.c - testsuite/tests/ghc-api/settings-escape/all.T - + testsuite/tests/ghc-api/settings-escape/ghc-install-folder/ghc version.h - testsuite/tests/ghc-api/settings-escape/ghc-install-folder/lib/.gitkeep → testsuite/tests/ghc-api/settings-escape/ghc-install-folder/lib with spaces/.gitkeep - + testsuite/tests/ghci/scripts/GhciPackageRename.hs - + testsuite/tests/ghci/scripts/GhciPackageRename.script - + testsuite/tests/ghci/scripts/GhciPackageRename.stdout - testsuite/tests/ghci/scripts/all.T - testsuite/tests/haddock/haddock_testsuite/Makefile - + testsuite/tests/haddock/haddock_testsuite/T26114.hs - + testsuite/tests/haddock/haddock_testsuite/T26114.stdout - testsuite/tests/haddock/haddock_testsuite/all.T - testsuite/tests/interface-stability/template-haskell-exports.stdout - + testsuite/tests/lib/integer/T26017.hs - + testsuite/tests/lib/integer/T26017.stdout - testsuite/tests/lib/integer/all.T - testsuite/tests/lib/integer/integerRecipMod.hs - testsuite/tests/lib/integer/integerRecipMod.stdout - + testsuite/tests/linear/should_compile/T25428.hs - testsuite/tests/linear/should_compile/all.T - + testsuite/tests/llvm/should_compile/T25606.hs - testsuite/tests/llvm/should_compile/all.T - + testsuite/tests/llvm/should_run/T25730.hs - + testsuite/tests/llvm/should_run/T25730.stdout - + testsuite/tests/llvm/should_run/T25730C.c - + testsuite/tests/llvm/should_run/T25770.hs - + testsuite/tests/llvm/should_run/T25770.stdout - testsuite/tests/llvm/should_run/all.T - testsuite/tests/module/T11970A.stderr - testsuite/tests/module/mod176.stderr - + testsuite/tests/numeric/should_run/T26230.hs - + testsuite/tests/numeric/should_run/T26230.stdout - testsuite/tests/numeric/should_run/all.T - testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr - testsuite/tests/parser/should_run/NumericUnderscores0.hs - testsuite/tests/parser/should_run/NumericUnderscores0.stdout - + testsuite/tests/parser/should_run/T25609.hs - + testsuite/tests/parser/should_run/T25609.stdout - + testsuite/tests/parser/should_run/T25784.hs - + testsuite/tests/parser/should_run/T25784.stdout - + testsuite/tests/parser/should_run/T25937.hs - + testsuite/tests/parser/should_run/T25937.stdout - testsuite/tests/parser/should_run/all.T - + testsuite/tests/parser/should_run/parser_unit_tests.hs - + testsuite/tests/partial-sigs/should_compile/T26256.hs - + testsuite/tests/partial-sigs/should_compile/T26256.stderr - testsuite/tests/partial-sigs/should_compile/all.T - testsuite/tests/plugins/plugins10.stdout - testsuite/tests/plugins/static-plugins.stdout - + testsuite/tests/pmcheck/should_compile/T25749.hs - testsuite/tests/pmcheck/should_compile/all.T - testsuite/tests/polykinds/T14172.stderr - + testsuite/tests/polykinds/T25661.hs - + testsuite/tests/polykinds/T25661.stderr - testsuite/tests/polykinds/all.T - testsuite/tests/rename/should_compile/T14881.stderr - + testsuite/tests/rename/should_compile/T24035.hs - + testsuite/tests/rename/should_compile/T24035_aux.hs - + testsuite/tests/rename/should_compile/T24035b.hs - + testsuite/tests/rename/should_compile/T24035b.stderr - testsuite/tests/rename/should_compile/all.T - testsuite/tests/rep-poly/RepPolyMcGuard.stderr - testsuite/tests/rep-poly/RepPolyRecordUpdate.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/rts/T13082/Makefile - testsuite/tests/rts/T13082/T13082_fail.stderr → testsuite/tests/rts/T13082/T13082_fail.stdout - + testsuite/tests/rts/TestProddableBlockSet.c - testsuite/tests/rts/all.T - + testsuite/tests/simd/should_run/T25561.hs - + testsuite/tests/simd/should_run/T25561.stdout - + testsuite/tests/simd/should_run/T25658.hs - + testsuite/tests/simd/should_run/T25658.stdout - + testsuite/tests/simd/should_run/T25659.hs - + testsuite/tests/simd/should_run/T25659.stdout - testsuite/tests/simd/should_run/all.T - + testsuite/tests/simd/should_run/doublex2_arith.hs - + testsuite/tests/simd/should_run/doublex2_arith.stdout - + testsuite/tests/simd/should_run/doublex2_arith_baseline.hs - + testsuite/tests/simd/should_run/doublex2_arith_baseline.stdout - + testsuite/tests/simd/should_run/doublex2_fma.hs - + testsuite/tests/simd/should_run/doublex2_fma.stdout - + testsuite/tests/simd/should_run/floatx4_arith.hs - + testsuite/tests/simd/should_run/floatx4_arith.stdout - + testsuite/tests/simd/should_run/floatx4_arith_baseline.hs - + testsuite/tests/simd/should_run/floatx4_arith_baseline.stdout - + testsuite/tests/simd/should_run/floatx4_fma.hs - + testsuite/tests/simd/should_run/floatx4_fma.stdout - + testsuite/tests/simplCore/should_compile/T25883.hs - + testsuite/tests/simplCore/should_compile/T25883.substr-simpl - + testsuite/tests/simplCore/should_compile/T25883b.hs - + testsuite/tests/simplCore/should_compile/T25883b.substr-simpl - + testsuite/tests/simplCore/should_compile/T25883c.hs - + testsuite/tests/simplCore/should_compile/T25883c.substr-simpl - + testsuite/tests/simplCore/should_compile/T25883d.hs - + testsuite/tests/simplCore/should_compile/T25883d.stderr - + testsuite/tests/simplCore/should_compile/T25883d_import.hs - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/simplCore/should_fail/T25672.hs - + testsuite/tests/simplCore/should_fail/T25672.stderr - testsuite/tests/simplCore/should_fail/all.T - + testsuite/tests/simplCore/should_run/T23429.hs - + testsuite/tests/simplCore/should_run/T23429.stdout - testsuite/tests/simplCore/should_run/all.T - + testsuite/tests/typecheck/should_compile/T25597.hs - + testsuite/tests/typecheck/should_compile/T26256a.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T25004.hs - + testsuite/tests/typecheck/should_fail/T25004.stderr - + testsuite/tests/typecheck/should_fail/T25950.hs - + testsuite/tests/typecheck/should_fail/T25950.stderr - testsuite/tests/typecheck/should_fail/all.T - + testsuite/tests/typecheck/should_run/T25529.hs - + testsuite/tests/typecheck/should_run/T25529.stdout - + testsuite/tests/typecheck/should_run/T25998.hs - + testsuite/tests/typecheck/should_run/T25998.stdout - testsuite/tests/typecheck/should_run/all.T - utils/haddock/CHANGES.md - utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs - utils/haddock/haddock-test/src/Test/Haddock/Config.hs - utils/haddock/html-test/ref/Bug1004.html - + utils/haddock/html-test/ref/Bug25739.html - utils/haddock/html-test/ref/PatternSyns.html - utils/haddock/html-test/ref/TypeOperators.html - + utils/haddock/html-test/src/Bug25739.hs - utils/haddock/html-test/src/TypeOperators.hs - utils/hp2ps/Utilities.c - 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/e2a6fc9b398b3220c9fedbbb0cd555… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e2a6fc9b398b3220c9fedbbb0cd555… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] Fix libffi ghcjs
by Sven Tennie (＠supersven) 21 Sep '25

21 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: cc9810d4 by Sven Tennie at 2025-09-21T16:34:19+02:00 Fix libffi ghcjs - - - - - 3 changed files: - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Register.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -54,7 +54,7 @@ ghcInternalDependencies = do rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath - jsTarget <- staged isJsTarget + jsTarget <- succStaged isJsTarget useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget (succStage stage) + jsTarget <- isJsTarget stage if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Register.hs ===================================== @@ -150,7 +150,7 @@ buildConfFinal rs context@Context {..} _conf = do -- Special package cases (these should ideally be rolled into Cabal). when (package == rts) $ do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- If Cabal knew about "generated-headers", we could read them from the -- 'configuredCabal' information, and just "need" them here. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc9810d49b30cd00ab725c6dfbd74c5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc9810d49b30cd00ab725c6dfbd74c5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] WIP libffi isWinTarget
by Sven Tennie (＠supersven) 21 Sep '25

21 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: 5a166042 by Sven Tennie at 2025-09-21T09:52:31+02:00 WIP libffi isWinTarget - - - - - 1 changed file: - hadrian/src/Rules/Libffi.hs Changes: ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -187,8 +187,8 @@ libffiRules = do <$> liftIO (getDirectoryFilesIO "." [libffiPath -/- "inst//*"]) -- Find dynamic libraries. - osxTarget <- isOsxTarget stage - winTarget <- isWinTarget stage + osxTarget <- isOsxTarget (succStage stage) + winTarget <- isWinTarget (succStage stage) dynLibFiles <- do let libfilesDir = libffiPath -/- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1660422bfb4285ac2f38d7dc2d4f1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1660422bfb4285ac2f38d7dc2d4f1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] WIP libffi isJsTarget
by Sven Tennie (＠supersven) 21 Sep '25

21 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: d4c43fdc by Sven Tennie at 2025-09-21T09:25:07+02:00 WIP libffi isJsTarget - - - - - 4 changed files: - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -54,7 +54,7 @@ ghcInternalDependencies = do rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath - jsTarget <- staged isJsTarget + jsTarget <- succStaged isJsTarget useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -69,7 +69,7 @@ dynLibManifest = dynLibManifest' buildRoot -- | Need the (locally built) libffi library. needLibffi :: Stage -> Action () needLibffi stage = do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) unless jsTarget $ do manifest <- dynLibManifest stage need [manifest] ===================================== hadrian/src/Rules/Register.hs ===================================== @@ -150,7 +150,7 @@ buildConfFinal rs context@Context {..} _conf = do -- Special package cases (these should ideally be rolled into Cabal). when (package == rts) $ do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- If Cabal knew about "generated-headers", we could read them from the -- 'configuredCabal' information, and just "need" them here. ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -130,7 +130,7 @@ needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage useSystemFfi <- buildFlag UseSystemFfi (succStage stage) - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) -- Header files (in the rts build dir). let headers = fmap ((rtsPath -/- "include") -/-) libffiHeaderFiles View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4c43fdca9299ae5ab14cdc41f69006… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4c43fdca9299ae5ab14cdc41f69006… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] Fix libffi configuration
by Sven Tennie (＠supersven) 20 Sep '25

20 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: acd8d6ef by Sven Tennie at 2025-09-20T23:21:25+02:00 Fix libffi configuration Libffi needs to be built with the config of the successor stage. - - - - - 7 changed files: - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Builder.hs ===================================== @@ -241,7 +241,7 @@ instance H.Builder Builder where distro_mingw <- lookupStageBuildConfig "settings-use-distro-mingw" st -- TODO: Check this is the right stage libffi_adjustors <- targetUseLibffiForAdjustors st - use_system_ffi <- buildFlag UseSystemFfi st + use_system_ffi <- buildFlag UseSystemFfi (succStage st) return $ [ unlitPath ] ++ [ root -/- mingwStamp | windowsHost, distro_mingw == "NO" ] ===================================== hadrian/src/Context.hs ===================================== @@ -3,7 +3,7 @@ module Context ( Context (..), vanillaContext, stageContext, -- * Expressions - getStage, staged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, + getStage, staged, succStaged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, -- * Paths contextDir, buildPath, buildDir, pkgInplaceConfig, pkgSetupConfigFile, pkgSetupConfigDir, @@ -32,6 +32,9 @@ getStage = stage <$> getContext staged :: (Stage -> Action a) -> Expr Context b a staged f = getStage >>= \stage -> expr (f stage) +succStaged :: (Stage -> Action a) -> Expr Context b a +succStaged f = getStage >>= \stage -> expr (f (succStage stage)) + getInplace :: Expr Context b Inplace getInplace = iplace <$> getContext ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -55,7 +55,7 @@ rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath jsTarget <- staged isJsTarget - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS common_headers = ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -87,7 +87,7 @@ libffiContext stage = do -- | The name of the library libffiName :: Expr String libffiName = do - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) if useSystemFfi then pure "ffi" else libffiLocalName Nothing @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -54,7 +54,7 @@ withLibffi stage action = needLibffi stage -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. copyLibffiHeader :: Stage -> FilePath -> Action () copyLibffiHeader stage header = do - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) (fromStr, headerDir) <- if useSystemFfi then ("system",) <$> libffiSystemHeaderDir stage else needLibffi stage @@ -129,7 +129,7 @@ rtsLibffiLibrary stage way = do needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) jsTarget <- isJsTarget stage -- Header files (in the rts build dir). ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -107,7 +107,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do context <- getContext distPath <- expr (Context.distDynDir context) - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) buildPath <- getBuildPath libffiName' <- libffiName debugged <- buildingCompilerStage' . ghcDebugged =<< expr flavour ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -298,7 +298,7 @@ rtsPackageArgs = package rts ? do way <- getWay path <- getBuildPath top <- expr topDirectory - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) ffiIncludeDir <- staged (buildSetting FfiIncludeDir) ffiLibraryDir <- staged (buildSetting FfiLibDir) libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/acd8d6ef06e1c254f32c5b3d6647092… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/acd8d6ef06e1c254f32c5b3d6647092… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] Fix libffi configuration
by Sven Tennie (＠supersven) 20 Sep '25

20 Sep '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: 0b73a45a by Sven Tennie at 2025-09-20T20:41:30+02:00 Fix libffi configuration Libffi needs to be built with the config of the successor stage. - - - - - 7 changed files: - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Builder.hs ===================================== @@ -241,7 +241,7 @@ instance H.Builder Builder where distro_mingw <- lookupStageBuildConfig "settings-use-distro-mingw" st -- TODO: Check this is the right stage libffi_adjustors <- targetUseLibffiForAdjustors st - use_system_ffi <- buildFlag UseSystemFfi st + use_system_ffi <- buildFlag UseSystemFfi (succStage st) return $ [ unlitPath ] ++ [ root -/- mingwStamp | windowsHost, distro_mingw == "NO" ] ===================================== hadrian/src/Context.hs ===================================== @@ -3,7 +3,7 @@ module Context ( Context (..), vanillaContext, stageContext, -- * Expressions - getStage, staged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, + getStage, staged, succStaged, getPackage, getWay, getBuildPath, getHieBuildPath, getPackageDbLoc, getStagedTarget, -- * Paths contextDir, buildPath, buildDir, pkgInplaceConfig, pkgSetupConfigFile, pkgSetupConfigDir, @@ -32,6 +32,9 @@ getStage = stage <$> getContext staged :: (Stage -> Action a) -> Expr Context b a staged f = getStage >>= \stage -> expr (f stage) +succStaged :: (Stage -> Action a) -> Expr Context b a +succStaged f = getStage >>= \stage -> expr (f (succStage stage)) + getInplace :: Expr Context b Inplace getInplace = iplace <$> getContext ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -55,7 +55,7 @@ rtsDependencies :: Expr [FilePath] rtsDependencies = do rtsPath <- staged rtsBuildPath jsTarget <- staged isJsTarget - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) let -- headers common to native and JS RTS common_headers = ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -69,7 +69,7 @@ dynLibManifest = dynLibManifest' buildRoot -- | Need the (locally built) libffi library. needLibffi :: Stage -> Action () needLibffi stage = do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) unless jsTarget $ do manifest <- dynLibManifest stage need [manifest] @@ -87,7 +87,7 @@ libffiContext stage = do -- | The name of the library libffiName :: Expr String libffiName = do - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) if useSystemFfi then pure "ffi" else libffiLocalName Nothing @@ -159,7 +159,7 @@ libffiRules :: Rules () libffiRules = do _ <- addOracleCache $ \ (LibffiDynLibs stage) -> do - jsTarget <- isJsTarget stage + jsTarget <- isJsTarget (succStage stage) if jsTarget then return [] else readFileLines =<< dynLibManifest stage ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -33,7 +33,7 @@ rtsRules = priority 3 $ do -- Header files -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. forM_ libffiHeaderFiles $ \header -> - buildPath -/- "include" -/- header %> copyLibffiHeader stage + buildPath -/- "include" -/- header %> copyLibffiHeader (succStage stage) -- Static libraries. buildPath -/- "libCffi*.a" %> copyLibffiStatic stage @@ -54,7 +54,7 @@ withLibffi stage action = needLibffi stage -- See Note [Packaging libffi headers] in GHC.Driver.CodeOutput. copyLibffiHeader :: Stage -> FilePath -> Action () copyLibffiHeader stage header = do - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) (fromStr, headerDir) <- if useSystemFfi then ("system",) <$> libffiSystemHeaderDir stage else needLibffi stage @@ -129,7 +129,7 @@ rtsLibffiLibrary stage way = do needRtsLibffiTargets :: Stage -> Action [FilePath] needRtsLibffiTargets stage = do rtsPath <- rtsBuildPath stage - useSystemFfi <- buildFlag UseSystemFfi stage + useSystemFfi <- buildFlag UseSystemFfi (succStage stage) jsTarget <- isJsTarget stage -- Header files (in the rts build dir). ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -107,7 +107,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do context <- getContext distPath <- expr (Context.distDynDir context) - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) buildPath <- getBuildPath libffiName' <- libffiName debugged <- buildingCompilerStage' . ghcDebugged =<< expr flavour ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -298,7 +298,7 @@ rtsPackageArgs = package rts ? do way <- getWay path <- getBuildPath top <- expr topDirectory - useSystemFfi <- staged (buildFlag UseSystemFfi) + useSystemFfi <- succStaged (buildFlag UseSystemFfi) ffiIncludeDir <- staged (buildSetting FfiIncludeDir) ffiLibraryDir <- staged (buildSetting FfiLibDir) libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0b73a45ab14cf4dddc8c359ca6694d9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0b73a45ab14cf4dddc8c359ca6694d9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] wasm: fix dyld handling for forward declared GOT.func items
by Marge Bot (＠marge-bot) 20 Sep '25

20 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 867c2675 by Cheng Shao at 2025-09-20T06:49:28-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - 6 changed files: - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/all.T - utils/jsffi/dyld.mjs Changes: ===================================== testsuite/tests/ghci-wasm/Makefile ===================================== @@ -0,0 +1,7 @@ +TOP=../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +T26430_setup : + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared T26430A.c -o libT26430A.so + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -shared -L. -lT26430A T26430B.c -o libT26430B.so ===================================== testsuite/tests/ghci-wasm/T26430.hs ===================================== @@ -0,0 +1 @@ +foreign import ccall unsafe "baz" main :: IO () ===================================== testsuite/tests/ghci-wasm/T26430A.c ===================================== @@ -0,0 +1,5 @@ +void foo(void); + +void bar(void (*)(void)); + +__attribute__((export_name("baz"))) void baz(void) { bar(foo); } ===================================== testsuite/tests/ghci-wasm/T26430B.c ===================================== @@ -0,0 +1,3 @@ +__attribute__((export_name("foo"))) void foo(void) {} + +__attribute__((export_name("bar"))) void bar(void (*f)(void)) { f(); } ===================================== testsuite/tests/ghci-wasm/all.T ===================================== @@ -0,0 +1,12 @@ +setTestOpts([ + unless(arch('wasm32'), skip), + only_ways(['ghci', 'ghci-opt']), + extra_ways(['ghci', 'ghci-opt']) +]) + +test('T26430', [ + extra_files(['T26430A.c', 'T26430B.c']), + pre_cmd('$MAKE -s --no-print-directory T26430_setup ghciWayFlags=' + config.ghci_way_flags), + extra_hc_opts('-L. -lT26430B')] +, compile_and_run, [''] +) ===================================== utils/jsffi/dyld.mjs ===================================== @@ -1013,10 +1013,13 @@ class DyLD { // anything, if it's required later a GOT.func entry will be // created on demand. if (this.#gotFunc[k]) { - // ghc-prim/ghc-internal may export functions imported by - // rts - console.assert(this.#gotFunc[k].value === DyLD.#poison); - this.#table.set(this.#gotFunc[k].value, v); + const got = this.#gotFunc[k]; + if (got.value === DyLD.#poison) { + const idx = this.#table.grow(1, v); + got.value = idx; + } else { + this.#table.set(got.value, v); + } } continue; } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/867c26755e8855c6df949e65df0c2ae… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/867c26755e8855c6df949e65df0c2ae… You're receiving this email because of your account on gitlab.haskell.org.

1 0