- ghc-commits - Haskell.org

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

13 Oct '25

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

1 0

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

13 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 14281a22 by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/nonmoving: Fix comment spelling - - - - - bedd38b0 by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/nonmoving: Use atomic operations to update bd->flags - - - - - 215d6841 by Ben Gamari at 2025-10-11T14:06:47-04:00 nonmoving: Use get_itbl instead of explicit loads This is cleaner and also fixes unnecessary (and unsound) use of `volatile`. - - - - - 2c94aa3a by Ben Gamari at 2025-10-11T14:06:47-04:00 rts/Scav: Handle WHITEHOLEs in scavenge_one `scavenge_one`, used to scavenge mutable list entries, may encounter `WHITEHOLE`s when the non-moving GC is in use via two paths: 1. when an MVAR is being marked concurrently 2. when the object belongs to a chain of selectors being short-cutted. Fixes #26204. - - - - - 6bd8155c by Matthew Pickering at 2025-10-11T14:07:29-04:00 Add support for generating bytecode objects This commit adds the `-fwrite-byte-code` option which makes GHC emit a `.gbc` file which contains a serialised representation of bytecode. The bytecode can be loaded by the compiler to avoid having to reinterpret a module when using the bytecode interpreter (for example, in GHCi). There are also the new options: * -gbcdir=<DIR>: Specify the directory to place the gbc files * -gbcsuf=<suffix>: Specify the suffix for gbc files The option `-fbyte-code-and-object-code` now implies `-fwrite-byte-code`. These performance tests fail due to https://github.com/haskell/directory/issues/204 ------------------------- Metric Increase: MultiComponentModules MultiLayerModules MultiComponentModulesRecomp MultiLayerModulesRecomp MultiLayerModulesTH_Make MultiLayerModulesTH_OneShot T13701 ------------------------- The bytecode serialisation part was implemented by Cheng Shao Co-authored-by: Cheng Shao <terrorjack(a)type.dance> - - - - - dc8f9599 by Matthew Pickering at 2025-10-11T14:07:30-04:00 Revert "Add a perf test for #26425" This test has a large memory spike currently, which makes the test sensitive, since if you allocate a little more or less, the precise location where GC happens shifts and you observe a different part of the spike. Andreas told me to revert the patch for now, and he will add it back when he fixes the memory spike. This reverts commit 41bdb16fd083110a06507248f648c507a2feb4af. - - - - - c7b1f359 by Rodrigo Mesquita at 2025-10-13T16:46:35+01:00 Move code-gen aux symbols from ghc-internal to rts These symbols were all previously defined in ghc-internal and made the dependency structure awkward, where the rts may refer to some of these symbols and had to work around that circular dependency the way described in #26166. Moreover, the code generator will produce code that uses these symbols! Therefore, they should be available in the rts: PRINCIPLE: If the code generator may produce code which uses this symbol, then it should be defined in the rts rather than, say, ghc-internal. That said, the main motivation is towards fixing #26166. Towards #26166. Pre-requisite of !14892 - - - - - 4fdde7d0 by Ben Gamari at 2025-10-13T16:46:35+01:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> - - - - - 118 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/Data/FlatBag.hs - compiler/GHC/Data/SmallArray.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backpack.hs - + compiler/GHC/Driver/ByteCode.hs - compiler/GHC/Driver/Config/Finder.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Messager.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/Module/Graph.hs - compiler/GHC/Unit/Module/Location.hs - compiler/GHC/Unit/Module/ModSummary.hs - compiler/GHC/Unit/Module/WholeCoreBindings.hs - compiler/GHC/Utils/Binary.hs - compiler/ghc.cabal.in - docs/users_guide/phases.rst - docs/users_guide/separate_compilation.rst - hadrian/src/Settings/Packages.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - rts/BuiltinClosures.c - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Prelude.h - rts/PrimOps.cmm - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.c - rts/Schedule.c - rts/StgStdThunks.cmm - rts/configure.ac - − rts/external-symbols.list.in - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - + rts/include/rts/RtsToHsIface.h - rts/include/rts/storage/Block.h - rts/include/stg/Prim.h - rts/posix/Signals.c - libraries/ghc-internal/cbits/atomic.c → rts/prim/atomic.c - libraries/ghc-internal/cbits/bitrev.c → rts/prim/bitrev.c - libraries/ghc-internal/cbits/bswap.c → rts/prim/bswap.c - libraries/ghc-internal/cbits/clz.c → rts/prim/clz.c - libraries/ghc-internal/cbits/ctz.c → rts/prim/ctz.c - libraries/ghc-internal/cbits/int64x2minmax.c → rts/prim/int64x2minmax.c - libraries/ghc-internal/cbits/longlong.c → rts/prim/longlong.c - libraries/ghc-internal/cbits/mulIntMayOflo.c → rts/prim/mulIntMayOflo.c - libraries/ghc-internal/cbits/pdep.c → rts/prim/pdep.c - libraries/ghc-internal/cbits/pext.c → rts/prim/pext.c - libraries/ghc-internal/cbits/popcnt.c → rts/prim/popcnt.c - libraries/ghc-internal/cbits/vectorQuotRem.c → rts/prim/vectorQuotRem.c - libraries/ghc-internal/cbits/word2float.c → rts/prim/word2float.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/sm/NonMoving.c - rts/sm/NonMovingMark.c - rts/sm/Scav.c - rts/wasm/JSFFI.c - rts/win32/libHSghc-internal.def - testsuite/tests/bytecode/T24634/T24634a.stdout - testsuite/tests/bytecode/T24634/T24634b.stdout - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/driver/bytecode-object/A.hs - + testsuite/tests/driver/bytecode-object/BytecodeForeign.c - + testsuite/tests/driver/bytecode-object/BytecodeForeign.hs - + testsuite/tests/driver/bytecode-object/BytecodeMain.hs - + testsuite/tests/driver/bytecode-object/BytecodeTest.hs - + testsuite/tests/driver/bytecode-object/Makefile - + testsuite/tests/driver/bytecode-object/all.T - + testsuite/tests/driver/bytecode-object/bytecode_object12.stderr - + testsuite/tests/driver/bytecode-object/bytecode_object13.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object14.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object15.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object16.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object17.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object18.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object19.script - + testsuite/tests/driver/bytecode-object/bytecode_object19.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object25.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object4.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object5.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object6.stdout - testsuite/tests/driver/fat-iface/T22405/T22405.stdout - testsuite/tests/driver/fat-iface/T22405/T22405b.stdout - testsuite/tests/driver/fat-iface/fat011.stderr - testsuite/tests/perf/compiler/Makefile - + testsuite/tests/perf/compiler/MultiLayerModulesDefsGhciWithBytecodeFiles.script - − testsuite/tests/perf/compiler/T26425.hs - testsuite/tests/perf/compiler/all.T - testsuite/tests/simplStg/should_compile/T22840.stderr - utils/deriveConstants/Main.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa15c2a3648a51a2b40c689d1dcd9c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fa15c2a3648a51a2b40c689d1dcd9c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

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

13 Oct '25

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

1 0

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

13 Oct '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/T24120
by Ben Gamari (＠bgamari) 13 Oct '25

13 Oct '25

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

1 0

[Git][ghc/ghc][wip/fix-link-node-errors] driver: Properly handle errors during LinkNode steps
by Matthew Pickering (＠mpickering) 13 Oct '25

13 Oct '25

Matthew Pickering pushed to branch wip/fix-link-node-errors at Glasgow Haskell Compiler / GHC Commits: ae57144f by Matthew Pickering at 2025-10-13T13:01:22+01:00 driver: Properly handle errors during LinkNode steps Previously we were not properly catching errors during the LinkNode step (see T9930fail test). This is fixed by wrapping the `LinkNode` action in `wrapAction`, the same handler which is used for module compilation. Fixes #26496 - - - - - 2 changed files: - compiler/GHC/Driver/Make.hs - testsuite/tests/ghc-e/should_fail/T9930fail.stderr Changes: ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -1847,24 +1847,25 @@ Also closely related are -} executeLinkNode :: HomeUnitGraph -> (Int, Int) -> UnitId -> [NodeKey] -> RunMakeM () -executeLinkNode hug kn uid deps = do +executeLinkNode hug kn@(k, _) uid deps = do withCurrentUnit uid $ do - MakeEnv{..} <- ask + make_env@MakeEnv{..} <- ask let dflags = hsc_dflags hsc_env - let hsc_env' = setHUG hug hsc_env msg' = (\messager -> \recomp -> messager hsc_env kn recomp (LinkNode deps uid)) <$> env_messager - linkresult <- liftIO $ withAbstractSem compile_sem $ do - link (ghcLink dflags) - (hsc_logger hsc_env') - (hsc_tmpfs hsc_env') - (hsc_FC hsc_env') - (hsc_hooks hsc_env') - dflags - (hsc_unit_env hsc_env') - True -- We already decided to link - msg' - (hsc_HPT hsc_env') + linkresult <- lift $ MaybeT $ withAbstractSem compile_sem $ withLoggerHsc k make_env $ \lcl_hsc_env -> do + let hsc_env' = setHUG hug lcl_hsc_env + wrapAction diag_wrapper hsc_env' $ do + link (ghcLink dflags) + (hsc_logger hsc_env') + (hsc_tmpfs hsc_env') + (hsc_FC hsc_env') + (hsc_hooks hsc_env') + dflags + (hsc_unit_env hsc_env') + True -- We already decided to link + msg' + (hsc_HPT hsc_env') case linkresult of Failed -> fail "Link Failed" Succeeded -> return () ===================================== testsuite/tests/ghc-e/should_fail/T9930fail.stderr ===================================== @@ -1,11 +1,4 @@ -ghc: Uncaught exception ghc-9.13-inplace:GHC.Utils.Panic.GhcException: - -default output name would overwrite the input file; must specify -o explicitly +<no location info>: error: + default output name would overwrite the input file; must specify -o explicitly Usage: For basic information, try the `--help' option. -While handling default output name would overwrite the input file; must specify -o explicitly - | Usage: For basic information, try the `--help' option. - -HasCallStack backtrace: - bracket, called at compiler/GHC/Driver/MakeAction.hs:2955:3 in ghc-9.13-inplace:GHC.Driver.MakeAction - View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae57144f22c77173724b831a04ace1a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae57144f22c77173724b831a04ace1a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-link-node-errors] driver: Properly handle errors during LinkNode steps
by Matthew Pickering (＠mpickering) 13 Oct '25

13 Oct '25

Matthew Pickering pushed to branch wip/fix-link-node-errors at Glasgow Haskell Compiler / GHC Commits: e8c905e8 by Matthew Pickering at 2025-10-13T12:34:16+01:00 driver: Properly handle errors during LinkNode steps Previously we were not properly catching errors during the LinkNode step (see T9930fail test). This is fixed by wrapping the `LinkNode` action in `wrapAction`, the same handler which is used for module compilation. Fixes #26496 - - - - - 2 changed files: - compiler/GHC/Driver/Make.hs - testsuite/tests/ghc-e/should_fail/T9930fail.stderr Changes: ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -1847,24 +1847,20 @@ Also closely related are -} executeLinkNode :: HomeUnitGraph -> (Int, Int) -> UnitId -> [NodeKey] -> RunMakeM () -executeLinkNode hug kn uid deps = do +executeLinkNode hug kn@(k, _) uid deps = do withCurrentUnit uid $ do - MakeEnv{..} <- ask + make_env@MakeEnv{..} <- ask let dflags = hsc_dflags hsc_env - let hsc_env' = setHUG hug hsc_env msg' = (\messager -> \recomp -> messager hsc_env kn recomp (LinkNode deps uid)) <$> env_messager - linkresult <- liftIO $ withAbstractSem compile_sem $ do - link (ghcLink dflags) - (hsc_logger hsc_env') - (hsc_tmpfs hsc_env') - (hsc_FC hsc_env') - (hsc_hooks hsc_env') - dflags - (hsc_unit_env hsc_env') - True -- We already decided to link - msg' - (hsc_HPT hsc_env') + linkresult <- lift $ MaybeT $ withAbstractSem compile_sem $ withLoggerHsc k make_env $ \lcl_hsc_env -> do + let hsc_env' = setHUG hug lcl_hsc_env + wrapAction diag_wrapper hsc_env' $ do + link (ghcLink dflags) + hsc_env' + True -- We already decided to link + msg' + (hsc_HPT hsc_env') case linkresult of Failed -> fail "Link Failed" Succeeded -> return () ===================================== testsuite/tests/ghc-e/should_fail/T9930fail.stderr ===================================== @@ -1,11 +1,4 @@ -ghc: Uncaught exception ghc-9.13-inplace:GHC.Utils.Panic.GhcException: - -default output name would overwrite the input file; must specify -o explicitly +<no location info>: error: + default output name would overwrite the input file; must specify -o explicitly Usage: For basic information, try the `--help' option. -While handling default output name would overwrite the input file; must specify -o explicitly - | Usage: For basic information, try the `--help' option. - -HasCallStack backtrace: - bracket, called at compiler/GHC/Driver/MakeAction.hs:2955:3 in ghc-9.13-inplace:GHC.Driver.MakeAction - View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e8c905e8fc89e0779857426b02057fd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e8c905e8fc89e0779857426b02057fd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-link-node-errors
by Matthew Pickering (＠mpickering) 13 Oct '25

13 Oct '25

Matthew Pickering pushed new branch wip/fix-link-node-errors at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-link-node-errors 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 trailing whitespace
by Sven Tennie (＠supersven) 13 Oct '25

13 Oct '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: db447b27 by Sven Tennie at 2025-10-13T08:35:30+02:00 Fix trailing whitespace - - - - - 1 changed file: - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -275,7 +275,7 @@ ghcInternalArgs = package ghcInternal ? do , staged (buildFlag GmpInTree) ? arg "--configure-option=--with-intree-gmp" -- prefer framework over library (on Darwin) - , staged (buildFlag GmpFrameworkPref) + , staged (buildFlag GmpFrameworkPref) ? arg "--configure-option=--with-gmp-framework-preferred" -- Ensure that the ghc-internal package registration includes View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/db447b27430492c6c5db5a5e145aa36… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/db447b27430492c6c5db5a5e145aa36… 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] 3 commits: Adjust host_fully_static for stage2 cross builds
by Sven Tennie (＠supersven) 13 Oct '25

13 Oct '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: 14bfef41 by Sven Tennie at 2025-10-13T08:25:06+02:00 Adjust host_fully_static for stage2 cross builds - - - - - 04a711b3 by Sven Tennie at 2025-10-13T08:25:19+02:00 Reference correct package.conf.d for cross - - - - - 5b6fbe2e by Sven Tennie at 2025-10-13T08:25:23+02:00 Fixup Rebase - - - - - 5 changed files: - hadrian/src/Flavour.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Flavour.hs ===================================== @@ -402,17 +402,35 @@ fullyStatic flavour = -- libraries. hostFullyStatic :: Flavour -> Flavour hostFullyStatic flavour = - addArgs staticExec $ disableDynamicGhcPrograms flavour + addArgs staticExec . noDynamicRts $ disableDynamicGhcPrograms flavour where -- Unlike 'fullyStatic', we need to ensure these flags are only -- applied to host code. staticExec :: Args - staticExec = stage0 ? mconcat + staticExec = stage1 ? mconcat [ builder (Ghc CompileHs) ? pure [ "-fPIC", "-static" ] , builder (Ghc CompileCWithGhc) ? pure [ "-fPIC", "-optc", "-static"] , builder (Ghc LinkHs) ? pure [ "-optl", "-static" ] ] + noDynamicRts :: Flavour -> Flavour + noDynamicRts f = + f + { rtsWays = do + ws <- rtsWays f + mconcat + [ notM stage1 ? pure ws, + stage1 + ? pure (ws `Set.difference` Set.fromList [dynamic, profilingDynamic, threadedDynamic, threadedDebugDynamic, threadedProfilingDynamic, threadedDebugProfilingDynamic, debugDynamic, debugProfilingDynamic]) + ] + , libraryWays = do + ws <- libraryWays f + mconcat + [ notM stage1 ? pure ws, + stage1 + ? pure (ws `Set.difference` Set.fromList [dynamic, profilingDynamic, threadedDynamic, threadedDebugDynamic, threadedProfilingDynamic, threadedDebugProfilingDynamic, debugDynamic, debugProfilingDynamic ]) + ] + } -- | Build stage2 dependencies with options to enable collection of compiler -- stats. ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -619,7 +619,7 @@ generatePlatformHostHs = do stage <- getStage let chooseHostQuery = case stage of Stage0 {} -> queryHost - _ -> queryTarget + _ -> queryTarget stage cHostPlatformArch <- chooseHostQuery (archOS_arch . tgtArchOs) cHostPlatformOS <- chooseHostQuery (archOS_OS . tgtArchOs) return $ unlines ===================================== hadrian/src/Settings/Builders/RunTest.hs ===================================== @@ -96,8 +96,9 @@ allowHaveLLVM = not . (`elem` ["wasm32", "javascript"]) -- inTreeCompilerArgs :: Stage -> Action TestCompilerArgs inTreeCompilerArgs stg = do - + isCrossStage <- crossStage stg let ghcStage = succStage stg + pkgCacheStage = if isCrossStage then ghcStage else stg (hasDynamicRts, hasThreadedRts) <- do ways <- interpretInContext (vanillaContext ghcStage rts) getRtsWays return (dynamic `elem` ways, threaded `elem` ways) @@ -130,7 +131,7 @@ inTreeCompilerArgs stg = do top <- topDirectory pkgConfCacheFile <- System.FilePath.normalise . (top -/-) - <$> (packageDbPath (PackageDbLoc stg Final) <&> (-/- "package.cache")) + <$> (packageDbPath (PackageDbLoc pkgCacheStage Final) <&> (-/- "package.cache")) libdir <- System.FilePath.normalise . (top -/-) <$> stageLibPath stg ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -139,7 +139,7 @@ stagedPackages stage = do libraries0 <- filter good_stage0_package <$> stage0Packages cross <- flag CrossCompiling winTarget <- isWinTarget stage - haveCurses <- any (/= "") <$> traverse setting [ CursesIncludeDir, CursesLibDir ] + haveCurses <- any (/= "") <$> traverse (flip buildSetting stage) [ CursesIncludeDir, CursesLibDir ] let when c xs = if c then xs else mempty ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -3,236 +3,50 @@ module Settings.Packages (packageArgs) where import Data.Version.Extra import Expression import Flavour -import GHC.Platform.ArchOS -import qualified GHC.Toolchain.Library as Lib -import GHC.Toolchain.Target +import Oracles.Setting hiding (ghcWithInterpreter) import Oracles.Flag -import Oracles.Setting import Packages import Settings import Settings.Builders.Common (wayCcArgs) +import qualified GHC.Toolchain.Library as Lib +import GHC.Toolchain.Target +import GHC.Platform.ArchOS +import Settings.Program (ghcWithInterpreter) + -- | Package-specific command-line arguments. packageArgs :: Args packageArgs = do - stage <- getStage - path <- getBuildPath - compilerPath <- expr $ buildPath (vanillaContext stage compiler) - - let -- Do not bind the result to a Boolean: this forces the configure rule - -- immediately and may lead to cyclic dependencies. - -- See: https://gitlab.haskell.org/ghc/ghc/issues/16809. - cross = flag CrossCompiling - haveCurses = any (/= "") <$> traverse (flip buildSetting stage) [CursesIncludeDir, CursesLibDir] - - -- Check if the bootstrap compiler has the same version as the one we - -- are building. This is used to build cross-compilers - bootCross = (==) <$> ghcVersionStage (stage0InTree) <*> ghcVersionStage Stage1 - - compilerStageOption f = buildingCompilerStage' . f =<< expr flavour - - cursesIncludeDir <- staged (buildSetting CursesIncludeDir) - cursesLibraryDir <- staged (buildSetting CursesLibDir) - ffiIncludeDir <- staged (buildSetting FfiIncludeDir) - ffiLibraryDir <- staged (buildSetting FfiLibDir) - libzstdIncludeDir <- staged (buildSetting LibZstdIncludeDir) - libzstdLibraryDir <- staged (buildSetting LibZstdLibDir) - stageVersion <- readVersion <$> (expr $ ghcVersionStage stage) - - mconcat - --------------------------------- base --------------------------------- - [ package base - ? mconcat + stage <- getStage + path <- getBuildPath + compilerPath <- expr $ buildPath (vanillaContext stage compiler) + + let -- Do not bind the result to a Boolean: this forces the configure rule + -- immediately and may lead to cyclic dependencies. + -- See: https://gitlab.haskell.org/ghc/ghc/issues/16809. + cross = flag CrossCompiling + haveCurses = any (/= "") <$> traverse (flip buildSetting stage) [CursesIncludeDir, CursesLibDir] + + -- Check if the bootstrap compiler has the same version as the one we + -- are building. This is used to build cross-compilers + bootCross = (==) <$> ghcVersionStage (stage0InTree) <*> ghcVersionStage Stage1 + + compilerStageOption f = buildingCompilerStage' . f =<< expr flavour + + cursesIncludeDir <- staged (buildSetting CursesIncludeDir) + cursesLibraryDir <- staged (buildSetting CursesLibDir) + ffiIncludeDir <- staged (buildSetting FfiIncludeDir) + ffiLibraryDir <- staged (buildSetting FfiLibDir) + libzstdIncludeDir <- staged (buildSetting LibZstdIncludeDir) + libzstdLibraryDir <- staged (buildSetting LibZstdLibDir) + stageVersion <- readVersion <$> (expr $ ghcVersionStage stage) + + mconcat + --------------------------------- base --------------------------------- + [ package base ? mconcat [ -- This fixes the 'unknown symbol stat' issue. -- See: https://github.com/snowleopard/hadrian/issues/259. - builder (Ghc CompileCWithGhc) ? arg "-optc-O2" - ], - --------------------------------- cabal -------------------------------- - -- Cabal is a large library and slow to compile. Moreover, we build it - -- for Stage0 only so we can link ghc-pkg against it, so there is little - -- reason to spend the effort to optimise it. - package cabal - ? stage0 - ? builder Ghc - ? arg "-O0", - ------------------------------- compiler ------------------------------- - package compiler - ? mconcat - [ builder Alex ? arg "--latin1", - builder (Ghc CompileHs) - ? mconcat - [ compilerStageOption ghcDebugAssertions ? arg "-DDEBUG", - inputs ["**/GHC.hs", "**/GHC/Driver/Make.hs"] ? arg "-fprof-auto", - input "**/Parser.hs" - ? pure ["-fno-ignore-interface-pragmas", "-fcmm-sink"], - -- Enable -haddock and -Winvalid-haddock for the compiler - arg "-haddock", - notStage0 ? arg "-Winvalid-haddock", - -- These files take a very long time to compile with -O1, - -- so we use -O0 for them just in Stage0 to speed up the - -- build but not affect Stage1+ executables - inputs ["**/GHC/Hs/Instances.hs", "**/GHC/Driver/Session.hs"] - ? stage0 - ? pure ["-O0"] - ], - builder (Cabal Setup) - ? mconcat - [ arg "--disable-library-for-ghci", - anyTargetOs stage [OSOpenBSD] ? arg "--ld-options=-E", - compilerStageOption ghcProfiled ? arg "--ghc-pkg-option=--force", - cabalExtraDirs libzstdIncludeDir libzstdLibraryDir - ], - builder (Cabal Flags) - ? mconcat - -- In order to enable internal-interpreter for the ghc - -- library: - -- - -- 1. ghcWithInterpreter must be True ("Use interpreter" = - -- "YES") - -- 2. For non-cross case it can be enabled - -- 3. For cross case, disable for stage0 since that runs - -- on the host and must rely on external interpreter to - -- load target code, otherwise enable for stage1 since - -- that runs on the target and can use target's own - -- ghci object linker - [ andM [expr (ghcWithInterpreter stage), orM [notCross, stage2]] `cabalFlag` "internal-interpreter", - orM [notM cross, haveCurses] `cabalFlag` "terminfo", - flag UseLibzstd `cabalFlag` "with-libzstd", - -- ROMES: While the boot compiler is not updated wrt -this-unit-id - -- not being fixed to `ghc`, when building stage0, we must set - -- -this-unit-id to `ghc` because the boot compiler expects that. - -- We do it through a cabal flag in ghc.cabal - stageVersion < makeVersion [9, 8, 1] ? arg "+hadrian-stage0", - flag StaticLibzstd `cabalFlag` "static-libzstd", - stage0 `cabalFlag` "bootstrap" - ], - builder (Haddock BuildPackage) ? arg ("--optghc=-I" ++ path) - ], - ---------------------------------- ghc --------------------------------- - package ghc - ? mconcat - [ builder Ghc - ? mconcat - [ arg ("-I" ++ compilerPath), - compilerStageOption ghcDebugAssertions ? arg "-DDEBUG" - ], - builder (Cabal Flags) - ? mconcat - [ (expr (ghcWithInterpreter stage)) `cabalFlag` "internal-interpreter", - ifM - stage0 - -- We build a threaded stage 1 if the bootstrapping compiler - -- supports it. - (threadedBootstrapper `cabalFlag` "threaded") - -- We build a threaded stage N, N>1 if the configuration calls - -- for it. - (compilerStageOption ghcThreaded `cabalFlag` "threaded") - ] - ], - -------------------------------- ghcPkg -------------------------------- - package ghcPkg - ? builder (Cabal Flags) - ? orM [notM cross, haveCurses] - `cabalFlag` "terminfo", - -------------------------------- ghcBoot ------------------------------ - package ghcBoot - ? builder (Cabal Flags) - ? (stage0 `cabalFlag` "bootstrap"), - --------------------------------- ghci --------------------------------- - package ghci - ? mconcat - [ -- The use case here is that we want to build @iserv-proxy@ for the - -- cross compiler. That one needs to be compiled by the bootstrap - -- compiler as it needs to run on the host. Hence @iserv@ needs - -- @GHCi.TH@, @GHCi.Message@, @GHCi.Run@, and @GHCi.Server@ from - -- @ghci@. And those are behind the @-finternal-interpreter@ flag. - -- - -- But it may not build if we have made some changes to ghci's - -- dependencies (see #16051). - -- - -- To fix this properly Hadrian would need to: - -- * first build a compiler for the build platform (stage1 is enough) - -- * use it as a bootstrap compiler to build the stage1 cross-compiler - -- - -- The issue is that "configure" would have to be executed twice (for - -- the build platform and for the cross-platform) and Hadrian would - -- need to be fixed to support two different stage1 compilers. - -- - -- The workaround we use is to check if the bootstrap compiler has - -- the same version as the one we are building. In this case we can - -- avoid the first step above and directly build with - -- `-finternal-interpreter`. - -- - -- TODO: Note that in that case we also do not need to build most of - -- the Stage1 libraries, as we already know that the bootstrap - -- compiler comes with the same versions as the one we are building. - -- - builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir, - builder (Cabal Flags) - ? mconcat - [ ifM - stage0 - (andM [cross, bootCross] `cabalFlag` "internal-interpreter") - (arg "internal-interpreter"), - stage0 `cabalFlag` "bootstrap" - ] - ], - package unix ? builder (Cabal Flags) ? arg "+os-string", - package directory ? builder (Cabal Flags) ? arg "+os-string", - package win32 ? builder (Cabal Flags) ? arg "+os-string", - --------------------------------- iserv -------------------------------- - -- Add -Wl,--export-dynamic enables GHCi to load dynamic objects that - -- refer to the RTS. This is harmless if you don't use it (adds a bit - -- of overhead to startup and increases the binary sizes) but if you - -- need it there's no alternative. - -- - -- The Solaris linker does not support --export-dynamic option. It also - -- does not need it since it exports all dynamic symbols by default - package iserv - ? expr (isElfTarget stage) - ? notM (expr $ anyTargetOs stage [OSFreeBSD, OSSolaris2]) - ? mconcat - [builder (Ghc LinkHs) ? arg "-optl-Wl,--export-dynamic"], - -------------------------------- haddock ------------------------------- - package haddockApi - ? builder (Cabal Flags) - ? arg "in-ghc-tree", - ---------------------------- ghc-boot-th-next -------------------------- - package ghcBootThNext - ? builder (Cabal Flags) - ? stage0 - `cabalFlag` "bootstrap", - ---------------------------------- text -------------------------------- - package text - ? ifM - (textWithSIMDUTF <$> expr flavour) - (builder (Cabal Flags) ? arg "+simdutf") - (builder (Cabal Flags) ? arg "-simdutf"), - ------------------------------- haskeline ------------------------------ - -- Hadrian doesn't currently support packages containing both libraries - -- and executables. This flag disables the latter. - package haskeline - ? builder (Cabal Flags) - ? arg "-examples", - -- Don't depend upon terminfo when cross-compiling to avoid unnecessary - -- dependencies unless the user provided ncurses explicitly. - -- TODO: Perhaps the user should be able to explicitly enable/disable this. - package haskeline - ? builder (Cabal Flags) - ? orM [notM cross, haveCurses] - `cabalFlag` "terminfo", - -------------------------------- terminfo ------------------------------ - package terminfo - ? builder (Cabal Setup) - ? cabalExtraDirs cursesIncludeDir cursesLibraryDir, - -------------------------------- hsc2hs -------------------------------- - package hsc2hs - ? builder (Cabal Flags) - ? arg "in-ghc-tree", - ------------------------------ ghc-internal ------------------------------ - ghcInternalArgs, - ---------------------------------- rts --------------------------------- - package rts ? rtsPackageArgs, -- RTS deserves a separate function + builder (Ghc CompileCWithGhc) ? arg "-optc-O2" ] --------------------------------- cabal -------------------------------- -- Cabal is a large library and slow to compile. Moreover, we build it @@ -268,25 +82,28 @@ packageArgs = do ] , builder (Cabal Flags) ? mconcat - -- For the ghc library, internal-interpreter only makes - -- sense when we're not cross compiling. For cross GHC, - -- external interpreter is used for loading target code - -- and internal interpreter is supposed to load native - -- code for plugins (!7377), however it's unfinished work - -- (#14335) and completely untested in CI for cross - -- backends at the moment, so we might as well disable it - -- for cross GHC. - -- TODO: MP - [ andM [expr (ghcWithInterpreter stage)] `cabalFlag` "internal-interpreter" + -- In order to enable internal-interpreter for the ghc + -- library: + -- + -- 1. ghcWithInterpreter must be True ("Use interpreter" = + -- "YES") + -- 2. For non-cross case it can be enabled + -- 3. For cross case, disable for stage0 since that runs + -- on the host and must rely on external interpreter to + -- load target code, otherwise enable for stage1 since + -- that runs on the target and can use target's own + -- ghci object linker + [ andM [expr (ghcWithInterpreter stage), orM [notM (expr cross), stage2]] `cabalFlag` "internal-interpreter" , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + , arg "-build-tool-depends" , staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd" -- ROMES: While the boot compiler is not updated wrt -this-unit-id -- not being fixed to `ghc`, when building stage0, we must set -- -this-unit-id to `ghc` because the boot compiler expects that. -- We do it through a cabal flag in ghc.cabal , stageVersion < makeVersion [9,8,1] ? arg "+hadrian-stage0" - , stage0 `cabalFlag` "bootstrap" , staged (buildFlag StaticLibzstd) `cabalFlag` "static-libzstd" + , stage0 `cabalFlag` "bootstrap" ] , builder (Haddock BuildPackage) ? arg ("--optghc=-I" ++ path) ] @@ -414,24 +231,22 @@ packageArgs = do , package rts ? rtsPackageArgs -- RTS deserves a separate function -------------------------------- runGhc -------------------------------- - , package runGhc - ? builder Ghc - ? input "**/Main.hs" - ? (\version -> ["-cpp", "-DVERSION=" ++ show version]) - <$> getSetting ProjectVersion + , package runGhc ? + builder Ghc ? input "**/Main.hs" ? + (\version -> ["-cpp", "-DVERSION=" ++ show version]) <$> getSetting ProjectVersion + --------------------------------- genprimopcode ------------------------ , package genprimopcode - ? builder (Cabal Flags) - ? arg "-build-tool-depends" + ? builder (Cabal Flags) ? arg "-build-tool-depends" + --------------------------------- hpcBin ---------------------------------- , package hpcBin - ? builder (Cabal Flags) - ? arg "-build-tool-depends" + ? builder (Cabal Flags) ? arg "-build-tool-depends" + ] ghcInternalArgs :: Args -ghcInternalArgs = - package ghcInternal ? do +ghcInternalArgs = package ghcInternal ? do -- These are only used for non-in-tree builds. librariesGmp <- staged (buildSetting GmpLibDir) includesGmp <- staged (buildSetting GmpIncludeDir) @@ -442,23 +257,27 @@ ghcInternalArgs = mconcat [ -- select bignum backend builder (Cabal Flags) ? arg ("bignum-" <> backend) + , -- check the selected backend against native backend builder (Cabal Flags) ? check `cabalFlag` "bignum-check" + -- backend specific , case backend of - "gmp" -> - mconcat - [ builder (Cabal Setup) - ? mconcat + "gmp" -> mconcat + [ builder (Cabal Setup) ? mconcat + -- enable GMP backend: configure script will produce -- `ghc-internal.buildinfo` and `include/HsIntegerGmp.h` [ arg "--configure-option=--with-gmp" + -- enable in-tree support: don't depend on external "gmp" -- library , staged (buildFlag GmpInTree) ? arg "--configure-option=--with-intree-gmp" + -- prefer framework over library (on Darwin) , staged (buildFlag GmpFrameworkPref) ? arg "--configure-option=--with-gmp-framework-preferred" + -- Ensure that the ghc-internal package registration includes -- knowledge of the system gmp's library and include directories. , notM (staged (buildFlag GmpInTree)) ? cabalExtraDirs includesGmp librariesGmp @@ -467,28 +286,27 @@ ghcInternalArgs = _ -> mempty , builder (Cabal Flags) ? staged (buildFlag NeedLibatomic) `cabalFlag` "need-atomic" - , builder (Cc CompileC) - ? (not <$> staged (buildFlag CcLlvmBackend)) - ? input "**/cbits/atomic.c" - ? arg "-Wno-sync-nand" + + , builder (Cc CompileC) ? (not <$> staged (buildFlag CcLlvmBackend)) ? + input "**/cbits/atomic.c" ? arg "-Wno-sync-nand" + ] -- | RTS-specific command line arguments. rtsPackageArgs :: Args -rtsPackageArgs = - package rts ? do - stage <- getStage - ghcUnreg <- queryTarget stage tgtUnregisterised - ghcEnableTNC <- queryTarget stage tgtTablesNextToCode - rtsWays <- getRtsWays - way <- getWay - path <- getBuildPath - top <- expr topDirectory +rtsPackageArgs = package rts ? do + stage <- getStage + ghcUnreg <- queryTarget stage tgtUnregisterised + ghcEnableTNC <- queryTarget stage tgtTablesNextToCode + rtsWays <- getRtsWays + way <- getWay + path <- getBuildPath + top <- expr topDirectory useSystemFfi <- succStaged (buildFlag UseSystemFfi) - ffiIncludeDir <- staged (buildSetting FfiIncludeDir) - ffiLibraryDir <- staged (buildSetting FfiLibDir) - libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) - libdwLibraryDir <- staged (\s -> queryTargetTarget s (Lib.libraryPath <=< tgtRTSWithLibdw)) + ffiIncludeDir <- staged (buildSetting FfiIncludeDir) + ffiLibraryDir <- staged (buildSetting FfiLibDir) + libdwIncludeDir <- staged (\s -> queryTargetTarget s (Lib.includePath <=< tgtRTSWithLibdw)) + libdwLibraryDir <- staged (\s -> queryTargetTarget s (Lib.libraryPath <=< tgtRTSWithLibdw)) libnumaIncludeDir <- staged (buildSetting LibnumaIncludeDir) libnumaLibraryDir <- staged (buildSetting LibnumaLibDir) libzstdIncludeDir <- staged (buildSetting LibZstdIncludeDir) @@ -506,11 +324,12 @@ rtsPackageArgs = let ghcArgs = mconcat [ arg "-Irts" , arg $ "-I" ++ path - , notM (targetSupportsSMP stage) ? arg "-DNOSMP" , way `elem` [debug, debugDynamic] ? pure [ "-DTICKY_TICKY" , "-optc-DTICKY_TICKY"] , Profiling `wayUnit` way ? arg "-DPROFILING" , Threaded `wayUnit` way ? arg "-DTHREADED_RTS" + , notM (targetSupportsSMP stage) ? arg "-DNOSMP" + -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs -- -- In particular, we **do not** pass -mavx when compiling @@ -520,7 +339,6 @@ rtsPackageArgs = , inputs ["**/Jumps_V32.cmm"] ? pure [ "-mavx2" | x86Host ] , inputs ["**/Jumps_V64.cmm"] ? pure [ "-mavx512f" | x86Host ] - , notM (targetSupportsSMP stage) ? arg "-optc-DNOSMP" ] let cArgs = mconcat @@ -558,92 +376,91 @@ rtsPackageArgs = [ "-DRtsWay=\"rts_" ++ show way ++ "\"" ] - let cArgs = - mconcat - [ rtsWarnings, - wayCcArgs, - arg "-fomit-frame-pointer", - -- RTS *must* be compiled with optimisations. The INLINE_HEADER macro - -- requires that functions are inlined to work as expected. Inlining - -- only happens for optimised builds. Otherwise we can assume that - -- there is a non-inlined variant to use instead. But RTS does not - -- provide non-inlined alternatives and hence needs the function to - -- be inlined. See https://github.com/snowleopard/hadrian/issues/90. - arg "-O2", - arg "-Irts", - arg $ "-I" ++ path, - notM (targetSupportsSMP stage) ? arg "-DNOSMP", - Debug - `wayUnit` way - ? pure - [ "-DDEBUG", - "-fno-omit-frame-pointer", - "-g3", - "-O0" - ], - -- Set the namespace for the rts fs functions - arg $ "-DFS_NAMESPACE=rts", - arg $ "-DCOMPILING_RTS", - inputs ["**/RtsMessages.c", "**/Trace.c"] - ? pure - [ "-DRtsWay=\"rts_" ++ show way ++ "\"" - ], - input "**/RtsUtils.c" - ? pure - [ "-DRtsWay=\"rts_" ++ show way ++ "\"" - ], - -- We're after pure performance here. So make sure fast math and - -- vectorization is enabled. - input "**/Hash.c" ? pure ["-O3"], - inputs ["**/Evac.c", "**/Evac_thr.c"] ? arg "-funroll-loops", - speedHack stage - ? inputs - [ "**/Evac.c", - "**/Evac_thr.c", - "**/Scav.c", - "**/Scav_thr.c", - "**/Compact.c", - "**/GC.c" - ] - ? arg "-fno-PIC", - -- @-static@ is necessary for these bits, as otherwise the NCG - -- generates dynamic references. - speedHack stage - ? inputs - [ "**/Updates.c", - "**/StgMiscClosures.c", - "**/Jumps_D.c", - "**/Jumps_V16.c", - "**/Jumps_V32.c", - "**/Jumps_V64.c", - "**/PrimOps.c", - "**/Apply.c", - "**/AutoApply.c", - "**/AutoApply_V16.c", - "**/AutoApply_V32.c", - "**/AutoApply_V64.c" - ] - ? pure ["-fno-PIC", "-static"], - -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs - inputs ["**/AutoApply_V32.c"] ? pure ["-mavx2" | x86], - inputs ["**/AutoApply_V64.c"] ? pure ["-mavx512f" | x86], - inputs ["**/Jumps_V32.c"] ? pure ["-mavx2" | x86], - inputs ["**/Jumps_V64.c"] ? pure ["-mavx512f" | x86], - -- inlining warnings happen in Compact - inputs ["**/Compact.c"] ? arg "-Wno-inline", - -- emits warnings about call-clobbered registers on x86_64 - inputs - [ "**/StgCRun.c", - "**/win32/ConsoleHandler.c", - "**/win32/ThrIOManager.c" - ] - ? arg "-w", - -- The above warning suppression flags are a temporary kludge. - -- While working on this module you are encouraged to remove it and fix - -- any warnings in the module. See: - -- https://gitlab.haskell.org/ghc/ghc/wikis/working-conventions#Warnings + -- We're after pure performance here. So make sure fast math and + -- vectorization is enabled. + , input "**/Hash.c" ? pure [ "-O3" ] + + , inputs ["**/Evac.c", "**/Evac_thr.c"] ? arg "-funroll-loops" + + , speedHack stage ? + inputs [ "**/Evac.c", "**/Evac_thr.c" + , "**/Scav.c", "**/Scav_thr.c" + , "**/Compact.c", "**/GC.c" ] ? arg "-fno-PIC" + -- @-static@ is necessary for these bits, as otherwise the NCG + -- generates dynamic references. + , speedHack stage ? + inputs [ "**/Updates.c", "**/StgMiscClosures.c" + , "**/Jumps_D.c", "**/Jumps_V16.c", "**/Jumps_V32.c", "**/Jumps_V64.c" + , "**/PrimOps.c", "**/Apply.c" + , "**/AutoApply.c" + , "**/AutoApply_V16.c" + , "**/AutoApply_V32.c" + , "**/AutoApply_V64.c" ] ? pure ["-fno-PIC", "-static"] + + -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs + , inputs ["**/AutoApply_V32.c"] ? pure [ "-mavx2" | x86Host ] + , inputs ["**/AutoApply_V64.c"] ? pure [ "-mavx512f" | x86Host ] + + , inputs ["**/Jumps_V32.c"] ? pure [ "-mavx2" | x86Host ] + , inputs ["**/Jumps_V64.c"] ? pure [ "-mavx512f" | x86Host ] + + -- inlining warnings happen in Compact + , inputs ["**/Compact.c"] ? arg "-Wno-inline" + + -- emits warnings about call-clobbered registers on x86_64 + , inputs [ "**/StgCRun.c" + , "**/win32/ConsoleHandler.c", "**/win32/ThrIOManager.c"] ? arg "-w" + -- The above warning suppression flags are a temporary kludge. + -- While working on this module you are encouraged to remove it and fix + -- any warnings in the module. See: + -- https://gitlab.haskell.org/ghc/ghc/wikis/working-conventions#Warnings + + , (not <$> (staged (buildFlag CcLlvmBackend))) ? + inputs ["**/Compact.c"] ? arg "-finline-limit=2500" + + , input "**/RetainerProfile.c" ? staged (buildFlag CcLlvmBackend) ? + arg "-Wno-incompatible-pointer-types" + ] + + mconcat + [ builder (Cabal Flags) ? mconcat + [ any (wayUnit Profiling) rtsWays `cabalFlag` "profiling" + , any (wayUnit Debug) rtsWays `cabalFlag` "debug" + , any (wayUnit Dynamic) rtsWays `cabalFlag` "dynamic" + , any (wayUnit Threaded) rtsWays `cabalFlag` "threaded" + , buildFlag UseLibm stage `cabalFlag` "libm" + , buildFlag UseLibrt stage `cabalFlag` "librt" + , buildFlag UseLibdl stage `cabalFlag` "libdl" + , useSystemFfi `cabalFlag` "use-system-libffi" + , targetUseLibffiForAdjustors stage `cabalFlag` "libffi-adjustors" + , buildFlag UseLibpthread stage `cabalFlag` "need-pthread" + , buildFlag UseLibbfd stage `cabalFlag` "libbfd" + , buildFlag NeedLibatomic stage `cabalFlag` "need-atomic" + , useLibdw stage `cabalFlag` "libdw" + , buildFlag UseLibnuma stage `cabalFlag` "libnuma" + , buildFlag UseLibzstd stage `cabalFlag` "libzstd" + , buildFlag StaticLibzstd stage `cabalFlag` "static-libzstd" + , queryTargetTarget stage tgtSymbolsHaveLeadingUnderscore `cabalFlag` "leading-underscore" + , ghcUnreg `cabalFlag` "unregisterised" + , ghcEnableTNC `cabalFlag` "tables-next-to-code" + , Debug `wayUnit` way `cabalFlag` "find-ptr" + ] + , builder (Cabal Setup) ? mconcat + [ useLibdw stage ? cabalExtraDirs (fromMaybe "" libdwIncludeDir) (fromMaybe "" libdwLibraryDir) + , cabalExtraDirs libnumaIncludeDir libnumaLibraryDir + , cabalExtraDirs libzstdIncludeDir libzstdLibraryDir + , useSystemFfi ? cabalExtraDirs ffiIncludeDir ffiLibraryDir + ] + , builder (Cc (FindCDependencies CDep)) ? cArgs + , builder (Cc (FindCDependencies CxxDep)) ? cArgs + , builder (Ghc CompileCWithGhc) ? map ("-optc" ++) <$> cArgs + , builder (Ghc CompileCppWithGhc) ? map ("-optcxx" ++) <$> cArgs + , builder Ghc ? ghcArgs + , builder HsCpp ? pure + [ "-DTOP=" ++ show top ] + , builder HsCpp ? useLibdw stage ? arg "-DUSE_LIBDW" ] -- Compile various performance-critical pieces *without* -fPIC -dynamic -- even when building a shared library. If we don't do this, then the @@ -677,43 +494,37 @@ rtsPackageArgs = -- collect2: ld returned 1 exit status speedHack :: Stage -> Action Bool speedHack stage = do - i386 <- anyTargetArch stage [ArchX86] + i386 <- anyTargetArch stage [ArchX86] goodOS <- not <$> anyTargetOs stage [OSSolaris2] return $ i386 && goodOS -- See @rts/ghc.mk@. rtsWarnings :: Args -rtsWarnings = - mconcat - [ arg "-Wall", - arg "-Wextra", - arg "-Wstrict-prototypes", - arg "-Wmissing-prototypes", - arg "-Wmissing-declarations", - arg "-Winline", - arg "-Wpointer-arith", - arg "-Wmissing-noreturn", - arg "-Wnested-externs", - arg "-Wredundant-decls", - arg "-Wundef", - arg "-fno-strict-aliasing" - ] +rtsWarnings = mconcat + [ arg "-Wall" + , arg "-Wextra" + , arg "-Wstrict-prototypes" + , arg "-Wmissing-prototypes" + , arg "-Wmissing-declarations" + , arg "-Winline" + , arg "-Wpointer-arith" + , arg "-Wmissing-noreturn" + , arg "-Wnested-externs" + , arg "-Wredundant-decls" + , arg "-Wundef" + , arg "-fno-strict-aliasing" ] -- | Expands to Cabal `--extra-lib-dirs` and `--extra-include-dirs` flags if -- the respective paths are not null. -cabalExtraDirs :: - -- | include path - FilePath -> - -- | libraries path - FilePath -> - Args -cabalExtraDirs include lib = - mconcat - [ extraDirFlag "--extra-lib-dirs" lib, - extraDirFlag "--extra-include-dirs" include +cabalExtraDirs :: FilePath -- ^ include path + -> FilePath -- ^ libraries path + -> Args +cabalExtraDirs include lib = mconcat + [ extraDirFlag "--extra-lib-dirs" lib + , extraDirFlag "--extra-include-dirs" include ] where extraDirFlag :: String -> FilePath -> Args extraDirFlag flag dir - | null dir = mempty - | otherwise = arg (flag ++ "=" ++ dir) + | null dir = mempty + | otherwise = arg (flag++"="++dir) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7dd747522da0b3b9012d5194dd81e1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7dd747522da0b3b9012d5194dd81e1… You're receiving this email because of your account on gitlab.haskell.org.

1 0