January 2026 - ghc-commits

[Git][ghc/ghc] Pushed new branch wip/llvm-o3
by Cheng Shao (＠TerrorJack) 02 Jan '26

02 Jan '26

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

1 0

[Git][ghc/ghc][wip/spj-try-opt-coercion] Wibbles
by Simon Peyton Jones (＠simonpj) 02 Jan '26

02 Jan '26

Simon Peyton Jones pushed to branch wip/spj-try-opt-coercion at Glasgow Haskell Compiler / GHC Commits: b8ca7215 by Simon Peyton Jones at 2026-01-01T23:30:49+00:00 Wibbles Draft commit message Drastically reduce the use of the coercion optimiser This MR addresess #26679 by calling the coercion optimiser much less often; the coercion optimiser is expensive, and often ineffective, especially when it is called repeatedly. See Note [Coercion optimisation] in GHC.Core.Corecion.Opt. Specifically * Make coercion optimisation into its own pass, controlled by its own flag `-fopt-coercion` like any other pass. The pass runs early in the pipeline. * The Simplifier now contents itself with merely applying the current substitution to a coercion, and checking for reflexivity. * Kill off OptCoercionOpts, which is now unused. Another important, but only loosely related, improvement * In `GHC.Core.Subst.substIdBndr`, `GHC.Core.TyCo.Subst.substTyVarBndrUsing`, and `GHC.Core.TyCo.Subst.substTyVarBndrUsing`, check for an empty substitution. This keeps substitutions empty in the no-op case. See Note [Keeping the substitution empty] in GHC.Core.TyCo.Subst Compile time improves. Here are the compile-time allocation change over 1%: Baseline Test value Change ------------------------------------------------------------ CoOpt_Singletons(normal) 721,677,974 -7.9% GOOD LargeRecord(normal) 1,268,094,410 -20.4% GOOD T12545(normal) 772,150,124 -9.2% T12707(normal) 777,720,918 -1.5% GOOD T14766(normal) 918,228,179 -50.2% GOOD T15703(normal) 318,141,541 +1.0% BAD T18223(normal) 371,496,473 -7.6% GOOD T1969(normal) 670,830,326 +2.2% BAD T20261(normal) 573,444,953 -2.2% T24984(normal) 87,836,660 -1.5% T3064(normal) 171,636,592 -6.2% GOOD T5030(normal) 148,301,062 -16.4% GOOD T5321Fun(normal) 263,120,022 -3.3% GOOD T8095(normal) 777,033,006 -71.3% GOOD T9020(optasm) 222,159,574 -2.5% GOOD T9630(normal) 873,422,584 -15.4% GOOD T9872b(normal) 1,906,890,318 -2.9% GOOD T9872b_defer(normal) 2,878,170,737 -2.1% GOOD T9872d(normal) 356,978,798 -7.7% GOOD TcPlugin_RewritePerf(normal) 2,132,138,060 -2.6% GOOD geo. mean -2.7% minimum -71.3% maximum +2.2% Metric Decrease: CoOpt_Singletons LargeRecord T12707 T14766 T18223 T3064 T5030 T5321Fun T8095 T9020 T9630 T9872b T9872b_defer T9872d TcPlugin_RewritePerf Metric Increase: T15703 T1969 - - - - - 13 changed files: - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/Coercion/Opt.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Driver/Config.hs - compiler/GHC/Driver/Config/Core/Opt/Simplify.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Session.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/simplCore/should_compile/T8331.stderr Changes: ===================================== compiler/GHC/Core/Coercion.hs ===================================== @@ -2041,7 +2041,7 @@ This follows the lifting context extension definition in the -- ---------------------------------------------------- data LiftingContext = LC Subst LiftCoEnv - -- in optCoercion, we need to lift when optimizing InstCo. + -- In optCoercion, we need to lift when optimizing InstCo. -- See Note [Optimising InstCo] in GHC.Core.Coercion.Opt -- We thus propagate the substitution from GHC.Core.Coercion.Opt here. ===================================== compiler/GHC/Core/Coercion/Opt.hs ===================================== @@ -1,10 +1,7 @@ -- (c) The University of Glasgow 2006 {-# LANGUAGE CPP #-} -module GHC.Core.Coercion.Opt - ( optCoProgram, optCoercion - , OptCoercionOpts (..) - ) +module GHC.Core.Coercion.Opt( optCoProgram ) where import GHC.Prelude @@ -44,19 +41,25 @@ import Control.Monad ( zipWithM ) Note [Coercion optimisation] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This module does coercion optimisation. See the paper +This module does coercion optimisation. The purpose is to reduce the size +of the coercions that the compiler carries around -- they are just proofs, +and serve no runtime need. So the purpose of coercion optimisation is simply +to shrink coercions and thereby reduce compile time. + +See the paper Evidence normalization in Systtem FV (RTA'13) https://simon.peytonjones.org/evidence-normalization/ The paper is also in the GHC repo, in docs/opt-coercion. -However, although powerful and occasionally very effective, coercion optimisation -can be very expensive (#26679). So we apply it sparingly: +However, although powerful and occasionally very effective, coercion +optimisation can itself be very expensive (#26679). So we apply it sparingly: * In the Simplifier, function `rebuild_go`, we use `isReflexiveCo` (which computes the type of the coercion) to eliminate reflexive coercion, just before we build a cast (e |> co). - (More precisely, we use `isReflexiveCoIgnoringMultiplicity.) + (More precisely, we use `isReflexiveCoIgnoringMultiplicity; + c.f. GHC.Core.Coercion.Opt.opt_univ.) * We have a whole pass, `optCoProgram` that runs the coercion optimiser on all the coercions in the program. @@ -66,6 +69,7 @@ can be very expensive (#26679). So we apply it sparingly: - We run it early in the optimisation pipeline (see GHC.Core.Opt.Pipeline.getCoreToDo). + Controlled by a flag `-fopt-coercion`, on by default Note [Optimising coercion optimisation] @@ -218,7 +222,7 @@ optCoExpr is (Case e b ty alts) = Case (optCoExpr is e) b ty (map (optCoAlt (is `extendInScopeSet` b)) alts) optCo :: InScopeSet -> Coercion -> Coercion -optCo is co = optCoercion' (mkEmptySubst is) co +optCo is co = optCoercion (mkEmptySubst is) co optCoAlt :: InScopeSet -> CoreAlt -> CoreAlt optCoAlt is (Alt k bs e) @@ -231,35 +235,13 @@ optCoAlt is (Alt k bs e) %* * %********************************************************************* -} --- | Coercion optimisation options -newtype OptCoercionOpts = OptCoercionOpts - { optCoercionEnabled :: Bool -- ^ Enable coercion optimisation (reduce its size) - } - -optCoercion :: OptCoercionOpts -> Subst -> Coercion -> NormalCo +optCoercion :: Subst -> Coercion -> NormalCo -- ^ optCoercion applies a substitution to a coercion, -- *and* optimises it to reduce its size -optCoercion opts env co --- Experiment with no optCoercion at all - | optCoercionEnabled opts - = if False then optCoercion' env co - else substCo env co - -{- - = pprTrace "optCoercion {" (text "Co:" <> ppr co) $ - let result = optCoercion' env co in - pprTrace "optCoercion }" - (vcat [ text "Co:" <+> ppr (coercionSize co) - , text "Optco:" <+> ppWhen (isReflCo result) (text "(refl)") - <+> ppr result ]) $ - result --} - - | otherwise - = substCo env co - -optCoercion' :: Subst -> Coercion -> NormalCo -optCoercion' env co +-- The substitution is a vestige of an earlier era, when the coercion optimiser +-- was called by the Simplifier; now it is always empty +-- But I have not removed it in case we ever want it back. +optCoercion env co | debugIsOn = let out_co = opt_co1 lc NotSwapped co (Pair in_ty1 in_ty2, in_role) = coercionKindRole co ===================================== compiler/GHC/Core/Opt/Pipeline.hs ===================================== @@ -224,10 +224,12 @@ getCoreToDo dflags hpt_rule_base extra_vars CoreDoPasses [ simpl_gently , runWhen do_specialise CoreDoSpecialising ], - -- Optimise coercions + -- Optimise coercions: see Note [Coercion optimisation] + -- in GHC.Core.Coercion.Opt -- With -O do this after one run of the Simplifier. -- Without -O, just take what the desugarer produced - -- See Note [Coercion optimisation] in GHC.Core.Coercion.Opt + -- I tried running it right after desugaring, regardless of -O, + -- but that was worse (longer compile times). runWhen do_co_opt CoreOptCoercion, if full_laziness then ===================================== compiler/GHC/Core/Opt/Simplify/Env.hs ===================================== @@ -15,7 +15,7 @@ module GHC.Core.Opt.Simplify.Env ( SimplPhase(..), isActive, seArityOpts, seCaseCase, seCaseFolding, seCaseMerge, seCastSwizzle, seDoEtaReduction, seEtaExpand, seFloatEnable, seInline, seNames, - seOptCoercionOpts, sePhase, sePlatform, sePreInline, + sePhase, sePlatform, sePreInline, seRuleOpts, seRules, seUnfoldingOpts, mkSimplEnv, extendIdSubst, extendCvIdSubst, extendTvSubst, extendCvSubst, @@ -54,7 +54,6 @@ module GHC.Core.Opt.Simplify.Env ( import GHC.Prelude -import GHC.Core.Coercion.Opt ( OptCoercionOpts ) import GHC.Core.FamInstEnv ( FamInstEnv ) import GHC.Core.Opt.Arity ( ArityOpts(..) ) import GHC.Core.Opt.Simplify.Monad @@ -250,9 +249,6 @@ seInline env = sm_inline (seMode env) seNames :: SimplEnv -> [String] seNames env = sm_names (seMode env) -seOptCoercionOpts :: SimplEnv -> OptCoercionOpts -seOptCoercionOpts env = sm_co_opt_opts (seMode env) - sePhase :: SimplEnv -> SimplPhase sePhase env = sm_phase (seMode env) @@ -288,7 +284,6 @@ data SimplMode = SimplMode -- See comments in GHC.Core.Opt.Simplify.Monad , sm_rule_opts :: !RuleOpts , sm_case_folding :: !Bool , sm_case_merge :: !Bool - , sm_co_opt_opts :: !OptCoercionOpts -- ^ Coercion optimiser options } -- | See Note [SimplPhase] ===================================== compiler/GHC/Core/Opt/Simplify/Iteration.hs ===================================== @@ -1531,8 +1531,10 @@ rebuild_go env expr cont TickIt t cont -> rebuild_go env (mkTick t expr) cont CastIt { sc_co = co, sc_cont = cont } | isReflexiveCoIgnoringMultiplicity co - -- ignoring multiplicity: c.f. GHC.Core.Coercion.Opt.opt_univ + -- isReflexiveCo: see Note [Coercion optimisation] + -- in GHc.Core.Coercion.Opt -> rebuild_go env expr cont + | otherwise -> rebuild_go env (mkCast expr co) cont -- NB: mkCast implements the (Coercion co |> g) optimisation ===================================== compiler/GHC/Core/Rules.hs ===================================== @@ -852,17 +852,17 @@ bound on the LHS: Now, if that binding is inlined, so that a=b=Int, we'd get RULE forall (c :: Int~Int). f (x |> c) = e and now when we simplify the LHS (GHC.Core.Opt.Simplify.Iteration.simplRules), - optCoercion (look at the CoVarCo case) will turn that 'c' into Refl: + the Simplifier will turn that 'c' into Refl: RULE forall (c :: Int~Int). f (x |> <Int>) = e and then perhaps drop it altogether. Now 'c' is unbound. + (See the use of isReflexiveCo in GHC.Core.Opt.Simplify.Iteration.) - It's tricky to be sure this never happens, so instead I - say it's OK to have an unbound coercion binder in a RULE - provided its type is (c :: t~t). Then, when the RULE - fires we can substitute <t> for c. + It's tricky to be sure this never happens, so instead I say it's OK + to have an unbound coercion binder in a RULE provided its type is (c + :: t~t). Then, when the RULE fires we can substitute <t> for c. - This actually happened (in a RULE for a local function) - in #13410, and also in test T10602. + This actually happened (in a RULE for a local function) in #13410, + and also in test T10602. Note [Cloning the template binders] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Driver/Config.hs ===================================== @@ -1,7 +1,6 @@ -- | Subsystem configuration module GHC.Driver.Config - ( initOptCoercionOpts - , initSimpleOpts + ( initSimpleOpts , initEvalOpts , EvalStep(..) ) @@ -11,15 +10,8 @@ import GHC.Prelude import GHC.Driver.DynFlags import GHC.Core.SimpleOpt -import GHC.Core.Coercion.Opt import GHCi.Message (EvalOpts(..)) --- | Initialise coercion optimiser configuration from DynFlags -initOptCoercionOpts :: DynFlags -> OptCoercionOpts -initOptCoercionOpts dflags = OptCoercionOpts - { optCoercionEnabled = gopt Opt_OptCoercion dflags - } - -- | Initialise Simple optimiser configuration from DynFlags initSimpleOpts :: DynFlags -> SimpleOpts initSimpleOpts dflags = SimpleOpts ===================================== compiler/GHC/Driver/Config/Core/Opt/Simplify.hs ===================================== @@ -13,7 +13,6 @@ import GHC.Core.Opt.Simplify ( SimplifyExprOpts(..), SimplifyOpts(..) ) import GHC.Core.Opt.Simplify.Env ( FloatEnable(..), SimplMode(..), SimplPhase(..) ) import GHC.Core.Opt.Simplify.Monad ( TopEnvConfig(..) ) -import GHC.Driver.Config ( initOptCoercionOpts ) import GHC.Driver.Config.Core.Lint ( initLintPassResultConfig ) import GHC.Driver.Config.Core.Rules ( initRuleOpts ) import GHC.Driver.Config.Core.Opt.Arity ( initArityOpts ) @@ -73,7 +72,6 @@ initSimplMode dflags phase name = SimplMode , sm_rule_opts = initRuleOpts dflags , sm_case_folding = gopt Opt_CaseFolding dflags , sm_case_merge = gopt Opt_CaseMerge dflags - , sm_co_opt_opts = initOptCoercionOpts dflags } initGentleSimplMode :: DynFlags -> SimplMode ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -6,7 +6,7 @@ module GHC.Driver.DynFlags ( Language(..), FatalMessager, FlushOut(..), ProfAuto(..), - hasPprDebug, hasNoDebugOutput, hasNoStateHack, hasNoOptCoercion, + hasPprDebug, hasNoDebugOutput, hasNoStateHack, dopt, dopt_set, dopt_unset, gopt, gopt_set, gopt_unset, wopt, wopt_set, wopt_unset, @@ -994,9 +994,6 @@ hasNoDebugOutput = dopt Opt_D_no_debug_output hasNoStateHack :: DynFlags -> Bool hasNoStateHack = gopt Opt_G_NoStateHack -hasNoOptCoercion :: DynFlags -> Bool -hasNoOptCoercion flags = not (gopt Opt_OptCoercion flags) - -- | Test whether a 'DumpFlag' is set dopt :: DumpFlag -> DynFlags -> Bool dopt = getDumpFlagFrom verbosity dumpFlags ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -22,7 +22,7 @@ module GHC.Driver.Session ( FatalMessager, FlushOut(..), ProfAuto(..), glasgowExtsFlags, - hasPprDebug, hasNoDebugOutput, hasNoStateHack, hasNoOptCoercion, + hasPprDebug, hasNoDebugOutput, hasNoStateHack, dopt, dopt_set, dopt_unset, gopt, gopt_set, gopt_unset, setGeneralFlag', unSetGeneralFlag', wopt, wopt_set, wopt_unset, ===================================== testsuite/tests/count-deps/CountDepsAst.stdout ===================================== @@ -14,7 +14,6 @@ GHC.Core GHC.Core.Class GHC.Core.Coercion GHC.Core.Coercion.Axiom -GHC.Core.Coercion.Opt GHC.Core.ConLike GHC.Core.DataCon GHC.Core.FVs ===================================== testsuite/tests/count-deps/CountDepsParser.stdout ===================================== @@ -14,7 +14,6 @@ GHC.Core GHC.Core.Class GHC.Core.Coercion GHC.Core.Coercion.Axiom -GHC.Core.Coercion.Opt GHC.Core.ConLike GHC.Core.DataCon GHC.Core.FVs ===================================== testsuite/tests/simplCore/should_compile/T8331.stderr ===================================== @@ -20,9 +20,9 @@ = ($fApplicativeReaderT6 @s @r) `cast` (forall (a ::~ <*>_N) (b ::~ <*>_N). <a>_R - ->_R <ReaderT r (ST s) b>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N) + ->_R <ReaderT r (ST s) b>_R ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) + ; (<ReaderT r (ST s) b>_R + ->_R Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N)) :: Coercible (forall a b. a -> ReaderT r (ST s) b -> r -> STRep s a) (forall a b. a -> ReaderT r (ST s) b -> ReaderT r (ST s) a)) @@ -32,9 +32,9 @@ = ($fApplicativeReaderT1 @s @r) `cast` (forall (a ::~ <*>_N) (b ::~ <*>_N). <ReaderT r (ST s) a>_R - ->_R <ReaderT r (ST s) b>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N) + ->_R <ReaderT r (ST s) b>_R ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) + ; (<ReaderT r (ST s) b>_R + ->_R Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N)) :: Coercible (forall a b. ReaderT r (ST s) a -> ReaderT r (ST s) b -> r -> STRep s a) @@ -78,9 +78,9 @@ = ($fApplicativeReaderT7 @s @r) `cast` (forall (a ::~ <*>_N) (b ::~ <*>_N). <a -> b>_R - ->_R <ReaderT r (ST s) a>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <b>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <b>_N) + ->_R <ReaderT r (ST s) a>_R ->_R <r>_R ->_R Sym (N:ST <s>_N <b>_R) + ; (<ReaderT r (ST s) a>_R + ->_R Sym (N:ReaderT <*>_N <r>_R <ST s>_R <b>_N)) :: Coercible (forall a b. (a -> b) -> ReaderT r (ST s) a -> r -> STRep s b) (forall a b. (a -> b) -> ReaderT r (ST s) a -> ReaderT r (ST s) b)) @@ -91,9 +91,9 @@ `cast` (forall (a ::~ <*>_N) (b ::~ <*>_N) (c ::~ <*>_N). <a -> b -> c>_R ->_R <ReaderT r (ST s) a>_R - ->_R <ReaderT r (ST s) b>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <c>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <c>_N) + ->_R <ReaderT r (ST s) b>_R ->_R <r>_R ->_R Sym (N:ST <s>_N <c>_R) + ; (<ReaderT r (ST s) b>_R + ->_R Sym (N:ReaderT <*>_N <r>_R <ST s>_R <c>_N)) :: Coercible (forall a b c. (a -> b -> c) @@ -114,9 +114,9 @@ $fApplicativeReaderT_$cpure @(ST s) @r $dApplicative = ($fApplicativeReaderT5 @s @r) `cast` (forall (a ::~ <*>_N). - <a>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N) + Sym (<a>_R + ->_R N:ReaderT <*>_N <r>_R <ST s>_R <a>_N + ; (<r>_R ->_R N:ST <s>_N <a>_R)) :: Coercible (forall a. a -> r -> STRep s a) (forall a. a -> ReaderT r (ST s) a)) @@ -125,9 +125,9 @@ $fMonadReaderT_$creturn @(ST s) @r $dMonad = ($fApplicativeReaderT5 @s @r) `cast` (forall (a ::~ <*>_N). - <a>_R - ->_R <r>_R ->_R Sym (N:ST <s>_N <a>_R) - ; Sym (N:ReaderT <*>_N <r>_R <ST s>_R <a>_N) + Sym (<a>_R + ->_R N:ReaderT <*>_N <r>_R <ST s>_R <a>_N + ; (<r>_R ->_R N:ST <s>_N <a>_R)) :: Coercible (forall a. a -> r -> STRep s a) (forall a. a -> ReaderT r (ST s) a)) @@ -148,9 +148,9 @@ ($dMonadAbstractIOST :: MonadAbstractIOST (ReaderT Int (ST s))). useAbstractMonad @(ReaderT Int (ST s)) $dMonadAbstractIOST = (useAbstractMonad1 @s) - `cast` (<Int>_R - ->_R <Int>_R ->_R Sym (N:ST <s>_N <Int>_R) - ; Sym (N:ReaderT <*>_N <Int>_R <ST s>_R <Int>_N) + `cast` (Sym (<Int>_R + ->_R N:ReaderT <*>_N <Int>_R <ST s>_R <Int>_N + ; (<Int>_R ->_R N:ST <s>_N <Int>_R)) :: Coercible (Int -> Int -> STRep s Int) (Int -> ReaderT Int (ST s) Int)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b8ca7215aa80669fe2d93109dc7b37a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b8ca7215aa80669fe2d93109dc7b37a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/c-o3
by Cheng Shao (＠TerrorJack) 01 Jan '26

01 Jan '26

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

1 0

[Git][ghc/ghc] Pushed new branch wip/26699
by recursion-ninja (＠recursion-ninja) 01 Jan '26

01 Jan '26

recursion-ninja pushed new branch wip/26699 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/26699 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_FINAL] Mark T24602 as fragile
by Sven Tennie (＠supersven) 01 Jan '26

01 Jan '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 770b5b52 by Sven Tennie at 2026-01-01T12:15:07+01:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - 1 changed file: - testsuite/tests/javascript/closure/all.T Changes: ===================================== testsuite/tests/javascript/closure/all.T ===================================== @@ -1,4 +1,11 @@ # These are JavaScript-specific tests based on Google Closure Compiler setTestOpts(when(not(js_arch()),skip)) -test('T24602', normal, makefile_test, ['T24602']) +# Runs fine locally. Fails on CI with: +# +# Wrong exit code for T24602()(expected 0 , actual 2 ) +# Stderr run ( T24602 ): +# gmake: node: Permission denied +# gmake: *** [Makefile:11: T24602] Error 127 +# *** unexpected failure for T24602(normal) +test('T24602', fragile(26712), makefile_test, ['T24602']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/770b5b52925c8111b2cdf5371b400b8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/770b5b52925c8111b2cdf5371b400b8… 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_FINAL] Mark T24602 as fragile
by Sven Tennie (＠supersven) 01 Jan '26

01 Jan '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: e7a6734f by GHC GitLab CI at 2026-01-01T10:26:59+01:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - 1 changed file: - testsuite/tests/javascript/closure/all.T Changes: ===================================== testsuite/tests/javascript/closure/all.T ===================================== @@ -1,4 +1,11 @@ # These are JavaScript-specific tests based on Google Closure Compiler setTestOpts(when(not(js_arch()),skip)) -test('T24602', normal, makefile_test, ['T24602']) +# Runs fine locally. Fails on CI with: +# +# Wrong exit code for T24602()(expected 0 , actual 2 ) +# Stderr run ( T24602 ): +# gmake: node: Permission denied +# gmake: *** [Makefile:11: T24602] Error 127 +# *** unexpected failure for T24602(normal) +test('T24602', fragile(26712), makefile_test, ['T24602']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e7a6734f10543809a1a82bfbfe3bd86… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e7a6734f10543809a1a82bfbfe3bd86… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/ghc-9.12-fix-div
by Cheng Shao (＠TerrorJack) 01 Jan '26

01 Jan '26

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

1 0

[Git][ghc/ghc][master] testsuite: run numeric tests with optasm when available
by Marge Bot (＠marge-bot) 01 Jan '26

01 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: ae1aeaab by Cheng Shao at 2026-01-01T03:06:32-05:00 testsuite: run numeric tests with optasm when available This patch adds the `optasm` extra way to nueric tests when NCG is available. Some numeric bugs only surface with optimization, omitting this can hide these bugs and even make them slip into release! (e.g. #26711) - - - - - 1 changed file: - testsuite/tests/numeric/should_run/all.T Changes: ===================================== testsuite/tests/numeric/should_run/all.T ===================================== @@ -5,6 +5,10 @@ import random +# some bugs only surface with -O, omitting optasm may cause them to +# slip into releases! (e.g. #26711) +setTestOpts(when(have_ncg(), extra_ways(['optasm']))) + test('arith001', normal, compile_and_run, ['']) test('arith002', normal, compile_and_run, ['']) test('arith003', normal, compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae1aeaabac1d49c98be2b48700dcbb4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae1aeaabac1d49c98be2b48700dcbb4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] [#26183] Associated Type Iface Fix
by Marge Bot (＠marge-bot) 01 Jan '26

01 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 8a317b6f by Aaron Allen at 2026-01-01T03:05:15-05:00 [#26183] Associated Type Iface Fix When determining "extras" for class decl interface entries, axioms for the associated types need to included so that dependent modules will be recompiled if those axioms change. resolves #26183 - - - - - 7 changed files: - compiler/GHC/Iface/Recomp.hs - + testsuite/tests/driver/recomp26183/M.hs - + testsuite/tests/driver/recomp26183/M2A.hs - + testsuite/tests/driver/recomp26183/M2B.hs - + testsuite/tests/driver/recomp26183/Makefile - + testsuite/tests/driver/recomp26183/all.T - + testsuite/tests/driver/recomp26183/recomp26183.stderr Changes: ===================================== compiler/GHC/Iface/Recomp.hs ===================================== @@ -1782,10 +1782,12 @@ declExtras fix_fn ann_fn rule_env inst_env fi_env dm_env complete_env decl IfaceClass{ifBody = IfConcreteClass { ifSigs=sigs, ifATs=ats }} -> IfaceClassExtras (fix_fn n) insts (ann_fn (AnnOccName n)) meths defms where - insts = (map ifDFun $ (concatMap at_extras ats) - ++ lookupOccEnvL inst_env n) - -- Include instances of the associated types - -- as well as instances of the class (#5147) + insts = + let (atFamInsts, atClsInsts) = foldMap at_extras ats + in (ifFamInstAxiom <$> atFamInsts) ++ (ifDFun <$> atClsInsts) + ++ (ifDFun <$> lookupOccEnvL inst_env n) + -- Include instances and axioms of the associated types + -- as well as instances of the class (#5147) (#26183) meths = [id_extras (getOccName op) | IfaceClassOp op _ _ <- sigs] -- Names of all the default methods (see Note [default method Name]) defms = [ dmName @@ -1802,7 +1804,10 @@ declExtras fix_fn ann_fn rule_env inst_env fi_env dm_env complete_env decl where n = getOccName decl id_extras occ = IdExtras (fix_fn occ) (lookupOccEnvL rule_env occ) (ann_fn (AnnOccName occ)) (lookup_complete_match occ) - at_extras (IfaceAT decl _) = lookupOccEnvL inst_env (getOccName decl) + at_extras (IfaceAT decl _) = + ( lookupOccEnvL fi_env (getOccName decl) -- Axioms + , lookupOccEnvL inst_env (getOccName decl) -- Class instances + ) lookup_complete_match occ = lookupOccEnvL complete_env occ ===================================== testsuite/tests/driver/recomp26183/M.hs ===================================== @@ -0,0 +1,5 @@ +module M where +import M2 + +x :: AT () +x = True ===================================== testsuite/tests/driver/recomp26183/M2A.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TypeFamilies #-} +module M2 where + +class C a where + type AT a + +instance C () where + type AT () = Bool ===================================== testsuite/tests/driver/recomp26183/M2B.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TypeFamilies #-} +module M2 where + +class C a where + type AT a + +instance C () where + type AT () = Int ===================================== testsuite/tests/driver/recomp26183/Makefile ===================================== @@ -0,0 +1,13 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +# Recompilation tests + +recomp26183: + cp M2A.hs M2.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make M.hs + sleep 1 + cp M2B.hs M2.hs + # This should fail + if '$(TEST_HC)' $(TEST_HC_OPTS) --make M.hs; then false; fi ===================================== testsuite/tests/driver/recomp26183/all.T ===================================== @@ -0,0 +1,3 @@ +test('recomp26183', [extra_files(['M2A.hs', 'M.hs', 'M2B.hs']), + when(fast(), skip), ignore_stdout], + makefile_test, []) ===================================== testsuite/tests/driver/recomp26183/recomp26183.stderr ===================================== @@ -0,0 +1,7 @@ +M.hs:5:5: error: [GHC-83865] + • Couldn't match type ‘Bool’ with ‘Int’ + Expected: AT () + Actual: Bool + • In the expression: True + In an equation for ‘x’: x = True + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8a317b6f6d007b7cb5f2d6618493830… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8a317b6f6d007b7cb5f2d6618493830… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/terrorjack/asan] 14 commits: hadrian: pass -fno-omit-frame-pointer with +debug_info
by Cheng Shao (＠TerrorJack) 01 Jan '26

01 Jan '26

Cheng Shao pushed to branch wip/terrorjack/asan at Glasgow Haskell Compiler / GHC Commits: 7b1a26ba by Cheng Shao at 2026-01-01T07:04:40+01:00 hadrian: pass -fno-omit-frame-pointer with +debug_info This patch adds `-fno-omit-frame-pointer` as C/C++ compilation flag when compiling with `+debug_info` flavour transformer. It's a sane default when you care about debugging and reliable backtraces, and makes debugging/profiling with bpf easier. - - - - - 4fdba6a3 by Cheng Shao at 2026-01-01T07:12:23+01:00 ghc-internal: remove unused GMP macros This patch removes unused GMP related macros from `ghc-internal`. The in-tree GMP version was hard coded and outdated, but it was not used anywhere anyway. - - - - - 973341a9 by Cheng Shao at 2026-01-01T07:12:23+01:00 hadrian: fix in-tree gmp configure error on newer c compilers Building in-tree gmp on newer c compilers that default to c23 fails at configure stage, this patch fixes it, see added comment for explanation. - - - - - 89089290 by Cheng Shao at 2026-01-01T07:12:23+01:00 hadrian: remove linting/assertion in quick-validate flavour The `quick-validate` flavour is meant for testing ghc and passing the testsuite locally with similar settings to `validate` but faster. This patch removes the linting/assertion overhead in `quick-validate` to improve developer experience. I also took the chance to simplify redundant logic of rts/library way definition in `validate` flavour. - - - - - 68724b35 by Cheng Shao at 2026-01-01T07:12:23+01:00 rts: add is-valid-utf8.c to .ubsan-suppressions A minor one in `bytestring` that might surface when building with +ubsan using clang. - - - - - 8f2ecbc1 by Cheng Shao at 2026-01-01T07:15:41+01:00 hadrian: add support for building with AddressSanitizer This patch adds a +asan flavour transformer to hadrian to build all stage1+ C/C++ code with AddressBehaviorSanitizer. This is particularly useful to catch potential out-of-bounds and use-after-free bugs in the RTS codebase. - - - - - 02588139 by Cheng Shao at 2026-01-01T07:15:47+01:00 ci: add ubsan+asan job We now have a `x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan` validate/nightly job with both UBSan/ASan enabled. We build with `quick-validate` instead of `validate` since the extra assertion/linting is already provided by other jobs anyway and it's better to reserve the CI time budget for UBSan/ASan overhead. - - - - - c56b8346 by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to mblock allocator - - - - - e1915a2a by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to mgroup allocator - - - - - 589c0e6a by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to block allocator - - - - - f5989593 by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to cap->pinned_object_empty - - - - - e1bae36a by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to gc_thread->free_blocks - - - - - 1b9eb836 by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to hash table free list - - - - - 5e58a407 by Cheng Shao at 2026-01-01T07:15:47+01:00 rts: add ASAN instrumentation to per-Task InCall free list - - - - - 23 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - hadrian/doc/flavours.md - hadrian/src/Flavour.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Settings/Flavours/Validate.hs - libraries/ghc-internal/configure.ac - libraries/ghc-internal/include/HsIntegerGmp.h.in - rts/.ubsan-suppressions - rts/Hash.c - rts/Task.c - rts/include/Stg.h - + rts/include/rts/ASANUtils.h - rts/rts.cabal - rts/sm/BlockAlloc.c - rts/sm/GCUtils.c - rts/sm/MBlock.c - rts/sm/Storage.c - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/tests/ffi/should_run/all.T - testsuite/tests/rts/T18623/all.T - testsuite/tests/rts/all.T Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -162,6 +162,7 @@ data BuildConfig , tablesNextToCode :: Bool , threadSanitiser :: Bool , ubsan :: Bool + , asan :: Bool , noSplitSections :: Bool , validateNonmovingGc :: Bool , textWithSIMDUTF :: Bool @@ -173,7 +174,7 @@ configureArgsStr :: BuildConfig -> String configureArgsStr bc = unwords $ ["--enable-unregisterised"| unregisterised bc ] ++ ["--disable-tables-next-to-code" | not (tablesNextToCode bc) ] - ++ ["--with-intree-gmp" | Just _ <- pure (crossTarget bc) ] + ++ ["--with-intree-gmp" | isJust (crossTarget bc) || ubsan bc || asan bc ] ++ ["--with-system-libffi" | crossTarget bc == Just "wasm32-wasi" ] ++ ["--enable-ipe-data-compression" | withZstd bc ] ++ ["--enable-strict-ghc-toolchain-check"] @@ -188,6 +189,7 @@ mkJobFlavour BuildConfig{..} = Flavour buildFlavour opts [HostFullyStatic | hostFullyStatic] ++ [ThreadSanitiser | threadSanitiser] ++ [UBSan | ubsan] ++ + [ASan | asan] ++ [NoSplitSections | noSplitSections, buildFlavour == Release ] ++ [BootNonmovingGc | validateNonmovingGc ] ++ [TextWithSIMDUTF | textWithSIMDUTF] @@ -201,11 +203,12 @@ data FlavourTrans = | HostFullyStatic | ThreadSanitiser | UBSan + | ASan | NoSplitSections | BootNonmovingGc | TextWithSIMDUTF -data BaseFlavour = Release | Validate | SlowValidate deriving Eq +data BaseFlavour = Release | QuickValidate | Validate | SlowValidate deriving Eq ----------------------------------------------------------------------------- -- Build Configurations @@ -230,6 +233,7 @@ vanilla = BuildConfig , tablesNextToCode = True , threadSanitiser = False , ubsan = False + , asan = False , noSplitSections = False , validateNonmovingGc = False , textWithSIMDUTF = False @@ -283,8 +287,14 @@ llvm = vanilla { llvmBootstrap = True } tsan :: BuildConfig tsan = vanilla { threadSanitiser = True } -enableUBSan :: BuildConfig -enableUBSan = vanilla { withDwarf = True, ubsan = True } +enableUBSanASan :: BuildConfig +enableUBSanASan = + vanilla + { buildFlavour = QuickValidate, + withDwarf = True, + ubsan = True, + asan = True + } noTntc :: BuildConfig noTntc = vanilla { tablesNextToCode = False } @@ -372,6 +382,7 @@ flavourString :: Flavour -> String flavourString (Flavour base trans) = base_string base ++ concatMap (("+" ++) . flavour_string) trans where base_string Release = "release" + base_string QuickValidate = "quick-validate" base_string Validate = "validate" base_string SlowValidate = "slow-validate" @@ -381,6 +392,7 @@ flavourString (Flavour base trans) = base_string base ++ concatMap (("+" ++) . f flavour_string HostFullyStatic = "host_fully_static" flavour_string ThreadSanitiser = "thread_sanitizer_cmm" flavour_string UBSan = "ubsan" + flavour_string ASan = "asan" flavour_string NoSplitSections = "no_split_sections" flavour_string BootNonmovingGc = "boot_nonmoving_gc" flavour_string TextWithSIMDUTF = "text_simdutf" @@ -1213,15 +1225,24 @@ fedora_x86 = , hackage_doc_job (disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora43) releaseConfig)) , disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora43) dwarf) , disableValidate (standardBuilds Amd64 (Linux Fedora43)) - -- For UBSan jobs, only enable for validate/nightly pipelines. - -- Also disable docs since it's not the point for UBSan jobs. + -- For UBSan/ASan jobs, only enable for validate/nightly + -- pipelines. Also disable docs since it's not the point for + -- UBSan/ASan jobs. + -- + -- See + -- https://github.com/llvm/llvm-project/blob/llvmorg-21.1.8/compiler-rt/lib/sa… + -- for ASAN options help, for now these are required to pass the + -- testsuite , modifyJobs ( setVariable "HADRIAN_ARGS" "--docs=none" . addVariable "UBSAN_OPTIONS" "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions" + . addVariable + "ASAN_OPTIONS" + "detect_leaks=false:handle_segv=0:handle_sigfpe=0:verify_asan_link_order=false" ) - $ validateBuilds Amd64 (Linux Fedora43) enableUBSan + $ validateBuilds Amd64 (Linux Fedora43) enableUBSanASan ] where hackage_doc_job = rename (<> "-hackage") . modifyJobs (addVariable "HADRIAN_ARGS" "--haddock-for-hackage") ===================================== .gitlab/jobs.yaml ===================================== @@ -2942,7 +2942,7 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora43-release": { + "nightly-x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -2953,7 +2953,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-release.tar.xz", + "ghc-x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -2995,17 +2995,20 @@ "x86_64-linux" ], "variables": { + "ASAN_OPTIONS": "detect_leaks=false:handle_segv=0:handle_sigfpe=0:verify_asan_link_order=false", "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", - "BUILD_FLAVOUR": "release", - "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan", + "BUILD_FLAVOUR": "quick-validate+debug_info+ubsan+asan", + "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check", + "HADRIAN_ARGS": "--docs=none", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-release", + "TEST_ENV": "x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan", + "UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora43-release-hackage": { + "nightly-x86_64-linux-fedora43-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3062,14 +3065,13 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", "TEST_ENV": "x86_64-linux-fedora43-release", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora43-validate": { + "nightly-x86_64-linux-fedora43-release-hackage": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3080,7 +3082,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate.tar.xz", + "ghc-x86_64-linux-fedora43-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3123,16 +3125,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate", - "BUILD_FLAVOUR": "validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", + "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate", + "TEST_ENV": "x86_64-linux-fedora43-release", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora43-validate+debug_info": { + "nightly-x86_64-linux-fedora43-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3143,7 +3146,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz", + "ghc-x86_64-linux-fedora43-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3186,16 +3189,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info", - "BUILD_FLAVOUR": "validate+debug_info", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate", + "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info", + "TEST_ENV": "x86_64-linux-fedora43-validate", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora43-validate+debug_info+ubsan": { + "nightly-x86_64-linux-fedora43-validate+debug_info": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3206,7 +3209,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz", + "ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3249,14 +3252,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan", - "BUILD_FLAVOUR": "validate+debug_info+ubsan", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info", + "BUILD_FLAVOUR": "validate+debug_info", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "HADRIAN_ARGS": "--docs=none", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info+ubsan", - "UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions", + "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info", "XZ_OPT": "-9" } }, @@ -7097,7 +7098,7 @@ "TEST_ENV": "x86_64-linux-deb9-validate" } }, - "x86_64-linux-fedora43-release": { + "x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7108,7 +7109,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-release.tar.xz", + "ghc-x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7134,7 +7135,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-release(\\s|$).*/)) || (($ONLY_JOBS == null) && ((\"true\" == \"true\")))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-quick-validate\\+debug_info\\+ubsan\\+asan(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/))))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7150,16 +7151,19 @@ "x86_64-linux" ], "variables": { + "ASAN_OPTIONS": "detect_leaks=false:handle_segv=0:handle_sigfpe=0:verify_asan_link_order=false", "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", - "BUILD_FLAVOUR": "release", - "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan", + "BUILD_FLAVOUR": "quick-validate+debug_info+ubsan+asan", + "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check", + "HADRIAN_ARGS": "--docs=none", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-release" + "TEST_ENV": "x86_64-linux-fedora43-quick-validate+debug_info+ubsan+asan", + "UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions" } }, - "x86_64-linux-fedora43-release-hackage": { + "x86_64-linux-fedora43-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7196,7 +7200,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-release(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-release(\\s|$).*/)) || (($ONLY_JOBS == null) && ((\"true\" == \"true\")))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7216,13 +7220,12 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", "TEST_ENV": "x86_64-linux-fedora43-release" } }, - "x86_64-linux-fedora43-validate": { + "x86_64-linux-fedora43-release-hackage": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7233,7 +7236,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate.tar.xz", + "ghc-x86_64-linux-fedora43-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7259,7 +7262,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-release(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7276,15 +7279,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate", - "BUILD_FLAVOUR": "validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release", + "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate" + "TEST_ENV": "x86_64-linux-fedora43-release" } }, - "x86_64-linux-fedora43-validate+debug_info": { + "x86_64-linux-fedora43-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7295,7 +7299,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz", + "ghc-x86_64-linux-fedora43-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7321,7 +7325,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-validate\\+debug_info(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7338,15 +7342,15 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info", - "BUILD_FLAVOUR": "validate+debug_info", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate", + "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info" + "TEST_ENV": "x86_64-linux-fedora43-validate" } }, - "x86_64-linux-fedora43-validate+debug_info+ubsan": { + "x86_64-linux-fedora43-validate+debug_info": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7357,7 +7361,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz", + "ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7383,7 +7387,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-validate\\+debug_info\\+ubsan(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/))))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora43-validate\\+debug_info(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7400,14 +7404,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan", - "BUILD_FLAVOUR": "validate+debug_info+ubsan", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info", + "BUILD_FLAVOUR": "validate+debug_info", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "HADRIAN_ARGS": "--docs=none", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info+ubsan", - "UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions" + "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info" } }, "x86_64-linux-rocky8-validate": { ===================================== hadrian/doc/flavours.md ===================================== @@ -242,6 +242,10 @@ The supported transformers are listed below: <td><code>ubsan</code></td> <td>Build all stage1+ C/C++ code with UndefinedBehaviorSanitizer support</td> </tr> + <tr> + <td><code>asan</code></td> + <td>Build all stage1+ C/C++ code with AddressSanitizer support</td> + </tr> <tr> <td><code>llvm</code></td> <td>Use GHC's LLVM backend (`-fllvm`) for all stage1+ compilation.</td> ===================================== hadrian/src/Flavour.hs ===================================== @@ -8,6 +8,7 @@ module Flavour , splitSections , enableThreadSanitizer , enableUBSan + , enableASan , enableLateCCS , enableHashUnitIds , enableDebugInfo, enableTickyGhc @@ -57,6 +58,7 @@ flavourTransformers = M.fromList , "thread_sanitizer" =: enableThreadSanitizer False , "thread_sanitizer_cmm" =: enableThreadSanitizer True , "ubsan" =: enableUBSan + , "asan" =: enableASan , "llvm" =: viaLlvmBackend , "profiled_ghc" =: enableProfiledGhc , "no_dynamic_ghc" =: disableDynamicGhcPrograms @@ -169,10 +171,10 @@ werror = -- | Build C and Haskell objects with debugging information. enableDebugInfo :: Flavour -> Flavour enableDebugInfo = addArgs $ notStage0 ? mconcat - [ builder (Ghc CompileHs) ? pure ["-g3"] - , builder (Ghc CompileCWithGhc) ? pure ["-optc-g3"] - , builder (Ghc CompileCppWithGhc) ? pure ["-optcxx-g3"] - , builder (Cc CompileC) ? arg "-g3" + [ builder (Ghc CompileHs) ? pure ["-g3", "-optc-fno-omit-frame-pointer"] + , builder (Ghc CompileCWithGhc) ? pure ["-optc-g3", "-optc-fno-omit-frame-pointer"] + , builder (Ghc CompileCppWithGhc) ? pure ["-optcxx-g3", "-optcxx-fno-omit-frame-pointer"] + , builder (Cc CompileC) ? pure ["-g3", "-fno-omit-frame-pointer"] , builder (Cabal Setup) ? arg "--disable-library-stripping" , builder (Cabal Setup) ? arg "--disable-executable-stripping" ] @@ -306,6 +308,28 @@ enableUBSan = builder Testsuite ? arg "--config=have_ubsan=True" ] +-- | Build all stage1+ C/C++ code with AddressSanitizer support: +-- https://clang.llvm.org/docs/AddressSanitizer.html +enableASan :: Flavour -> Flavour +enableASan = + addArgs $ + notStage0 + ? mconcat + [ package rts + ? builder (Cabal Flags) + ? arg "+asan" + <> (needSharedLibSAN ? arg "+shared-libsan"), + builder (Ghc CompileHs) ? arg "-optc-fsanitize=address", + builder (Ghc CompileCWithGhc) ? arg "-optc-fsanitize=address", + builder (Ghc CompileCppWithGhc) ? arg "-optcxx-fsanitize=address", + builder (Ghc LinkHs) + ? pure ["-optc-fsanitize=address", "-optl-fsanitize=address"] + <> (needSharedLibSAN ? arg "-optl-shared-libsan"), + builder (Cc CompileC) ? arg "-fsanitize=address", + builder Testsuite + ? pure ["--config=have_asan=True", "-e", "config.timeout=1800"] + ] + -- | Use the LLVM backend in stages 1 and later. viaLlvmBackend :: Flavour -> Flavour viaLlvmBackend = addArgs $ notStage0 ? builder Ghc ? arg "-fllvm" ===================================== hadrian/src/Rules/Gmp.hs ===================================== @@ -126,6 +126,12 @@ gmpRules = do interpretInContext ctx $ mconcat [ getStagedCCFlags + -- gmp fails to configure with newer compilers + -- that default to c23: + -- https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html. + -- for now just manually specify -std=gnu11 until + -- next upstream release. + , arg "-std=gnu11" -- gmp symbols are only used by bignum logic in -- ghc-internal and shouldn't be exported by the -- ghc-internal shared library. ===================================== hadrian/src/Settings/Flavours/Validate.hs ===================================== @@ -1,31 +1,16 @@ module Settings.Flavours.Validate (validateFlavour, slowValidateFlavour, quickValidateFlavour) where -import qualified Data.Set as Set import Expression import Flavour -import Oracles.Flag import {-# SOURCE #-} Settings.Default -- Please update doc/flavours.md when changing this file. validateFlavour :: Flavour -validateFlavour = enableLinting $ werror $ defaultFlavour +validateFlavour = enableLinting $ quickValidateFlavour { name = "validate" , extraArgs = validateArgs <> defaultHaddockExtraArgs - , libraryWays = Set.fromList <$> - mconcat [ pure [vanilla] - , notStage0 ? platformSupportsSharedLibs ? pure [dynamic] - ] - , rtsWays = Set.fromList <$> - mconcat [ pure [vanilla, debug] - , targetSupportsThreadedRts ? pure [threaded, threadedDebug] - , notStage0 ? platformSupportsSharedLibs ? pure - [ dynamic, debugDynamic - ] - , notStage0 ? platformSupportsSharedLibs ? targetSupportsThreadedRts ? pure - [ threadedDynamic, threadedDebugDynamic ] - ] , ghcDebugAssertions = (<= Stage1) } @@ -59,6 +44,6 @@ quickValidateArgs = sourceArgs SourceArgs } quickValidateFlavour :: Flavour -quickValidateFlavour = werror $ validateFlavour +quickValidateFlavour = werror $ disableProfiledLibs $ defaultFlavour { name = "quick-validate" , extraArgs = quickValidateArgs } ===================================== libraries/ghc-internal/configure.ac ===================================== @@ -195,28 +195,10 @@ dnl-------------------------------------------------------------------- if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES" then AC_MSG_RESULT([no]) - UseIntreeGmp=0 AC_CHECK_HEADER([gmp.h], , [AC_MSG_ERROR([Cannot find gmp.h])]) - - AC_MSG_CHECKING([GMP version]) - AC_COMPUTE_INT(GhcGmpVerMj, __GNU_MP_VERSION, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION])) - AC_COMPUTE_INT(GhcGmpVerMi, __GNU_MP_VERSION_MINOR, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_MINOR])) - AC_COMPUTE_INT(GhcGmpVerPl, __GNU_MP_VERSION_PATCHLEVEL, [#include <gmp.h>], - AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_PATCHLEVEL])) - AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) - else AC_MSG_RESULT([yes]) - UseIntreeGmp=1 HaveSecurePowm=1 - - AC_MSG_CHECKING([GMP version]) - GhcGmpVerMj=6 - GhcGmpVerMi=1 - GhcGmpVerPl=2 - AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl]) fi GMP_INSTALL_INCLUDES="HsIntegerGmp.h ghc-gmp.h" @@ -231,10 +213,6 @@ AC_SUBST(GMP_INSTALL_INCLUDES) AC_SUBST(HaveLibGmp) AC_SUBST(HaveFrameworkGMP) AC_SUBST(HaveSecurePowm) -AC_SUBST(UseIntreeGmp) -AC_SUBST(GhcGmpVerMj) -AC_SUBST(GhcGmpVerMi) -AC_SUBST(GhcGmpVerPl) # Compute offsets/sizes used by jsbits/base.js if test "$host" = "javascript-ghcjs" ===================================== libraries/ghc-internal/include/HsIntegerGmp.h.in ===================================== @@ -1,14 +1,4 @@ #pragma once -/* Whether GMP is embedded into ghc-internal */ -#define GHC_GMP_INTREE @UseIntreeGmp@ - -/* The following values denote the GMP version used during GHC build-time */ -#define GHC_GMP_VERSION_MJ @GhcGmpVerMj@ -#define GHC_GMP_VERSION_MI @GhcGmpVerMi@ -#define GHC_GMP_VERSION_PL @GhcGmpVerPl@ -#define GHC_GMP_VERSION \ - (@GhcGmpVerMj@ * 10000 + @GhcGmpVerMi@ * 100 + @GhcGmpVerPl@) - /* Whether GMP supports mpz_powm_sec */ #define HAVE_SECURE_POWM @HaveSecurePowm@ ===================================== rts/.ubsan-suppressions ===================================== @@ -1,3 +1,6 @@ +# libraries/bytestring/cbits/is-valid-utf8.c:66:14: runtime load of misaligned address 0x7ae45206f112 for type 'const uint64_t *' (aka 'const unsigned long *'), which requires 8 byte alignment +alignment:libraries/bytestring/cbits/is-valid-utf8.c + # libraries/text/cbits/measure_off.c:50:39: runtime left shift of 1 by 31 places cannot be represented in type 'int' shift-base:libraries/text/cbits/measure_off.c ===================================== rts/Hash.c ===================================== @@ -283,6 +283,7 @@ allocHashList (HashTable *table) if (table->freeList != NULL) { HashList *hl = table->freeList; table->freeList = hl->next; + __ghc_asan_unpoison_memory_region(hl, offsetof(HashList, next)); return hl; } else { /* We allocate one block of memory which contains: @@ -302,8 +303,11 @@ allocHashList (HashTable *table) table->freeList = hl + 1; HashList *p = table->freeList; - for (; p < hl + HCHUNK - 1; p++) + for (; p < hl + HCHUNK - 1; p++) { + __ghc_asan_poison_memory_region(p, offsetof(HashList, next)); p->next = p + 1; + } + __ghc_asan_poison_memory_region(p, offsetof(HashList, next)); p->next = NULL; return hl; } @@ -318,6 +322,7 @@ freeHashList (HashTable *table, HashList *hl) // HashListChunks. hl->next = table->freeList; table->freeList = hl; + __ghc_asan_poison_memory_region(hl, offsetof(HashList, next)); } STATIC_INLINE void @@ -388,9 +393,10 @@ removeHashTable_inlined(HashTable *table, StgWord key, const void *data, table->dir[segment][index] = hl->next; else prev->next = hl->next; + void *hl_data = (void*)hl->data; freeHashList(table,hl); table->kcount--; - return (void *) hl->data; + return hl_data; } prev = hl; } ===================================== rts/Task.c ===================================== @@ -183,6 +183,7 @@ freeTask (Task *task) stgFree(incall); } for (incall = task->spare_incalls; incall != NULL; incall = next) { + __ghc_asan_unpoison_memory_region(incall, sizeof(InCall)); next = incall->next; stgFree(incall); } @@ -252,6 +253,7 @@ newInCall (Task *task) if (task->spare_incalls != NULL) { incall = task->spare_incalls; + __ghc_asan_unpoison_memory_region(incall, sizeof(InCall)); task->spare_incalls = incall->next; task->n_spare_incalls--; } else { @@ -283,6 +285,7 @@ endInCall (Task *task) stgFree(incall); } else { incall->next = task->spare_incalls; + __ghc_asan_poison_memory_region(incall, sizeof(InCall)); task->spare_incalls = incall; task->n_spare_incalls++; } ===================================== rts/include/Stg.h ===================================== @@ -335,6 +335,7 @@ external prototype return neither of these types to workaround #11395. #include "stg/MachRegsForHost.h" #include "stg/Regs.h" #include "stg/Ticky.h" +#include "rts/ASANUtils.h" #include "rts/TSANUtils.h" #if IN_STG_CODE ===================================== rts/include/rts/ASANUtils.h ===================================== @@ -0,0 +1,33 @@ +#pragma once + +#if defined(__SANITIZE_ADDRESS__) +#define ASAN_ENABLED +#elif defined(__has_feature) +#if __has_feature(address_sanitizer) +#define ASAN_ENABLED +#endif +#endif + +#if defined(ASAN_ENABLED) +#include <sanitizer/asan_interface.h> +#define USED_IF_ASAN +#else +#include <stdlib.h> +#define USED_IF_ASAN __attribute__((unused)) +#endif + +static inline void +__ghc_asan_poison_memory_region(void const volatile *addr USED_IF_ASAN, + size_t size USED_IF_ASAN) { +#if defined(ASAN_ENABLED) + __asan_poison_memory_region(addr, size); +#endif +} + +static inline void +__ghc_asan_unpoison_memory_region(void const volatile *addr USED_IF_ASAN, + size_t size USED_IF_ASAN) { +#if defined(ASAN_ENABLED) + __asan_unpoison_memory_region(addr, size); +#endif +} ===================================== rts/rts.cabal ===================================== @@ -97,6 +97,12 @@ flag ubsan UndefinedBehaviorSanitizer. default: False manual: True +flag asan + description: + Link with -fsanitize=address, to be enabled when building with + AddressSanitizer. + default: False + manual: True flag shared-libsan description: Link with -shared-libsan, to guarantee only one copy of the @@ -216,6 +222,9 @@ library if flag(ubsan) ld-options: -fsanitize=undefined + if flag(asan) + ld-options: -fsanitize=address + if flag(shared-libsan) ld-options: -shared-libsan @@ -280,6 +289,7 @@ library -- ^ generated rts/ghc_ffi.h rts/Adjustor.h + rts/ASANUtils.h rts/ExecPage.h rts/BlockSignals.h rts/Bytecodes.h ===================================== rts/sm/BlockAlloc.c ===================================== @@ -261,6 +261,8 @@ initGroup(bdescr *head) head[i].flags = 0; } #endif + + __ghc_asan_unpoison_memory_region(head->start, (W_)head->blocks * BLOCK_SIZE); } #if SIZEOF_VOID_P == SIZEOF_LONG @@ -474,6 +476,7 @@ alloc_mega_group (uint32_t node, StgWord mblocks) bd = alloc_mega_group_from_free_list(&deferred_free_mblock_list[node], n, &best); if(bd) { + __ghc_asan_unpoison_memory_region(bd->start, (W_)bd->blocks * BLOCK_SIZE); return bd; } else if(!best) @@ -490,6 +493,7 @@ alloc_mega_group (uint32_t node, StgWord mblocks) if (bd) { + __ghc_asan_unpoison_memory_region(bd->start, (W_)bd->blocks * BLOCK_SIZE); return bd; } else if (best) @@ -500,6 +504,7 @@ alloc_mega_group (uint32_t node, StgWord mblocks) (best_mblocks-mblocks)*MBLOCK_SIZE); best->blocks = MBLOCK_GROUP_BLOCKS(best_mblocks - mblocks); + __ghc_asan_unpoison_memory_region(MBLOCK_ROUND_DOWN(bd), mblocks * MBLOCK_SIZE); initMBlock(MBLOCK_ROUND_DOWN(bd), node); } else @@ -878,6 +883,8 @@ free_mega_group (bdescr *mg) IF_DEBUG(sanity, checkFreeListSanity()); } + + __ghc_asan_poison_memory_region(mg->start, (W_)mg->blocks * BLOCK_SIZE); } static void @@ -925,6 +932,8 @@ free_deferred_mega_groups (uint32_t node) // coalesce forwards coalesce_mblocks(mg); + __ghc_asan_poison_memory_region(mg->start, (W_)mg->blocks * BLOCK_SIZE); + // initialize search for next round prev = mg; bd = prev->link; @@ -1045,6 +1054,8 @@ freeGroup(bdescr *p) setup_tail(p); free_list_insert(node,p); + __ghc_asan_poison_memory_region(p->start, (W_)p->blocks * BLOCK_SIZE); + IF_DEBUG(sanity, checkFreeListSanity()); } ===================================== rts/sm/GCUtils.c ===================================== @@ -348,6 +348,7 @@ alloc_todo_block (gen_workspace *ws, uint32_t size) } else { if (gct->free_blocks) { bd = gct->free_blocks; + __ghc_asan_unpoison_memory_region(bd->start, (W_)bd->blocks * BLOCK_SIZE); gct->free_blocks = bd->link; } else { // We allocate in chunks of at most 16 blocks, use one @@ -357,6 +358,9 @@ alloc_todo_block (gen_workspace *ws, uint32_t size) StgWord n_blocks = stg_min(chunk_size, 1 << (MBLOCK_SHIFT - BLOCK_SHIFT - 1)); allocBlocks_sync(n_blocks, &bd); gct->free_blocks = bd->link; + for (bdescr *bd = gct->free_blocks; bd; bd = bd->link) { + __ghc_asan_poison_memory_region(bd->start, (W_)bd->blocks * BLOCK_SIZE); + } } } initBdescr(bd, ws->gen, ws->gen->to); ===================================== rts/sm/MBlock.c ===================================== @@ -579,6 +579,8 @@ getMBlocks(uint32_t n) ret = getCommittedMBlocks(n); + __ghc_asan_unpoison_memory_region(ret, (W_)n * MBLOCK_SIZE); + debugTrace(DEBUG_gc, "allocated %d megablock(s) at %p",n,ret); mblocks_allocated += n; @@ -611,6 +613,8 @@ freeMBlocks(void *addr, uint32_t n) mblocks_allocated -= n; + __ghc_asan_poison_memory_region(addr, (W_)n * MBLOCK_SIZE); + decommitMBlocks(addr, n); } ===================================== rts/sm/Storage.c ===================================== @@ -1242,6 +1242,10 @@ start_new_pinned_block(Capability *cap) ACQUIRE_SM_LOCK; bd = allocNursery(cap->node, NULL, PINNED_EMPTY_SIZE); RELEASE_SM_LOCK; + + for (bdescr *pbd = bd; pbd; pbd = pbd->link) { + __ghc_asan_poison_memory_region(pbd->start, (W_)pbd->blocks * BLOCK_SIZE); + } } // Bump up the nursery pointer to avoid the pathological situation @@ -1267,6 +1271,7 @@ start_new_pinned_block(Capability *cap) } cap->pinned_object_empty = bd->link; + __ghc_asan_unpoison_memory_region(bd->start, (W_)bd->blocks * BLOCK_SIZE); newNurseryBlock(bd); if (bd->link != NULL) { bd->link->u.back = cap->pinned_object_empty; ===================================== testsuite/driver/testglobals.py ===================================== @@ -189,6 +189,9 @@ class TestConfig: # Are we running with UndefinedBehaviorSanitizer enabled? self.have_ubsan = False + # Are we running with AddressSanitizer enabled? + self.have_asan = False + # Do symbols use leading underscores? self.leading_underscore = False ===================================== testsuite/driver/testlib.py ===================================== @@ -1093,6 +1093,9 @@ def have_thread_sanitizer( ) -> bool: def have_ubsan( ) -> bool: return config.have_ubsan +def have_asan( ) -> bool: + return config.have_asan + def gcc_as_cmmp() -> bool: return config.cmm_cpp_is_gcc ===================================== testsuite/tests/ffi/should_run/all.T ===================================== @@ -192,6 +192,9 @@ test('rts_clearMemory', [ extra_ways(['g1', 'nursery_chunks', 'nonmoving', 'compacting_gc', 'sanity']), # On windows, nonmoving way fails with bad exit code (2816) when(opsys('mingw32'), fragile(23091)), + # For simplicity, ASAN poisoning/unpoisoning logic is omitted + # from rts_clearMemory implementation + when(have_asan(), skip), req_c, pre_cmd('$MAKE -s --no-print-directory rts_clearMemory_setup') ], # Same hack as ffi023 ===================================== testsuite/tests/rts/T18623/all.T ===================================== @@ -8,6 +8,8 @@ test('T18623', # Recent versions of osx report an error when running `ulimit -v` when(opsys('darwin'), skip), when(arch('powerpc64le'), skip), + # ASan can't allocate shadow memory + when(have_asan(), skip), cmd_prefix('ulimit -v ' + str(8 * 1024 ** 2) + ' && '), ignore_stdout], run_command, ===================================== testsuite/tests/rts/all.T ===================================== @@ -105,6 +105,8 @@ def remove_parenthesis(s): return re.sub(r'\s+$[^)]*$', '', s) test('outofmem', [ when(opsys('darwin'), skip), + # ASan shadow memory allocation blows up + when(have_asan(), skip), # this is believed to cause other processes to die # that happen concurrently while the outofmem test # runs in CI. As such we'll need to disable it on View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/911c4e6b8593a6cf3ae7d8e499341c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/911c4e6b8593a6cf3ae7d8e499341c… You're receiving this email because of your account on gitlab.haskell.org.

1 0