September 2025 - ghc-commits

[Git][ghc/ghc][wip/T23162-spj] Wibble
by Simon Peyton Jones (＠simonpj) 30 Sep '25

30 Sep '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: b3c474de by Simon Peyton Jones at 2025-09-30T15:15:47+01:00 Wibble - - - - - 1 changed file: - compiler/GHC/Tc/Utils/Unify.hs Changes: ===================================== compiler/GHC/Tc/Utils/Unify.hs ===================================== @@ -2402,6 +2402,7 @@ recordUnifications (WU_Coarse lvl_ref) tvs recordUnifications (WU_Fine tvs_ref) tvs = updTcRef tvs_ref (`unionVarSet` tvs) + {- %************************************************************************ %* * View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3c474de683d11a63da8e910c63846d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3c474de683d11a63da8e910c63846d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/querying-newline-modes] Add an operation `System.IO.hGetNewlineMode`
by Wolfgang Jeltsch (＠jeltsch) 30 Sep '25

30 Sep '25

Wolfgang Jeltsch pushed to branch wip/jeltsch/querying-newline-modes at Glasgow Haskell Compiler / GHC Commits: 42593900 by Wolfgang Jeltsch at 2025-09-30T16:53:30+03:00 Add an operation `System.IO.hGetNewlineMode` This commit also contains some small code and documentation changes for related operations, for the sake of consistency. - - - - - 8 changed files: - libraries/base/changelog.md - libraries/base/src/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 Changes: ===================================== libraries/base/changelog.md ===================================== @@ -10,6 +10,7 @@ * Fix bug where `naturalAndNot` was incorrectly truncating results ([CLC proposal #350](github.com/haskell/core-libraries-committee/issues/350)) * Remove extra laziness from `Data.Bifunctor.Bifunctor` instances for all tuples to have the same laziness as their `Data.Functor.Functor` counterparts (i.e. they became more strict than before) ([CLC proposal #339](https://github.com/haskell/core-libraries-committee/issues/339)) * Adjust the strictness of `Data.List.iterate'` to be more reasonable: every element of the output list is forced to WHNF when the `(:)` containing it is forced. ([CLC proposal #335)](https://github.com/haskell/core-libraries-committee/issues/335) + * Add `System.IO.hGetNewlineMode` ([CLC proposal #370](https://github.com/haskell/core-libraries-committee/issues/370)) ## 4.22.0.0 *TBA* * Shipped with GHC 9.14.1 ===================================== libraries/base/src/System/IO.hs ===================================== @@ -175,6 +175,7 @@ module System.IO -- Binary-mode 'Handle's do no newline translation at all. hSetNewlineMode, + hGetNewlineMode, Newline(..), nativeNewline, NewlineMode(..), ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs ===================================== @@ -40,7 +40,7 @@ module GHC.Internal.IO.Handle ( hIsOpen, hIsClosed, hIsReadable, hIsWritable, hGetBuffering, hIsSeekable, hSetEcho, hGetEcho, hIsTerminalDevice, - hSetNewlineMode, Newline(..), NewlineMode(..), nativeNewline, + hSetNewlineMode, hGetNewlineMode, Newline(..), NewlineMode(..), nativeNewline, noNewlineTranslation, universalNewlineMode, nativeNewlineMode, hShow, @@ -238,7 +238,7 @@ hSetBuffering handle mode = return Handle__{ haBufferMode = mode,.. } -- ----------------------------------------------------------------------------- --- hSetEncoding +-- Setting and getting the text encoding -- | The action 'hSetEncoding' @hdl@ @encoding@ changes the text encoding -- for the handle @hdl@ to @encoding@. The default encoding when a 'Handle' is @@ -624,16 +624,22 @@ hSetBinaryMode handle bin = haOutputNL = outputNL nl, .. } -- ----------------------------------------------------------------------------- --- hSetNewlineMode +-- Setting and getting the newline mode --- | Set the 'NewlineMode' on the specified 'Handle'. All buffered +-- | Set the 'NewlineMode' for the specified 'Handle'. All buffered -- data is flushed first. hSetNewlineMode :: Handle -> NewlineMode -> IO () -hSetNewlineMode handle NewlineMode{ inputNL=i, outputNL=o } = +hSetNewlineMode handle NewlineMode{..} = withAllHandles__ "hSetNewlineMode" handle $ \h_@Handle__{} -> do flushBuffer h_ - return h_{ haInputNL=i, haOutputNL=o } + return h_{ haInputNL = inputNL, haOutputNL = outputNL } + +-- | Return the current 'NewlineMode' for the specified 'Handle'. +hGetNewlineMode :: Handle -> IO NewlineMode +hGetNewlineMode hdl = + withHandle_ "hGetNewlineMode" hdl $ \h_@Handle__{..} -> + return NewlineMode{ inputNL = haInputNL, outputNL = haOutputNL } -- ----------------------------------------------------------------------------- -- Duplicating a Handle ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO.hs ===================================== @@ -213,6 +213,7 @@ module GHC.Internal.System.IO ( -- Binary-mode 'Handle's do no newline translation at all. -- hSetNewlineMode, + hGetNewlineMode, Newline(..), nativeNewline, NewlineMode(..), noNewlineTranslation, universalNewlineMode, nativeNewlineMode, ===================================== testsuite/tests/interface-stability/base-exports.stdout ===================================== @@ -10259,6 +10259,7 @@ module System.IO where hGetEcho :: Handle -> IO GHC.Internal.Types.Bool hGetEncoding :: Handle -> IO (GHC.Internal.Maybe.Maybe TextEncoding) hGetLine :: Handle -> IO GHC.Internal.Base.String + hGetNewlineMode :: Handle -> IO NewlineMode hGetPosn :: Handle -> IO HandlePosn hIsClosed :: Handle -> IO GHC.Internal.Types.Bool hIsEOF :: Handle -> IO GHC.Internal.Types.Bool ===================================== testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs ===================================== @@ -13305,6 +13305,7 @@ module System.IO where hGetEcho :: Handle -> IO GHC.Internal.Types.Bool hGetEncoding :: Handle -> IO (GHC.Internal.Maybe.Maybe TextEncoding) hGetLine :: Handle -> IO GHC.Internal.Base.String + hGetNewlineMode :: Handle -> IO NewlineMode hGetPosn :: Handle -> IO HandlePosn hIsClosed :: Handle -> IO GHC.Internal.Types.Bool hIsEOF :: Handle -> IO GHC.Internal.Types.Bool ===================================== testsuite/tests/interface-stability/base-exports.stdout-mingw32 ===================================== @@ -10539,6 +10539,7 @@ module System.IO where hGetEcho :: Handle -> IO GHC.Internal.Types.Bool hGetEncoding :: Handle -> IO (GHC.Internal.Maybe.Maybe TextEncoding) hGetLine :: Handle -> IO GHC.Internal.Base.String + hGetNewlineMode :: Handle -> IO NewlineMode hGetPosn :: Handle -> IO HandlePosn hIsClosed :: Handle -> IO GHC.Internal.Types.Bool hIsEOF :: Handle -> IO GHC.Internal.Types.Bool ===================================== testsuite/tests/interface-stability/base-exports.stdout-ws-32 ===================================== @@ -10259,6 +10259,7 @@ module System.IO where hGetEcho :: Handle -> IO GHC.Internal.Types.Bool hGetEncoding :: Handle -> IO (GHC.Internal.Maybe.Maybe TextEncoding) hGetLine :: Handle -> IO GHC.Internal.Base.String + hGetNewlineMode :: Handle -> IO NewlineMode hGetPosn :: Handle -> IO HandlePosn hIsClosed :: Handle -> IO GHC.Internal.Types.Bool hIsEOF :: Handle -> IO GHC.Internal.Types.Bool View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/425939009cdc8cda04fe86c2e04a03a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/425939009cdc8cda04fe86c2e04a03a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26457] Fix buglet in GHC.Core.Unify.uVarOrFam
by Simon Peyton Jones (＠simonpj) 30 Sep '25

30 Sep '25

Simon Peyton Jones pushed to branch wip/T26457 at Glasgow Haskell Compiler / GHC Commits: 771aaa74 by Simon Peyton Jones at 2025-09-30T14:35:03+01:00 Fix buglet in GHC.Core.Unify.uVarOrFam We were failing to match two totally-equal types! This led to #26457. - - - - - 3 changed files: - compiler/GHC/Core/Unify.hs - + testsuite/tests/typecheck/should_compile/T26457.hs - testsuite/tests/typecheck/should_compile/all.T Changes: ===================================== compiler/GHC/Core/Unify.hs ===================================== @@ -288,10 +288,11 @@ Wrinkles (ATF3) What about foralls? For example, supppose we are unifying (forall a. F a) -> (forall a. F a) - Those two (F a) types are unrelated, bound by different foralls. + against some other type. Those two (F a) types are unrelated, bound by + different foralls; we cannot extend the um_fam_env with a binding [F a :-> blah] So to keep things simple, the entire family-substitution machinery is used - only if there are no enclosing foralls (see the (um_foralls env)) check in + only if there are no enclosing foralls (see the `under_forall` check in `uSatFamApp`). That's fine, because the apartness business is used only for reducing type-family applications, and class instances, and their arguments can't have foralls anyway. @@ -329,6 +330,8 @@ Wrinkles instance (Generic1 f, Ord (Rep1 f a)) => Ord (Generically1 f a) where ... -- The "..." gives rise to [W] Ord (Generically1 f a) + where Rep1 is a type family. + We must use the instance decl (recursively) to simplify the [W] constraint; we do /not/ want to worry that the `[G] Ord (Rep1 f a)` might be an alternative path. So `noMatchableGivenDicts` must return False; @@ -336,6 +339,12 @@ Wrinkles `DontBindMe`, the unifier must return `SurelyApart`, not `MaybeApart`. See `go` in `uVarOrFam` + This looks a bit sketchy, because they aren't SurelyApart, but see + Note [What might equal later?] in GHC.Tc.Utils.Unify, esp "Red Herring". + + If we are under a forall, we return `MaybeApart`; that seems more conservative, + and class constraints are on tau-types so it doesn't matter. + (ATF6) When /matching/ can we ever have a type-family application on the LHS, in the template? You might think not, because type-class-instance and type-family-instance heads can't include type families. E.g. @@ -344,12 +353,12 @@ Wrinkles But you'd be wrong: even when matching, we can see type families in the LHS template: * In `checkValidClass`, in `check_dm` we check that the default method has the right type, using matching, both ways. And that type may have type-family - applications in it. Example in test CoOpt_Singletons. + applications in it. Examples in test CoOpt_Singletons and T26457. * In the specialiser: see the call to `tcMatchTy` in `GHC.Core.Opt.Specialise.beats_or_same` - * With -fpolymorphic-specialsation, we might get a specialiation rule like + * With -fpolymorphic-specialisation, we might get a specialiation rule like RULE forall a (d :: Eq (Maybe (F a))) . f @(Maybe (F a)) d = ... See #25965. @@ -362,7 +371,7 @@ Wrinkles type variables/ that makes the match work. So we simply want to recurse into the arguments of the type family. E.g. Template: forall a. Maybe (F a) - Target: Mabybe (F Int) + Target: Maybe (F Int) We want to succeed with substitution [a :-> Int]. See (ATF9). Conclusion: where we enter via `tcMatchTy`, `tcMatchTys`, `tc_match_tys`, @@ -378,10 +387,10 @@ Wrinkles type family G6 a = r | r -> a type instance G6 [a] = [G a] type instance G6 Bool = Int - and suppose we haev a Wanted constraint + and suppose we have a Wanted constraint [W] G6 alpha ~ [Int] -. According to Section 5.2 of "Injective type families for Haskell", we /match/ - the RHS each type instance [Int]. So we try + According to Section 5.2 of "Injective type families for Haskell", we /match/ + the RHS each of type instance with [Int]. So we try Template: [G a] Target: [Int] and we want to succeed with MaybeApart, so that we can generate the improvement constraint @@ -401,15 +410,21 @@ Wrinkles (ATF9) Decomposition. Consider unifying F a ~ F Int - There is a unifying substitition [a :-> Int], and we want to find it, returning - Unifiable. (Remember, this is the Core unifier -- we are not doing type inference.) - So we should decompose to get (a ~ Int) + when `um_bind_fam_fun` says DontBindMe. There is a unifying substitition [a :-> Int], + and we want to find it, returning Unifiable. Why? + - Remember, this is the Core unifier -- we are not doing type inference + - When we have two equal types, like F a ~ F a, it is ridiculous to say that they + are MaybeApart. Example: the two-way tcMatchTy in `checkValidClass` and #26457. - But consider unifying + (ATF9-1) But consider unifying F Int ~ F Bool - Although Int and Bool are SurelyApart, we must return MaybeApart for the outer - unification. Hence the use of `don'tBeSoSure` in `go_fam_fam`; it leaves Unifiable - alone, but weakens `SurelyApart` to `MaybeApart`. + Although Int and Bool are SurelyApart, we must return MaybeApart for the outer + unification. Hence the use of `don'tBeSoSure` in `go_fam_fam`; it leaves Unifiable + alone, but weakens `SurelyApart` to `MaybeApart`. + + (ATF9-2) We want this decomposition to occur even under a forall (this was #26457). + E.g. (forall a. F Int) -> Int ~ (forall a. F Int) ~ Int + (ATF10) Injectivity. Consider (AFT9) where F is known to be injective. Then if we are unifying @@ -1815,6 +1830,9 @@ uVarOrFam env ty1 ty2 kco -- , text "fam_env" <+> ppr (um_fam_env substs) ]) $ ; go NotSwapped substs ty1 ty2 kco } where + foralld_tvs = um_foralls env + under_forall = not (isEmptyVarSet foralld_tvs) + -- `go` takes two bites at the cherry; if the first one fails -- it swaps the arguments and tries again; and then it fails. -- The SwapFlag argument tells `go` whether it is on the first @@ -1889,7 +1907,6 @@ uVarOrFam env ty1 ty2 kco | otherwise = False - foralld_tvs = um_foralls env occurs_check = um_unif env && uOccursCheck substs foralld_tvs lhs rhs -- Occurs check, only when unifying -- see Note [Infinitary substitutions] @@ -1899,14 +1916,11 @@ uVarOrFam env ty1 ty2 kco -- LHS is a saturated type-family application -- Invariant: ty2 is not a TyVarTy go swapped substs lhs@(TyFamLHS tc1 tys1) ty2 kco - -- If we are under a forall, just give up and return MaybeApart - -- see (ATF3) in Note [Apartness and type families] - | not (isEmptyVarSet (um_foralls env)) - = maybeApart MARTypeFamily - - -- We are not under any foralls, so the RnEnv2 is empty -- Check if we have an existing substitution for the LHS; if so, recurse - | Just ty1' <- lookupFamEnv (um_fam_env substs) tc1 tys1 + -- But not under a forall; see (ATF3) in Note [Apartness and type families] + -- Hence the RnEnv2 is empty + | not under_forall + , Just ty1' <- lookupFamEnv (um_fam_env substs) tc1 tys1 = if | um_unif env -> unify_ty env ty1' ty2 kco -- Below here we are matching -- The return () case deals with: @@ -1917,11 +1931,19 @@ uVarOrFam env ty1 ty2 kco | otherwise -> maybeApart MARTypeFamily -- Check for equality F tys1 ~ F tys2 + -- Very important that this can happen under a forall, so that we + -- successfully match (forall a. F a) ~ (forall b. F b) See (ATF9-2) | Just (tc2, tys2) <- isSatTyFamApp ty2 , tc1 == tc2 = go_fam_fam substs tc1 tys1 tys2 kco + -- If we are under a forall, just give up + -- see (ATF3) and (ATF5) in Note [Apartness and type families] + | under_forall + = maybeApart MARTypeFamily + -- Now check if we can bind the (F tys) to the RHS + -- Again, not under a forall; see (ATF3) -- This can happen even when matching: see (ATF7) | BindMe <- um_bind_fam_fun env tc1 tys1 rhs = if uOccursCheck substs emptyVarSet lhs rhs @@ -1935,6 +1957,7 @@ uVarOrFam env ty1 ty2 kco -- Maybe um_bind_fam_fun is False of (F a b) but true of (G c d e) -- NB: a type family can appear on the template when matching -- see (ATF6) in Note [Apartness and type families] + -- Only worth doing this if we are no under a forall | um_unif env , NotSwapped <- swapped , Just lhs2 <- canEqLHS_maybe ty2 @@ -1949,7 +1972,6 @@ uVarOrFam env ty1 ty2 kco ----------------------------- -- go_fam_fam: LHS and RHS are both saturated type-family applications, -- for the same type-family F - -- Precondition: um_foralls is empty go_fam_fam substs tc tys1 tys2 kco -- Decompose (F tys1 ~ F tys2): (ATF9) -- Use injectivity information of F: (ATF10) @@ -1957,7 +1979,7 @@ uVarOrFam env ty1 ty2 kco = do { bind_fam_if_poss -- (ATF11) ; unify_tys env inj_tys1 inj_tys2 -- (ATF10) ; unless (um_inj_tf env) $ -- (ATF12) - don'tBeSoSure MARTypeFamily $ -- (ATF9) + don'tBeSoSure MARTypeFamily $ -- (ATF9-1) unify_tys env noninj_tys1 noninj_tys2 } where inj = case tyConInjectivityInfo tc of @@ -1970,6 +1992,8 @@ uVarOrFam env ty1 ty2 kco bind_fam_if_poss | not (um_unif env) -- Not when matching (ATF11-1) = return () + | under_forall -- Not under a forall (ATF3) + = return () | BindMe <- um_bind_fam_fun env tc tys1 rhs1 = unless (uOccursCheck substs emptyVarSet (TyFamLHS tc tys1) rhs1) $ extendFamEnv tc tys1 rhs1 ===================================== testsuite/tests/typecheck/should_compile/T26457.hs ===================================== @@ -0,0 +1,18 @@ +{-# LANGUAGE Haskell2010 #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE DefaultSignatures #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE TypeFamilies #-} + +module T26457 where + +import Data.Kind +import Data.Proxy + +type family FC (be :: Type) (entity :: Type) :: Constraint + +class Database be where + fun :: Proxy be -> (forall tbl. FC be tbl => Proxy tbl -> ()) -> () + default fun :: Proxy be -> (forall tbl. FC be tbl => Proxy tbl -> ()) -> () + fun _ _ = undefined ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -952,4 +952,4 @@ test('T26346', normal, compile, ['']) test('T26358', expect_broken(26358), compile, ['']) test('T26345', normal, compile, ['']) test('T26376', normal, compile, ['']) - +test('T26457', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/771aaa748c4e0118baa8dd1af46a9ed… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/771aaa748c4e0118baa8dd1af46a9ed… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/26435] compiler: Warn when -finfo-table-map is used with -fllvm
by Zubin (＠wz1000) 30 Sep '25

30 Sep '25

Zubin pushed to branch wip/26435 at Glasgow Haskell Compiler / GHC Commits: 6277d0e1 by Zubin Duggal at 2025-09-30T17:34:41+05:30 compiler: Warn when -finfo-table-map is used with -fllvm These are currently not supported together. Fixes #26435 - - - - - 5 changed files: - compiler/GHC/Driver/Session.hs - docs/users_guide/debug-info.rst - + testsuite/tests/driver/T26435.hs - + testsuite/tests/driver/T26435.stderr - testsuite/tests/driver/all.T Changes: ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -3784,6 +3784,11 @@ makeDynFlagsConsistent dflags hostFullWays in dflags_c + | gopt Opt_InfoTableMap dflags + , LlvmCodeOutput <- backendCodeOutput (backend dflags) + = loop (gopt_unset dflags Opt_InfoTableMap) + "-finfo-table-map is incompatible with -fllvm" + | otherwise = (dflags, mempty, mempty) where loc = mkGeneralSrcSpan (fsLit "when making flags consistent") loop updated_dflags warning ===================================== docs/users_guide/debug-info.rst ===================================== @@ -370,6 +370,11 @@ to a source location. This lookup table is generated by using the ``-finfo-table also want more precise information about constructor info tables then you should also use :ghc-flag:`-fdistinct-constructor-tables`. + .. note:: + This flag is incompatible with :ghc-flag:`-fllvm`. If both flags are + enabled, GHC will emit a warning and :ghc-flag:`-finfo-table-map` will + have no effect. + The :ghc-flag:`-finfo-table-map` flag will increase the binary size by quite a lot, depending on how big your project is. For compiling a project the size of GHC the overhead was about 200 megabytes. ===================================== testsuite/tests/driver/T26435.hs ===================================== @@ -0,0 +1,2 @@ +main :: IO () +main = putStrLn "hello world" \ No newline at end of file ===================================== testsuite/tests/driver/T26435.stderr ===================================== @@ -0,0 +1,3 @@ +when making flags consistent: warning: [GHC-74335] [-Winconsistent-flags (in -Wdefault)] + -finfo-table-map is incompatible with -fllvm + ===================================== testsuite/tests/driver/all.T ===================================== @@ -331,3 +331,4 @@ test('T24839', [unless(arch('x86_64') or arch('aarch64'), skip), extra_files(["t test('t25150', [extra_files(["t25150"])], multimod_compile, ['Main.hs', '-v0 -working-dir t25150/dir a.c']) test('T25382', normal, makefile_test, []) test('T26018', req_c, makefile_test, []) +test('T26435', normal, compile, ['-finfo-table-map -fllvm']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6277d0e19c3487d2e538f2685b18cfb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6277d0e19c3487d2e538f2685b18cfb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/26435] compiler: Warn when -finfo-table-map is used with -fllvm
by Zubin (＠wz1000) 30 Sep '25

30 Sep '25

Zubin pushed to branch wip/26435 at Glasgow Haskell Compiler / GHC Commits: 1df941a0 by Zubin Duggal at 2025-09-30T17:34:22+05:30 compiler: Warn when -finfo-table-map is used with -fllvm These are currently not supported together. Fixes #26435 - - - - - 4 changed files: - compiler/GHC/Driver/Session.hs - docs/users_guide/debug-info.rst - + testsuite/tests/driver/T26435.stderr - testsuite/tests/driver/all.T Changes: ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -3784,6 +3784,11 @@ makeDynFlagsConsistent dflags hostFullWays in dflags_c + | gopt Opt_InfoTableMap dflags + , LlvmCodeOutput <- backendCodeOutput (backend dflags) + = loop (gopt_unset dflags Opt_InfoTableMap) + "-finfo-table-map is incompatible with -fllvm" + | otherwise = (dflags, mempty, mempty) where loc = mkGeneralSrcSpan (fsLit "when making flags consistent") loop updated_dflags warning ===================================== docs/users_guide/debug-info.rst ===================================== @@ -370,6 +370,11 @@ to a source location. This lookup table is generated by using the ``-finfo-table also want more precise information about constructor info tables then you should also use :ghc-flag:`-fdistinct-constructor-tables`. + .. note:: + This flag is incompatible with :ghc-flag:`-fllvm`. If both flags are + enabled, GHC will emit a warning and :ghc-flag:`-finfo-table-map` will + have no effect. + The :ghc-flag:`-finfo-table-map` flag will increase the binary size by quite a lot, depending on how big your project is. For compiling a project the size of GHC the overhead was about 200 megabytes. ===================================== testsuite/tests/driver/T26435.stderr ===================================== @@ -0,0 +1,3 @@ +when making flags consistent: warning: [GHC-74335] [-Winconsistent-flags (in -Wdefault)] + -finfo-table-map is incompatible with -fllvm + ===================================== testsuite/tests/driver/all.T ===================================== @@ -331,3 +331,4 @@ test('T24839', [unless(arch('x86_64') or arch('aarch64'), skip), extra_files(["t test('t25150', [extra_files(["t25150"])], multimod_compile, ['Main.hs', '-v0 -working-dir t25150/dir a.c']) test('T25382', normal, makefile_test, []) test('T26018', req_c, makefile_test, []) +test('T26435', normal, compile, ['-finfo-table-map -fllvm']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1df941a0d8fd405ad0d080097f04ffb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1df941a0d8fd405ad0d080097f04ffb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/26435
by Zubin (＠wz1000) 30 Sep '25

30 Sep '25

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

1 0

[Git][ghc/ghc][wip/26432] ghc api: Introduce variants of setSessionDynFlags and setUnitDynFlags that allow reloading
by Zubin (＠wz1000) 30 Sep '25

30 Sep '25

Zubin pushed to branch wip/26432 at Glasgow Haskell Compiler / GHC Commits: 8f8ef3e7 by Zubin Duggal at 2025-09-30T17:04:10+05:30 ghc api: Introduce variants of setSessionDynFlags and setUnitDynFlags that allow reloading the package db. These can be used if you change the package db flags in the DynFlags. Fixes #26423 - - - - - 1 changed file: - compiler/GHC.hs Changes: ===================================== compiler/GHC.hs ===================================== @@ -35,8 +35,11 @@ module GHC ( parseDynamicFlags, parseTargetFiles, getSessionDynFlags, setTopSessionDynFlags, + ReloadPkgDb(..), setSessionDynFlags, + setSessionDynFlagsWithPkgDb, setUnitDynFlags, + setUnitDynFlagsWithPkgDb, getProgramDynFlags, setProgramDynFlags, setProgramHUG, setProgramHUG_, getInteractiveDynFlags, setInteractiveDynFlags, @@ -633,18 +636,35 @@ initGhcMonad mb_top_dir = setSession =<< liftIO ( do -- -- 'setSessionDynFlags' sets both @DynFlags@, and 'getSessionDynFlags' -- retrieves the program @DynFlags@ (for backwards compatibility). +-- +-- Neither of these functions --- This is a compatibility function which sets dynflags for the top session --- as well as the unit. +-- | This is a compatibility function which sets dynflags for the top session +-- as well as the unit. Only works if there is exactly one unit. +-- +-- Note that this does not reload the package db if it is already loaded. +-- This means that if you change package flags or the location of the package +-- db before calling this function, these changes may not take effect. +-- See 'setSessionDynFlagsWithPkgDb' to configure this behavior and force +-- reloading of the package database. setSessionDynFlags :: (HasCallStack, GhcMonad m) => DynFlags -> m () -setSessionDynFlags dflags0 = do +setSessionDynFlags = setSessionDynFlagsWithPkgDb UseCachedPkgDb + + +-- | This is a compatibility function which sets dynflags for the top session +-- as well as the unit. Only works if there is exactly one unit. +-- +-- The 'ReloadPkgDb' argument controls if the pacakge database is reload. +-- Set it to 'ReloadPkgDb' if you change package flags, otherwise 'UseCachedPkgDb'. +setSessionDynFlagsWithPkgDb :: (HasCallStack, GhcMonad m) => ReloadPkgDb -> DynFlags -> m () +setSessionDynFlagsWithPkgDb use_cache dflags0 = do hsc_env <- getSession logger <- getLogger dflags <- checkNewDynFlags logger dflags0 let all_uids = hsc_all_home_unit_ids hsc_env case S.toList all_uids of [uid] -> do - setUnitDynFlagsNoCheck uid dflags + setUnitDynFlagsNoCheck use_cache uid dflags modifySession (hscUpdateLoggerFlags . hscSetActiveUnitId (homeUnitId_ dflags)) dflags' <- getDynFlags setTopSessionDynFlags dflags' @@ -652,19 +672,39 @@ setSessionDynFlags dflags0 = do _ -> panic "setSessionDynFlags can only be used with a single home unit" +-- | Set the dynflags for a unit. +-- +-- Note that this does not reload the package db if it is already loaded. +-- This means that if you change package flags or the location of the package +-- db before calling this function, these changes may not take effect. +-- See 'setUnitDynFlagsWithPkgDb' to configure this behavior and force +-- reloading of the package database. setUnitDynFlags :: GhcMonad m => UnitId -> DynFlags -> m () -setUnitDynFlags uid dflags0 = do +setUnitDynFlags = setUnitDynFlagsWithPkgDb UseCachedPkgDb + +-- | Set the dynflags for a unit. +-- +-- The 'ReloadPkgDb' argument controls if the pacakge database is reload. +-- Set it to 'UseCachedPkgDb' if you change package flags. +setUnitDynFlagsWithPkgDb :: GhcMonad m => ReloadPkgDb -> UnitId -> DynFlags -> m () +setUnitDynFlagsWithPkgDb use_cache uid dflags0 = do logger <- getLogger dflags1 <- checkNewDynFlags logger dflags0 - setUnitDynFlagsNoCheck uid dflags1 + setUnitDynFlagsNoCheck use_cache uid dflags1 + +data ReloadPkgDb + = UseCachedPkgDb -- ^ Use the pkg db cached in the hsc env if it exists + | ReloadPkgDb -- ^ Reload the pkg db based on the dynflags -setUnitDynFlagsNoCheck :: GhcMonad m => UnitId -> DynFlags -> m () -setUnitDynFlagsNoCheck uid dflags1 = do +setUnitDynFlagsNoCheck :: GhcMonad m => ReloadPkgDb -> UnitId -> DynFlags -> m () +setUnitDynFlagsNoCheck use_cache uid dflags1 = do logger <- getLogger hsc_env <- getSession let old_hue = ue_findHomeUnitEnv uid (hsc_unit_env hsc_env) - let cached_unit_dbs = homeUnitEnv_unit_dbs old_hue + let cached_unit_dbs = case use_cache of + UseCachedPkgDb -> homeUnitEnv_unit_dbs old_hue + ReloadPkgDb -> Nothing (dbs,unit_state,home_unit,mconstants) <- liftIO $ initUnits logger dflags1 cached_unit_dbs (hsc_all_home_unit_ids hsc_env) updated_dflags <- liftIO $ updatePlatformConstants dflags1 mconstants View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f8ef3e7a1b039f09cbbc9b77a82120… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f8ef3e7a1b039f09cbbc9b77a82120… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/26432
by Zubin (＠wz1000) 30 Sep '25

30 Sep '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/T26457
by Simon Peyton Jones (＠simonpj) 30 Sep '25

30 Sep '25

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

1 0

[Git][ghc/ghc][wip/gbc-files] Fix unused binding
by Matthew Pickering (＠mpickering) 30 Sep '25

30 Sep '25

Matthew Pickering pushed to branch wip/gbc-files at Glasgow Haskell Compiler / GHC Commits: 97b1d7f0 by Matthew Pickering at 2025-09-30T12:24:14+01:00 Fix unused binding - - - - - 1 changed file: - compiler/GHC/Runtime/Eval.hs Changes: ===================================== compiler/GHC/Runtime/Eval.hs ===================================== @@ -1301,7 +1301,6 @@ dynCompileExpr expr = do showModule :: GhcMonad m => ModuleNodeInfo -> m String showModule mni = do - let mod = moduleNodeInfoModule mni withSession $ \hsc_env -> do let dflags = hsc_dflags hsc_env return (showSDoc dflags $ showModMsg dflags (ModuleNode [] mni)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97b1d7f08bd7c206d613ba3a5dd1add… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/97b1d7f08bd7c206d613ba3a5dd1add… You're receiving this email because of your account on gitlab.haskell.org.

1 0