- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/ani/kill-CodeSrcFlag] 2 commits: make VDQWarningCtxt landmark
by Apoorv Ingle (＠ani) 12 Mar '26

12 Mar '26

Apoorv Ingle pushed to branch wip/ani/kill-CodeSrcFlag at Glasgow Haskell Compiler / GHC Commits: 3ea76063 by Apoorv Ingle at 2026-03-12T14:33:47-05:00 make VDQWarningCtxt landmark - - - - - 875bb4a5 by Apoorv Ingle at 2026-03-12T14:33:47-05:00 make addExpansionErrCtxt also sets tcl_in_gen_code - - - - - 2 changed files: - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Utils/Monad.hs Changes: ===================================== compiler/GHC/Tc/Types/ErrCtxt.hs ===================================== @@ -396,4 +396,5 @@ data ErrCtxtMsg isErrCtxtMsgLandmark :: ErrCtxtMsg -> Bool isErrCtxtMsgLandmark (DerivBindCtxt{}) = True isErrCtxtMsgLandmark (FunResCtxt{}) = True +isErrCtxtMsgLandmark (VDQWarningCtxt{}) = True isErrCtxtMsgLandmark _ = False ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -1376,7 +1376,7 @@ addErrCtxt msg = addErrCtxtM msg -- See Note [ErrCtxtStack Manipulation] addExpansionErrCtxt :: ErrCtxtMsg -> TcM a -> TcM a {-# INLINE addExpansionErrCtxt #-} -- Note [Inlining addErrCtxt] -addExpansionErrCtxt msg = addExpansionErrCtxtM msg +addExpansionErrCtxt msg = setInGeneratedCode $ addExpansionErrCtxtM msg -- | Add a message to the error context. This message may do tidying. -- See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c6f83aa401efeb7a28fdd5133b2906… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c6f83aa401efeb7a28fdd5133b2906… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/ani/kill-CodeSrcFlag] make addExpansionErrCtxt also sets tcl_in_gen_code
by Apoorv Ingle (＠ani) 12 Mar '26

12 Mar '26

Apoorv Ingle pushed to branch wip/ani/kill-CodeSrcFlag at Glasgow Haskell Compiler / GHC Commits: c6f83aa4 by Apoorv Ingle at 2026-03-12T14:14:12-05:00 make addExpansionErrCtxt also sets tcl_in_gen_code - - - - - 1 changed file: - compiler/GHC/Tc/Utils/Monad.hs Changes: ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -1376,7 +1376,7 @@ addErrCtxt msg = addErrCtxtM msg -- See Note [ErrCtxtStack Manipulation] addExpansionErrCtxt :: ErrCtxtMsg -> TcM a -> TcM a {-# INLINE addExpansionErrCtxt #-} -- Note [Inlining addErrCtxt] -addExpansionErrCtxt msg = addExpansionErrCtxtM msg +addExpansionErrCtxt msg = setInGeneratedCode $ addExpansionErrCtxtM msg -- | Add a message to the error context. This message may do tidying. -- See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c6f83aa401efeb7a28fdd5133b2906b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c6f83aa401efeb7a28fdd5133b2906b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch wip/T26875-1
by Teo Camarasu (＠teo) 12 Mar '26

12 Mar '26

Teo Camarasu deleted branch wip/T26875-1 at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/jeltsch/system-io-implementation-into-base
by Wolfgang Jeltsch (＠jeltsch) 12 Mar '26

12 Mar '26

Wolfgang Jeltsch pushed new branch wip/jeltsch/system-io-implementation-into-base at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/system-io-implementat… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/jeltsch/text-read-uncovering
by Wolfgang Jeltsch (＠jeltsch) 12 Mar '26

12 Mar '26

Wolfgang Jeltsch pushed new branch wip/jeltsch/text-read-uncovering at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/text-read-uncovering 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] 2 commits: Fix terminfo dependency
by Sven Tennie (＠supersven) 12 Mar '26

12 Mar '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 83309247 by Sven Tennie at 2026-03-12T18:08:28+00:00 Fix terminfo dependency - - - - - f434973e by Sven Tennie at 2026-03-12T18:08:48+00:00 Simplify terminfo flag logic - - - - - 1 changed file: - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -92,7 +92,7 @@ packageArgs = do -- target code, otherwise enable for stage2 since that runs on -- the target and can use target's own ghci object linker [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter" - , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + , 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 @@ -128,7 +128,7 @@ packageArgs = do -------------------------------- ghcPkg -------------------------------- , package ghcPkg ? - builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- ghcBoot ------------------------------ , package ghcBoot ? @@ -196,11 +196,8 @@ packageArgs = do -- 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" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- terminfo ------------------------------ , package terminfo ? View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9bcfd140909e9223ebaba055a5ebc6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9bcfd140909e9223ebaba055a5ebc6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26831] Immprove lambda handling in Prep
by Simon Peyton Jones (＠simonpj) 12 Mar '26

12 Mar '26

Simon Peyton Jones pushed to branch wip/T26831 at Glasgow Haskell Compiler / GHC Commits: 2655e4f2 by Simon Peyton Jones at 2026-03-12T17:43:18+00:00 Immprove lambda handling in Prep All Lam in `body` rather than just `rhs`; indeed collapse the two. Then CoreToStg creates the lambda if needed - - - - - 4 changed files: - compiler/GHC/Core/Unfold.hs - compiler/GHC/CoreToStg.hs - compiler/GHC/CoreToStg/Prep.hs - testsuite/tests/simplCore/should_compile/T15205.stderr Changes: ===================================== compiler/GHC/Core/Unfold.hs ===================================== @@ -794,6 +794,7 @@ classOpSize opts cls top_args (dict_arg:other_val_args) arg_discount (Var dict) | dict `elem` top_args = unitBag (dict, dict_discount) arg_discount _ = emptyBag +-- TODO: document this change! dict_discount | null other_val_args = unfoldingDictDiscount opts | otherwise = unfoldingDictDiscount opts + unfoldingFunAppDiscount opts ===================================== compiler/GHC/CoreToStg.hs ===================================== @@ -420,16 +420,22 @@ coreToStgExpr expr@(App _ _) res_ty = exprType expr (app_head, args, ticks) = myCollectArgs expr res_ty -coreToStgExpr expr@(Lam _ _) - = let - (args, body) = myCollectBinders expr - in - case filterStgBinders args of - - [] -> coreToStgExpr body - - _ -> pprPanic "coretoStgExpr" $ - text "Unexpected value lambda:" $$ ppr expr +coreToStgExpr expr@(Lam {}) + | null val_bndrs + = coreToStgExpr body + | otherwise + = do { body' <- extendVarEnvCts [ (a, LambdaBound) | a <- val_bndrs ] $ + coreToStgExpr body + ; let body_ty = exprType body + fun_ty = mkLamTypes bndrs body_ty + rhs = StgRhsClosure noExtFieldSilent currentCCS + ReEntrant val_bndrs body' body_ty + tmp_fun = mkTemplateLocal 0 fun_ty + ; return (StgLet noExtFieldSilent (StgNonRec tmp_fun rhs) $ + StgApp tmp_fun []) } + where + (bndrs, body) = myCollectBinders expr + val_bndrs = filterStgBinders bndrs coreToStgExpr (Tick tick expr) = do ===================================== compiler/GHC/CoreToStg/Prep.hs ===================================== @@ -925,6 +925,7 @@ cpeBody env expr rhsToBody :: CorePrepEnv -> CpeRhs -> UniqSM (Floats, CpeBody) -- Remove top level lambdas by let-binding +{- rhsToBody env (Tick t expr) | tickishScoped t == NoScope -- only float out of non-scoped annotations = do { (floats, expr') <- rhsToBody env expr @@ -946,6 +947,7 @@ rhsToBody env expr@(Lam {}) -- See Note [No eta reduction needed in rhsToBody] ; return (unitFloat float, Var fn) } where (bndrs,_) = collectBinders expr +-} rhsToBody _env expr = return (emptyFloats, expr) ===================================== testsuite/tests/simplCore/should_compile/T15205.stderr ===================================== @@ -10,7 +10,7 @@ f :: forall a b. C a b => a -> b Str=<1P(A,1C(1,C(1,L)))><L>, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [30 0] 40 0}] + Guidance=IF_ARGS [90 0] 40 0}] f = \ (@a) (@b) ($dC :: C a b) (x :: a) -> op @a @b $dC x x View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2655e4f2bac7cb4576058e32064017a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2655e4f2bac7cb4576058e32064017a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/hpc-interpreter
by Matthew Pickering (＠mpickering) 12 Mar '26

12 Mar '26

Matthew Pickering pushed new branch wip/hpc-interpreter at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/hpc-interpreter 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] Simplify terminfo flag logic
by Sven Tennie (＠supersven) 12 Mar '26

12 Mar '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 9bcfd140 by GHC GitLab CI at 2026-03-12T15:55:53+00:00 Simplify terminfo flag logic - - - - - 1 changed file: - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -92,7 +92,7 @@ packageArgs = do -- target code, otherwise enable for stage2 since that runs on -- the target and can use target's own ghci object linker [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter" - , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + , 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 @@ -128,7 +128,7 @@ packageArgs = do -------------------------------- ghcPkg -------------------------------- , package ghcPkg ? - builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- ghcBoot ------------------------------ , package ghcBoot ? @@ -196,13 +196,8 @@ packageArgs = do -- and executables. This flag disables the latter. , package haskeline ? builder (Cabal Flags) ? arg "-examples" - -- Don't depend upon terminfo in early stages or when cross-compiling, - -- to avoid unnecessary dependencies unless the user provided ncurses - -- explicitly. For non-cross builds, terminfo is only enabled from - -- Stage2 onwards (i.e. when building the final compiler). - -- TODO: Perhaps the user should be able to explicitly enable/disable this. , package haskeline ? - builder (Cabal Flags) ? orM [ andM [notM cross, return (stage >= Stage2)], haveCurses ] `cabalFlag` "terminfo" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- terminfo ------------------------------ , package terminfo ? View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9bcfd140909e9223ebaba055a5ebc66… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9bcfd140909e9223ebaba055a5ebc66… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 9 commits: hadrian: remove redundant library/rts ways definitions from stock flavours
by Marge Bot (＠marge-bot) 12 Mar '26

12 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: dfc2b01b by Cheng Shao at 2026-03-11T20:57:19+01:00 hadrian: remove redundant library/rts ways definitions from stock flavours This patch removes redundant library/rts ways definitions from stock flavours in hadrian; they can be replaced by applying appropriate filters on `defaultFlavour`. - - - - - 5811b146 by Teo Camarasu at 2026-03-12T10:50:52-04:00 ghc-internal: move bits Weak of finalizer interface to base We move parts of the Weak finalizer interface to `base` only the parts that the RTS needs to know about are kept in `ghc-internal`. This lets us then prune our imports somewhat and get rid of some SOURCE imports. Resolves #26985 - - - - - 6adfde46 by Simon Jakobi at 2026-03-12T10:50:52-04:00 Add regression test for #2057 Test that GHC stops after an interface-file error instead of continuing into the linker. The test constructs a stale package dependency on purpose. `pkgB` is compiled against one version of package `A`, then the same unit id is replaced by an incompatible build of `A`. When `Main` imports `B`, GHC has to read `B.hi`, finds an unfolding that still mentions the old `A`, and should fail while loading interfaces. Closes #2057. Assisted-by: Codex - - - - - 98689f07 by Sylvain Henry at 2026-03-12T10:51:25-04:00 JS: fix recompilation avoidance (#23013) - we were checking the mtime of the *.jsexe directory, not of a file - we were not computing the PkgsLoaded at all - - - - - c679ab3c by Cheng Shao at 2026-03-12T10:51:26-04:00 hadrian: bump index state & bootstrap plans This patch bumps hadrian index state & bootstrap plans: - The updated index state allows bootstrapping from 9.14 without cabal allow-newer hacks - The updated bootstrap plans all contain shake-0.19.9 containing important bugfix, allowing a subsequent patch to bump shake bound to ensure the bugfix is included - ghc 9.14.1 bootstrap plan is added - - - - - bc6f542a by Cheng Shao at 2026-03-12T10:51:26-04:00 ci: add ghc 9.14.1 to bootstrap matrix This patch adds ghc 9.14.1 to bootstrap matrix, so that we test bootstrapping from ghc 9.14.1. - - - - - 46f10988 by Sylvain Henry at 2026-03-12T10:51:32-04:00 T17912: wait for opener thread to block before killing it (#24739) Instead of a fixed 1000ms delay, poll threadStatus until the opener thread is in BlockedOnForeignCall, ensuring killThread only fires once the thread is provably inside the blocking open() syscall. This prevents the test from accidentally passing on Windows due to scheduling races. - - - - - 6cc98c5d by Cheng Shao at 2026-03-12T10:51:32-04:00 template-haskell: fix redundant import in Language.Haskell.TH.Quote This patch fixes a redundant import in `Language.Haskell.TH.Quote` that causes a ghc build failure when bootstrapping from 9.14 with validate flavours. Fixes #27014. - - - - - c37fcd8f by Brandon Simmons at 2026-03-12T10:51:39-04:00 Add a cumulative gc_sync_elapsed_ns counter to GHC.Internal.Stats This makes it possible to get an accurate view of time spent in sync phase when using prometheus-style sampling. Previously this was only available for the most recent GC. This intentionally leaves GHC.Stats API unchanged since it is marked as deprecated, and API changes there require CLC approval. Fixes #26944 - - - - - 66 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Linker/Loader.hs - hadrian/bootstrap/generate_bootstrap_plans - hadrian/bootstrap/plan-9_10_1.json - hadrian/bootstrap/plan-9_10_2.json - hadrian/bootstrap/plan-9_10_3.json - hadrian/bootstrap/plan-9_12_1.json - hadrian/bootstrap/plan-9_12_2.json - + hadrian/bootstrap/plan-9_14_1.json - hadrian/bootstrap/plan-bootstrap-9_10_1.json - hadrian/bootstrap/plan-bootstrap-9_10_2.json - hadrian/bootstrap/plan-bootstrap-9_10_3.json - hadrian/bootstrap/plan-bootstrap-9_12_1.json - hadrian/bootstrap/plan-bootstrap-9_12_2.json - + hadrian/bootstrap/plan-bootstrap-9_14_1.json - hadrian/cabal.project - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - libraries/base/src/GHC/Stats.hs - libraries/base/src/GHC/Weak.hs - libraries/base/src/GHC/Weak/Finalize.hs - − libraries/base/src/GHC/Weak/Finalizehs - libraries/base/src/System/Mem/Weak.hs - libraries/base/tests/IO/T17912.hs - libraries/base/tests/IO/all.T - libraries/ghc-internal/CHANGELOG.md - − libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs-boot - − libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs-boot - libraries/ghc-internal/src/GHC/Internal/Stats.hsc - libraries/ghc-internal/src/GHC/Internal/TopHandler.hs - libraries/ghc-internal/src/GHC/Internal/Weak.hs - libraries/ghc-internal/src/GHC/Internal/Weak/Finalize.hs - libraries/template-haskell/Language/Haskell/TH/Quote.hs - rts/Stats.c - rts/include/RtsAPI.h - testsuite/.gitignore - testsuite/tests/annotations/should_run/all.T - − testsuite/tests/driver/OneShotTH.stdout-javascript-unknown-ghcjs - + testsuite/tests/driver/T2057/Makefile - + testsuite/tests/driver/T2057/README.md - + testsuite/tests/driver/T2057/T2057.stderr - + testsuite/tests/driver/T2057/all.T - + testsuite/tests/driver/T2057/app/Main.hs - + testsuite/tests/driver/T2057/pkgA1/A.hs - + testsuite/tests/driver/T2057/pkgA1/pkg.conf - + testsuite/tests/driver/T2057/pkgA2/A.hs - + testsuite/tests/driver/T2057/pkgA2/pkg.conf - + testsuite/tests/driver/T2057/pkgB/B.hs - + testsuite/tests/driver/T2057/pkgB/pkg.conf - + testsuite/tests/driver/T20604/T20604.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/T20604/all.T - testsuite/tests/driver/all.T - testsuite/tests/driver/fat-iface/fat010.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/recomp011/all.T - testsuite/tests/driver/recompHash/recompHash.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/recompNoTH/recompNoTH.stdout-javascript-unknown-ghcjs - − testsuite/tests/driver/th-new-test/th-new-test.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6af6ba920c0d9786bfde6639ab6274… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6af6ba920c0d9786bfde6639ab6274… You're receiving this email because of your account on gitlab.haskell.org.

1 0