November 2025 - ghc-commits

[Git][ghc/ghc][wip/T23162-part2] Only do top-level fundeps if there are no local ones
by Simon Peyton Jones (＠simonpj) 11 Nov '25

11 Nov '25

Simon Peyton Jones pushed to branch wip/T23162-part2 at Glasgow Haskell Compiler / GHC Commits: ffe4070c by Simon Peyton Jones at 2025-11-11T10:50:23+00:00 Only do top-level fundeps if there are no local ones - - - - - 1 changed file: - compiler/GHC/Tc/Solver/FunDeps.hs Changes: ===================================== compiler/GHC/Tc/Solver/FunDeps.hs ===================================== @@ -25,7 +25,7 @@ import GHC.Core.FamInstEnv import GHC.Core.Coercion import GHC.Core.Predicate( EqRel(..) ) import GHC.Core.TyCon -import GHC.Core.Unify( tcUnifyTyForInjectivity, typeListsAreApart, typesAreApart ) +import GHC.Core.Unify( tcUnifyTyForInjectivity, typeListsAreApart ) import GHC.Core.Coercion.Axiom import GHC.Core.TyCo.Subst( elemSubst ) @@ -251,7 +251,7 @@ Consider T4254b: it doesn't matter which of the two we pick, but historically we have picked the local-fundeps first. - #14745 is another example + #14745 is another example. And #13651. (DFL2) Try solving from top-level instances before fundeps. From the definition `foo = op` we get @@ -259,7 +259,7 @@ Consider T4254b: [W] FD Int Bool We solve this from the top level instance before even trying fundeps. If we did try fundeps, we'd generate [W] b ~ Bool, which fails. - That doesn't matter -- failing fundep equalties are discarded -- but it's + That doesn't matter -- failing fundep equalities are discarded -- but it's a waste of effort. (DFL2) is achieved by trying fundeps only on /unsolved/ Wanteds. @@ -463,24 +463,30 @@ by the extensive code in GHC.Builtin.Types.Literals. -} tryEqFunDeps :: EqCt -> SolverStage () -tryEqFunDeps work_item@(EqCt { eq_lhs = lhs, eq_eq_rel = eq_rel }) +tryEqFunDeps work_item@(EqCt { eq_lhs = work_lhs + , eq_rhs = work_rhs + , eq_eq_rel = eq_rel }) | NomEq <- eq_rel - , TyFamLHS tc args <- lhs - = tryFamEqFunDeps tc args work_item -- We have F args ~ rhs + , TyFamLHS fam_tc work_args <- work_lhs -- We have F args ~N# rhs + = do { eqs_for_me <- simpleStage$ getInertFamEqsFor fam_tc work_args work_rhs + ; tryFamEqFunDeps eqs_for_me fam_tc work_args work_item } | otherwise = nopStage () -tryFamEqFunDeps :: TyCon -> [TcType] -> EqCt -> SolverStage () -tryFamEqFunDeps fam_tc args work_item@(EqCt { eq_ev = ev, eq_rhs = rhs }) +tryFamEqFunDeps :: [EqCt] -> TyCon -> [TcType] -> EqCt -> SolverStage () +tryFamEqFunDeps eqs_for_me fam_tc work_args + work_item@(EqCt { eq_ev = ev, eq_rhs = work_rhs }) | Just ops <- isBuiltInSynFamTyCon_maybe fam_tc = if isGiven ev - then tryGivenBuiltinFamEqFDs fam_tc ops args work_item + then tryGivenBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_item else do { -- Note [Do local fundeps before top-level instances] - tryFDEqns fam_tc args work_item $ - mkLocalBuiltinFamEqFDs fam_tc ops args rhs - ; tryFDEqns fam_tc args work_item $ - mkTopBuiltinFamEqFDs fam_tc ops args rhs } + tryFDEqns fam_tc work_args work_item $ + mkLocalBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_rhs + ; if null eqs_for_me + then tryFDEqns fam_tc work_args work_item $ + mkTopBuiltinFamEqFDs fam_tc ops work_args work_rhs + else nopStage () } | isGiven ev -- See (INJFAM:Given) = nopStage () @@ -491,26 +497,31 @@ tryFamEqFunDeps fam_tc args work_item@(EqCt { eq_ev = ev, eq_rhs = rhs }) , Injective inj_flags <- tyConInjectivityInfo fam_tc = -- Open, injective type families do { -- Note [Do local fundeps before top-level instances] - tryFDEqns fam_tc args work_item $ - mkLocalUserFamEqFDs fam_tc inj_flags args rhs + tryFDEqns fam_tc work_args work_item $ + mkLocalFamEqFDs eqs_for_me fam_tc inj_flags work_args work_rhs - ; tryFDEqns fam_tc args work_item $ - mkTopOpenFamEqFDs fam_tc inj_flags args rhs } + ; if null eqs_for_me + then tryFDEqns fam_tc work_args work_item $ + mkTopOpenFamEqFDs fam_tc inj_flags work_args work_rhs + else nopStage () } | Just ax <- isClosedFamilyTyCon_maybe fam_tc = -- Closed type families do { -- Note [Do local fundeps before top-level instances] simpleStage $ traceTcS "fundep closed" (ppr fam_tc) + ; case tyConInjectivityInfo fam_tc of NotInjective -> nopStage() - Injective inj -> tryFDEqns fam_tc args work_item $ - mkLocalUserFamEqFDs fam_tc inj args rhs + Injective inj -> tryFDEqns fam_tc work_args work_item $ + mkLocalFamEqFDs eqs_for_me fam_tc inj work_args work_rhs -- Now look at the top-level axioms; we effectively infer injectivity, -- so we don't need tyConInjectivtyInfo. This works fine for closed -- type families without injectivity info - ; tryFDEqns fam_tc args work_item $ - mkTopClosedFamEqFDs ax args rhs } + ; if null eqs_for_me + then tryFDEqns fam_tc work_args work_item $ + mkTopClosedFamEqFDs ax work_args work_rhs + else nopStage () } | otherwise -- Data families, abstract families = nopStage () @@ -542,7 +553,7 @@ mkTopClosedFamEqFDs ax work_args work_rhs go (branch : later_branches) | CoAxBranch { cab_tvs = qtvs, cab_lhs = lhs_tys , cab_rhs = rhs_ty, cab_incomps = incomps } <- branch - , not (no_match lhs_tys rhs_ty) + , not (eqnIsApart lhs_tys rhs_ty work_args work_rhs) = if all no_match_branch incomps && all no_match_branch later_branches then [FDEqns { fd_qtvs = qtvs, fd_eqs = zipWith Pair lhs_tys work_args }] else [] @@ -551,10 +562,7 @@ mkTopClosedFamEqFDs ax work_args work_rhs = go later_branches no_match_branch (CoAxBranch { cab_lhs = lhs_tys, cab_rhs = rhs_ty }) - = no_match lhs_tys rhs_ty - - no_match lhs_tys rhs_ty = work_args `typeListsAreApart` lhs_tys || - work_rhs `typesAreApart` rhs_ty + = eqnIsApart lhs_tys rhs_ty work_args work_rhs mkTopOpenFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] -- Implements (INJFAM:Wanted/top) @@ -592,12 +600,10 @@ mkTopOpenFamEqFDs fam_tc inj_flags work_args work_rhs !(subst', tvs') = trim_qtvs subst1 tvs in (subst', tv':tvs') -mkLocalUserFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] -mkLocalUserFamEqFDs fam_tc inj_flags work_args work_rhs - = do { fun_eqs_for_me <- getInertFamEqsFor fam_tc - - ; let -- eqns_from_inerts: see (INJFAM:Wanted/other) - eqns_from_inerts = mapMaybe do_one fun_eqs_for_me +mkLocalFamEqFDs :: [EqCt] -> TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] +mkLocalFamEqFDs eqs_for_me fam_tc inj_flags work_args work_rhs + = do { let -- eqns_from_inerts: see (INJFAM:Wanted/other) + eqns_from_inerts = mapMaybe do_one eqs_for_me -- eqns_from_self: see (INJFAM:Wanted/Self) eqns_from_self = case tcSplitTyConApp_maybe work_rhs of Just (tc,rhs_tys) | tc==fam_tc -> [mk_eqn rhs_tys] @@ -617,14 +623,16 @@ mkLocalUserFamEqFDs fam_tc inj_flags work_args work_rhs -- Built-in type families ----------------------------------------- -tryGivenBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> EqCt -> SolverStage () +tryGivenBuiltinFamEqFDs :: [EqCt] -> TyCon -> BuiltInSynFamily + -> [TcType] -> EqCt -> SolverStage () -- TyCon is definitely a built-in type family -- Built-in type families are special becase we can generate -- evidence from /Givens/. For example: -- from [G] x+4~7 we can deduce [G] x~7 -- That's important! -- See Note [Given/Given fundeps for built-in type families] -tryGivenBuiltinFamEqFDs fam_tc ops work_args (EqCt { eq_ev = work_ev, eq_rhs = work_rhs }) +tryGivenBuiltinFamEqFDs eqs_for_me fam_tc ops work_args + (EqCt { eq_ev = work_ev, eq_rhs = work_rhs }) = Stage $ do { traceTcS "tryBuiltinFamEqFDs" $ vcat [ text "lhs:" <+> ppr fam_tc <+> ppr work_args @@ -632,8 +640,7 @@ tryGivenBuiltinFamEqFDs fam_tc ops work_args (EqCt { eq_ev = work_ev, eq_rhs = w , text "work_ev:" <+> ppr work_ev ] -- interact with inert Givens, emitting new Givens - ; fun_eqs_for_me <- getInertFamEqsFor fam_tc - ; mapM_ do_one fun_eqs_for_me + ; mapM_ do_one eqs_for_me -- Interact with top-level instancs, emitting new Givens ; emitNewGivens (ctEvLoc work_ev) $ @@ -682,11 +689,10 @@ mkTopBuiltinFamEqFDs fam_tc ops work_args work_rhs = return [FDEqns { fd_qtvs = [] , fd_eqs = map snd $ tryInteractTopFam ops fam_tc work_args work_rhs }] -mkLocalBuiltinFamEqFDs :: TyCon -> BuiltInSynFamily -> [TcType] -> Xi -> TcS [FunDepEqns] -mkLocalBuiltinFamEqFDs fam_tc ops work_args work_rhs - = do { fun_eqs_for_me <- getInertFamEqsFor fam_tc - - ; let do_one :: EqCt -> [FunDepEqns] +mkLocalBuiltinFamEqFDs :: [EqCt] -> TyCon -> BuiltInSynFamily + -> [TcType] -> Xi -> TcS [FunDepEqns] +mkLocalBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_rhs + = do { let do_one :: EqCt -> [FunDepEqns] do_one (EqCt { eq_lhs = TyFamLHS _ inert_args, eq_rhs = inert_rhs }) | inert_rhs `tcEqType` work_rhs = [mk_eqn inert_args] | otherwise = [] @@ -697,7 +703,7 @@ mkLocalBuiltinFamEqFDs fam_tc ops work_args work_rhs , fd_eqs = map snd $ tryInteractInertFam ops fam_tc work_args iargs } - ; let eqns_from_inerts = concatMap do_one fun_eqs_for_me + ; let eqns_from_inerts = concatMap do_one eqs_for_me eqns_from_self = case tcSplitTyConApp_maybe work_rhs of Just (tc,rhs_tys) | tc==fam_tc -> [mk_eqn rhs_tys] _ -> [] @@ -717,16 +723,29 @@ mkInjectivityFDEqn inj_args qtvs lhs_args rhs_args eqs = [ Pair lhs_arg rhs_arg | (True, lhs_arg, rhs_arg) <- zip3 inj_args lhs_args rhs_args ] -getInertFamEqsFor :: TyCon -> TcS [EqCt] -- Returns a mixture of Given and Wanted +getInertFamEqsFor :: TyCon -> [TcType] -> Xi -> TcS [EqCt] +-- Returns a mixture of Given and Wanted -- Look in the InertSet, and return all inert equalities -- F tys ~N# rhs -- where F is the specified TyCon +-- But filter out ones that can't possibly help, is apart from the Wanted -- Representational equalities don't interact with type family dependencies -getInertFamEqsFor fam_tc +getInertFamEqsFor fam_tc work_args work_rhs = do { IC {inert_funeqs = funeqs } <- getInertCans ; return [ funeq_ct | equal_ct_list <- findFunEqsByTyCon funeqs fam_tc - , funeq_ct <- equal_ct_list - , NomEq == eq_eq_rel funeq_ct ] } + , funeq_ct@(EqCt { eq_eq_rel = eq_rel + , eq_lhs = TyFamLHS _ inert_args + , eq_rhs = inert_rhs }) + <- equal_ct_list + , NomEq == eq_rel + , not (eqnIsApart inert_args inert_rhs work_args work_rhs) ] } + +eqnIsApart :: [TcType] -> TcType + -> [TcType] -> TcType + -> Bool +eqnIsApart lhs_tys1 rhs_ty1 lhs_tys2 rhs_ty2 + = (rhs_ty1:lhs_tys1) `typeListsAreApart` (rhs_ty2:lhs_tys2) + {- Note [Type inference for type families with injectivity] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -744,11 +763,11 @@ For /injective/, /user-defined/ type families - When F is a built-in type family, we can do better; See Note [Given/Given fundeps for built-in type families] -* (INJFAM:Wanted/Self) see `mkLocalUserFamEqFDs` +* (INJFAM:Wanted/Self) see `mkLocalFamEqFDs` work item: [W] F s1 s2 ~ F t1 t2 We can generate FunDepEqns: (s2 ~ t2) -* (INJFAM:Wanted/other) see `mkLocalUserFamEqFDs` +* (INJFAM:Wanted/other) see `mkLocalFamEqFDs` work item: [W] F s1 s2 ~ rhs -- Wanted inert: [G/W] F t2 t2 ~ rhs -- Same `rhs`, Given or Wanted We can generate FunDepEqns: (s2 ~ t2) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ffe4070ce22fbe5d87752a7c8da84e5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ffe4070ce22fbe5d87752a7c8da84e5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 13 commits: Preserve user-written kinds in data declarations
by Marge Bot (＠marge-bot) 11 Nov '25

11 Nov '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 2474674c by sheaf at 2025-11-11T05:35:42-05:00 Preserve user-written kinds in data declarations This commit ensures that we preserve the user-written kind for data declarations, e.g. in type T2T = Type -> Type type D :: T2T data D a where { .. } that we preserve the user-written kind of D as 'T2T', instead of expanding the type synonym 'T2T' during kind checking. We do this by storing 'tyConKind' separately from 'tyConResKind'. This means that 'tyConKind' is not necessarily equal to 'mkTyConKind binders res_kind', as e.g. in the above example the former is 'T2T' while the latter is 'Type -> Type'. This is explained in Note [Preserve user-written TyCon kind] in GHC.Core.TyCon. This is particularly important for Haddock, as the kinds stored in interface files affect the generated documentation, and we want to preserve the user-written types as much as possible. - - - - - 7842c2f2 by sheaf at 2025-11-11T05:35:42-05:00 Store user-written datacon tvs in interface files This commit ensures we store the user-written quantified type variables of data constructors in interface files, e.g. in data D a where MkD1 :: forall x. x -> D x MkD2 :: forall u v. u -> v -> D v The previous behaviour was to rename the universal variables to match the universal variables of the data constructor. This was undesirable because the names that end up in interface files end up mattering for generated Haddock documentation; it's better to preserve the user-written type variables. Moreover, the universal variables may not have been user-written at all, e.g. in an example such as: type T2T = Type -> Type data G :: T2T where MkG :: forall x. D x Here GHC will invent the type variable name 'a' for the first binder of the TyCon G. We really don't want to then rename the user-written 'x' into the generated 'a'. - - - - - 7ffc5ed3 by sheaf at 2025-11-11T05:35:42-05:00 DataCon univ_tvs names: pick TyCon over inferred This commit changes how we compute the names of universal type variables in GADT data constructors. This augments the existing logic that chose which type variable name to use, in GHC.Tc.TyCl.mkGADTVars. We continue to prefer DataCon tv names for user-written binders, but we now prefer TyCon tv names for inferred (non-user-written) DataCon binders. This makes a difference in examples such as: type (:~~:) :: k1 -> k2 -> Type data a :~~: b where HRefl :: a :~~: a Before this patch, we ended up giving HRefl the type: forall {k2}. forall (a :: k2). a :~~: a whereas we now give it the type: forall {k1}. forall (a :: k1). a :~~: a The important part isn't really 'k1' or 'k2', but more that the inferred type variable names of the DataCon can be arbitrary/unpredictable (as they are chosen by GHC and depend on how unification proceeds), so it's much better to use the more predictable TyCon type variable names. - - - - - f8fdc188 by sheaf at 2025-11-11T05:35:42-05:00 Backpack Rename: use explicit record construction This commit updates the Backpack boilerplate in GHC.Iface.Rename to use explicit record construction rather than record update. This makes sure that the code stays up to date when the underlying constructors change (e.g. new fields are added). The rationale is further explained in Note [Prefer explicit record construction]. - - - - - 28a62528 by sheaf at 2025-11-11T05:35:42-05:00 Store # eta binders in TyCon and use for Haddock This commit stores the number of TyCon binders that were introduced by eta-expansion (by the function GHC.Tc.Gen.HsType.splitTyConKind). This is then used to pretty-print the TyCon as the user wrote it, e.g. for type Effect :: (Type -> Type) -> Type -> Type data State s :: Effect where {..} -- arity 3 GHC will eta-expand the data declaration to data State s a b where {..} but also store in the 'TyCon' that the number of binders introduced by this eta expansion is 2. This allows us, in 'Haddock.Convert.synifyTyConKindSig', to recover the original user-written syntax, preserving the user's intent in Haddock documentation. See Note [Inline kind signatures with GADTSyntax] in Haddock.Convert. - - - - - 18f5035c by Matthew Pickering at 2025-11-11T05:35:46-05:00 driver: Properly handle errors during LinkNode steps Previously we were not properly catching errors during the LinkNode step (see T9930fail test). This is fixed by wrapping the `LinkNode` action in `wrapAction`, the same handler which is used for module compilation. Fixes #26496 - - - - - d884006c by Matthew Pickering at 2025-11-11T05:35:48-05:00 driver: Remove unecessary call to hscInsertHPT This call was left-over from e9445c013fbccf9318739ca3d095a3e0a2e1be8a If you follow the functions which call `upsweep_mod`, they immediately add the interface to the HomePackageTable when `upsweep_mod` returns. - - - - - b7c78f03 by ARATA Mizuki at 2025-11-11T05:35:59-05:00 LLVM backend: Pass the +evex512 attribute to LLVM 18+ if -mavx512f is set The newer LLVM requires the +evex512 attribute to enable use of ZMM registers. LLVM exhibits a backward-compatible behavior if the cpu is `x86-64`, but not if `penryn`. Therefore, on macOS, where the cpu is set to `penryn`, we need to explicitly pass +evex512. Fixes #26410 - - - - - b5cb5d32 by Vladislav Zavialov at 2025-11-11T05:36:01-05:00 Comments only in GHC.Parser.PostProcess.Haddock Remove outdated Note [Register keyword location], as the issue it describes was addressed by commit 05eb50dff2fcc78d025e77b9418ddb369db49b9f. - - - - - 6c87120d by sheaf at 2025-11-11T05:36:06-05:00 localRegistersConflict: account for assignment LHS This commit fixes a serious oversight in GHC.Cmm.Sink.conflicts, specifically the code that computes which local registers conflict between an assignment and a Cmm statement. If we have: assignment: <local_reg> = <expr> node: <local_reg> = <other_expr> then clearly the two conflict, because we cannot move one statement past the other, as they assign two different values to the same local register. (Recall that 'conflicts (local_reg,expr) node' is False if and only if the assignment 'local_reg = expr' can be safely commuted past the statement 'node'.) The fix is to update 'GHC.Cmm.Sink.localRegistersConflict' to take into account the following two situations: (1) 'node' defines the LHS local register of the assignment, (2) 'node' defines a local register used in the RHS of the assignment. The bug is precisely that we were previously missing condition (1). Fixes #26550 - - - - - 756a0a54 by sheaf at 2025-11-11T05:36:06-05:00 Update assigned register format when spilling When we come to spilling a register to put new data into it, in GHC.CmmToAsm.Reg.Linear.allocRegsAndSpill_spill, we need to: 1. Spill the data currently in the register. That is, do a spill with a format that matches what's currently in the register. 2. Update the register assignment, allocating a virtual register to this real register, but crucially **updating the format** of this assignment. Due to shadowing in the Haskell code for allocRegsAndSpill_spill, we were mistakenly re-using the old format. This could lead to a situation where: a. We were using xmm6 to store a Double#. b. We want to store a DoubleX2# into xmm6, so we spill the current content of xmm6 to the stack using a scalar move (correct). c. We update the register assignment, but we fail to update the format of the assignment, so we continue to think that xmm6 stores a Double# and not a DoubleX2#. d. Later on, we need to spill xmm6 because it is getting clobbered by another instruction. We then decide to only spill the lower 64 bits of the register, because we still think that xmm6 only stores a Double# and not a DoubleX2#. Fixes #26542 - - - - - 7d3df676 by ARATA Mizuki at 2025-11-11T05:36:11-05:00 Fix the order of spill/reload instructions The AArch64 NCG could emit multiple instructions for a single spill/reload, but their order was not consistent between the definition and a use. Fixes #26537 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> - - - - - a6bbbcd5 by Andreas Klebinger at 2025-11-11T05:36:12-05:00 Add hpc to release script - - - - - 73 changed files: - .gitlab/rel_eng/upload_ghc_libs.py - compiler/GHC/Builtin/Types.hs - compiler/GHC/Builtin/Types/Literals.hs - compiler/GHC/Cmm/Sink.hs - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Liveness.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/Core/Type.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Iface/Decl.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/Build.hs - compiler/GHC/Tc/TyCl/Instance.hs - testsuite/tests/backpack/should_fail/T19244a.stderr - + testsuite/tests/codeGen/should_run/T26537.hs - + testsuite/tests/codeGen/should_run/T26537.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/dependent/should_fail/T11334b.stderr - testsuite/tests/generics/T10604/T10604_deriving.stderr - testsuite/tests/ghc-e/should_fail/T9930fail.stderr - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/ghci.debugger/scripts/print012.stdout - testsuite/tests/ghci/scripts/T10321.stdout - testsuite/tests/ghci/scripts/T24459.stdout - testsuite/tests/ghci/scripts/T7730.stdout - testsuite/tests/ghci/scripts/ghci065.stdout - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.hs - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - 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 - testsuite/tests/rename/should_fail/rnfail055.stderr - testsuite/tests/saks/should_compile/saks023.stdout - testsuite/tests/saks/should_compile/saks034.stdout - testsuite/tests/saks/should_compile/saks035.stdout - testsuite/tests/showIface/Makefile - + testsuite/tests/showIface/T26246a.hs - + testsuite/tests/showIface/T26246a.stdout - testsuite/tests/showIface/all.T - + testsuite/tests/simd/should_run/T26410_ffi.hs - + testsuite/tests/simd/should_run/T26410_ffi.stdout - + testsuite/tests/simd/should_run/T26410_ffi_c.c - + testsuite/tests/simd/should_run/T26410_prim.hs - + testsuite/tests/simd/should_run/T26410_prim.stdout - + testsuite/tests/simd/should_run/T26542.hs - + testsuite/tests/simd/should_run/T26542.stdout - + testsuite/tests/simd/should_run/T26550.hs - + testsuite/tests/simd/should_run/T26550.stdout - testsuite/tests/simd/should_run/all.T - testsuite/tests/typecheck/T16127/T16127.stderr - testsuite/tests/typecheck/should_compile/T22560d.stdout - testsuite/tests/typecheck/should_fail/T15629.stderr - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug1050.html - + utils/haddock/html-test/ref/Bug26246.html - utils/haddock/html-test/ref/Bug85.html - utils/haddock/html-test/ref/Bug923.html - utils/haddock/html-test/ref/BundledPatterns.html - utils/haddock/html-test/ref/BundledPatterns2.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/GADTRecords.html - utils/haddock/html-test/ref/LinearTypes.html - utils/haddock/html-test/ref/PromotedTypes.html - + utils/haddock/html-test/src/Bug26246.hs - utils/haddock/latex-test/ref/LinearTypes/LinearTypes.tex The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85182b6ee89b756f1c362ba0b5b573… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85182b6ee89b756f1c362ba0b5b573… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-part2] Wibbles
by Simon Peyton Jones (＠simonpj) 11 Nov '25

11 Nov '25

Simon Peyton Jones pushed to branch wip/T23162-part2 at Glasgow Haskell Compiler / GHC Commits: 98aecdda by Simon Peyton Jones at 2025-11-11T09:59:58+00:00 Wibbles - - - - - 3 changed files: - compiler/GHC/Tc/Solver/FunDeps.hs - testsuite/tests/indexed-types/should_compile/CEqCanOccursCheck.hs - testsuite/tests/indexed-types/should_fail/T12522a.hs Changes: ===================================== compiler/GHC/Tc/Solver/FunDeps.hs ===================================== @@ -25,7 +25,7 @@ import GHC.Core.FamInstEnv import GHC.Core.Coercion import GHC.Core.Predicate( EqRel(..) ) import GHC.Core.TyCon -import GHC.Core.Unify( tcUnifyTyForInjectivity, typeListsAreApart, typesAreApart, tcUnifyTy ) +import GHC.Core.Unify( tcUnifyTyForInjectivity, typeListsAreApart, typesAreApart ) import GHC.Core.Coercion.Axiom import GHC.Core.TyCo.Subst( elemSubst ) @@ -38,7 +38,7 @@ import GHC.Utils.Outputable import GHC.Utils.Panic import GHC.Data.Pair -import Data.Maybe( mapMaybe, isJust ) +import Data.Maybe( mapMaybe ) {- Note [Overview of functional dependencies in type inference] @@ -500,7 +500,8 @@ tryFamEqFunDeps fam_tc args work_item@(EqCt { eq_ev = ev, eq_rhs = rhs }) | Just ax <- isClosedFamilyTyCon_maybe fam_tc = -- Closed type families do { -- Note [Do local fundeps before top-level instances] - case tyConInjectivityInfo fam_tc of + simpleStage $ traceTcS "fundep closed" (ppr fam_tc) + ; case tyConInjectivityInfo fam_tc of NotInjective -> nopStage() Injective inj -> tryFDEqns fam_tc args work_item $ mkLocalUserFamEqFDs fam_tc inj args rhs @@ -531,7 +532,9 @@ tryFDEqns fam_tc work_args work_item@(EqCt { eq_ev = ev, eq_rhs= rhs }) mk_fd_eq ----------------------------------------- mkTopClosedFamEqFDs :: CoAxiom Branched -> [TcType] -> Xi -> TcS [FunDepEqns] mkTopClosedFamEqFDs ax work_args work_rhs - = return (go (fromBranches (coAxiomBranches ax))) + = do { let branches = fromBranches (coAxiomBranches ax) + ; traceTcS "mkTopClosed" (ppr branches $$ ppr work_args $$ ppr work_rhs) + ; return (go branches) } where go :: [CoAxBranch] -> [FunDepEqns] go [] = [] @@ -539,18 +542,19 @@ mkTopClosedFamEqFDs ax work_args work_rhs go (branch : later_branches) | CoAxBranch { cab_tvs = qtvs, cab_lhs = lhs_tys , cab_rhs = rhs_ty, cab_incomps = incomps } <- branch - , not (work_args `typeListsAreApart` lhs_tys) - , isJust (tcUnifyTy work_rhs rhs_ty) - = if all ok incomps && all ok later_branches + , not (no_match lhs_tys rhs_ty) + = if all no_match_branch incomps && all no_match_branch later_branches then [FDEqns { fd_qtvs = qtvs, fd_eqs = zipWith Pair lhs_tys work_args }] else [] | otherwise = go later_branches - ok (CoAxBranch { cab_lhs = lhs_tys, cab_rhs = rhs_ty }) - = work_args `typeListsAreApart` lhs_tys || - work_rhs `typesAreApart` rhs_ty + no_match_branch (CoAxBranch { cab_lhs = lhs_tys, cab_rhs = rhs_ty }) + = no_match lhs_tys rhs_ty + + no_match lhs_tys rhs_ty = work_args `typeListsAreApart` lhs_tys || + work_rhs `typesAreApart` rhs_ty mkTopOpenFamEqFDs :: TyCon -> [Bool] -> [TcType] -> Xi -> TcS [FunDepEqns] -- Implements (INJFAM:Wanted/top) ===================================== testsuite/tests/indexed-types/should_compile/CEqCanOccursCheck.hs ===================================== @@ -8,10 +8,13 @@ type family F a where type family G a b where G a a = a -{- +{- Ambiguity check for foo +[G] F a ~ a +[G] F a ~ b + [W] F alpha ~ alpha [W] F alpha ~ beta -[W] G alpha beta ~ Int +[W] G alpha beta ~ G a b -} foo :: (F a ~ a, F a ~ b) => G a b -> () ===================================== testsuite/tests/indexed-types/should_fail/T12522a.hs ===================================== @@ -21,3 +21,9 @@ def = undefined -- test :: Uncurried [Int, String] String test = def $ \n s -> I $ show n ++ s + +{- +Arg to `def` has type (alpha -> String -> String) +So we get + [W] Curry as0 b0 ~ (alpha -> String -> String) +-} View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/98aecddaeaa0b699f13771a3ac7891f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/98aecddaeaa0b699f13771a3ac7891f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mp/14996] try again
by Matthew Pickering (＠mpickering) 11 Nov '25

11 Nov '25

Matthew Pickering pushed to branch wip/mp/14996 at Glasgow Haskell Compiler / GHC Commits: 047358cb by Matthew Pickering at 2025-11-11T09:34:50+00:00 try again - - - - - 1 changed file: - hadrian/src/Builder.hs Changes: ===================================== hadrian/src/Builder.hs ===================================== @@ -44,6 +44,7 @@ import GHC.ResponseFile import GHC.Toolchain (Target(..)) import qualified GHC.Toolchain as Toolchain import GHC.Toolchain.Program +import Debug.Trace -- | C compiler can be used in two different modes: -- * Compile or preprocess a source file. @@ -399,9 +400,17 @@ runHaddock haddockPath flagArgs fileInputs = withTempFile $ \tmp -> do runGhcWithResponse :: FilePath -> [String] -> [FilePath] -> Action () runGhcWithResponse ghcPath flagArgs fileInputs = withTempFile $ \tmp -> do + + let (hs_files, normal_args) = partition (isSuffixOf ".hs") flagArgs writeFile' tmp $ escapeArgs (fileInputs) - cmd [ghcPath] flagArgs ('@' : tmp) + traceM (unlines $ hs_files) + traceM (unlines $ fileInputs) + + writeFile' tmp $ escapeArgs fileInputs + + -- Cannot put everything into a response file due to #26560 + cmd [ghcPath] normal_args ('@' : tmp) -- TODO: Some builders are required only on certain platforms. For example, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/047358cb9b7f22cd4b33e04ac802c0a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/047358cb9b7f22cd4b33e04ac802c0a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T23559
by Simon Peyton Jones (＠simonpj) 11 Nov '25

11 Nov '25

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

1 0

[Git][ghc/ghc] Pushed new tag ghc-9.12.3-rc2
by Zubin (＠wz1000) 11 Nov '25

11 Nov '25

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

1 0

[Git][ghc/ghc][ghc-9.12] 15 commits: Fix EmptyCase panic in tcMatches (#25960)
by Zubin (＠wz1000) 11 Nov '25

11 Nov '25

Zubin pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC Commits: a8ce2f00 by Vladislav Zavialov at 2025-10-22T12:39:41+05:30 Fix EmptyCase panic in tcMatches (#25960) Due to faulty reasoning in Note [Pattern types for EmptyCase], tcMatches was too keen to panic. * Old (incorrect) assumption: pat_tys is a singleton list. This does not hold when \case{} is checked against a function type preceded by invisible forall. See the new T25960 test case. * New (hopefully correct) assumption: vis_pat_tys is a singleton list. This should follow from: checkArgCounts :: MatchGroup GhcRn ... -> TcM VisArity checkArgCounts (MG { mg_alts = L _ [] }) = return 1 ... (cherry picked from commit b34890c7d4803041caff060391eec298e2b0a098) - - - - - 72e32447 by Ben Gamari at 2025-10-22T12:42:06+05:30 StgToByteCode: Don't assume that data con workers are nullary Previously StgToByteCode assumed that all data-con workers were of a nullary representation. This is not a valid assumption, as seen in #23210, where an unsaturated application of a unary data constructor's worker resulted in invalid bytecode. Sadly, I have not yet been able to reduce a minimal testcase for this. Fixes #23210. (cherry picked from commit d1d9e39ec293cd1d2b539b8246a349b539c6a61a) - - - - - dc9e7c4e by Ben Gamari at 2025-10-22T12:42:20+05:30 testsuite: Mark T23146* as unbroken (cherry picked from commit 3eeecd508ef80812bc8ee84ab83f496f5030d59b) - - - - - 8935a773 by Brandon Chinn at 2025-11-10T19:40:08+05:30 Fix tabs in string gaps (#26415) Tabs in string gaps were broken in bb030d0d because previously, string gaps were manually parsed, but now it's lexed by the usual Alex grammar and post-processed after successful lexing. It broke because of a discrepancy between GHC's lexer grammar and the Haskell Report. The Haskell Report includes tabs in whitechar: whitechar → newline | vertab | space | tab | uniWhite $whitechar used to include tabs until 18 years ago, when it was removed in order to exclude tabs from $white_no_nl in order to warn on tabs: 6e202120. In this MR, I'm adding \t back into $whitechar, and explicitly excluding \t from the $white_no_nl+ rule ignoring all whitespace in source code, which more accurately colocates the "ignore all whitespace except tabs, which is handled in the next line" logic. As a side effect of this MR, tabs are now allowed in pragmas; currently, a pragma written as {-# \t LANGUAGE ... #-} is interpreted as the tab character being the pragma name, and GHC warns "Unrecognized pragma". With this change, tabs are ignored as whitespace, which more closely matches the Report anyway. (cherry picked from commit e9c5e46ffdb3cd8725e2ffdc2c440ea57af97bac) - - - - - fe5becec by Ben Gamari at 2025-11-10T19:40:08+05:30 rts/nonmoving: Fix comment spelling (cherry picked from commit 14281a22eb27498886def8e5d17797c9ce62f3ad) - - - - - 75e629bf by Ben Gamari at 2025-11-10T19:40:08+05:30 rts/nonmoving: Use atomic operations to update bd->flags (cherry picked from commit bedd38b01d6b113cb3bd10b5d784c16b32efb5bb) - - - - - bd06a0c8 by Ben Gamari at 2025-11-10T19:40:08+05:30 nonmoving: Use get_itbl instead of explicit loads This is cleaner and also fixes unnecessary (and unsound) use of `volatile`. (cherry picked from commit 215d68414020dc4ed0636508c9eecd9f44f62168) - - - - - 7642aaa6 by Ben Gamari at 2025-11-10T19:40:08+05:30 rts/Scav: Handle WHITEHOLEs in scavenge_one `scavenge_one`, used to scavenge mutable list entries, may encounter `WHITEHOLE`s when the non-moving GC is in use via two paths: 1. when an MVAR is being marked concurrently 2. when the object belongs to a chain of selectors being short-cutted. Fixes #26204. (cherry picked from commit 2c94aa3aa87c14b1ff5c4355c9a90efedd5d10f4) - - - - - 95265525 by Ben Gamari at 2025-11-10T19:40:08+05:30 rts: Dynamically initialize built-in closures To resolve #26166 we need to eliminate references to undefined symbols in the runtime system. One such source of these is the runtime's static references to `I#` and `C#` due the `stg_INTLIKE` and `stg_CHARLIKE` arrays. To avoid this we make these dynamic, initializing them during RTS start-up. (cherry picked from commit 39eaaaba5356e3fc9218d8e27375d6de24778cbc) - - - - - f687ce93 by Rodrigo Mesquita at 2025-11-10T19:40:08+05:30 Move code-gen aux symbols from ghc-internal to rts These symbols were all previously defined in ghc-internal and made the dependency structure awkward, where the rts may refer to some of these symbols and had to work around that circular dependency the way described in #26166. Moreover, the code generator will produce code that uses these symbols! Therefore, they should be available in the rts: PRINCIPLE: If the code generator may produce code which uses this symbol, then it should be defined in the rts rather than, say, ghc-internal. That said, the main motivation is towards fixing #26166. Towards #26166. Pre-requisite of !14892 (cherry picked from commit ba3e5bddb222008591edb6c3d433d93084170571) - - - - - ecc03b62 by Ben Gamari at 2025-11-10T21:34:47+05:30 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> Co-authored-by: Cheng Shao <terrorjack(a)type.dance> (cherry picked from commit f31de2a9c2405d6645998460e4b501f9279606b3) - - - - - 99291e88 by Ben Gamari at 2025-11-10T21:34:47+05:30 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. (cherry picked from commit 43fdfddc25c36ef4811941231d5755bad065796d) - - - - - d5d081e3 by Ben Gamari at 2025-11-10T21:34:47+05:30 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. (cherry picked from commit 4ed5138f7af532731f88380f98103487a9f15c5a) - - - - - ef442bd1 by Ben Gamari at 2025-11-10T21:34:47+05:30 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. (cherry picked from commit 9a0a076b80d6fb68d7722d2bb72c17c90ba22cd1) - - - - - c7de5d85 by Zubin Duggal at 2025-11-10T21:34:47+05:30 ci: update ci-images commit (the old ones were garbage collected) - - - - - 76 changed files: - .gitlab-ci.yml - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToC.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/Lexer/String.x - compiler/GHC/StgToByteCode.hs - compiler/GHC/Tc/Gen/Match.hs - hadrian/src/Settings/Packages.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - libraries/ghc-prim/ghc-prim.cabal - + rts/BuiltinClosures.c - + rts/BuiltinClosures.h - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Interpreter.c - rts/Prelude.h - rts/PrimOps.cmm - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.c - rts/StgMiscClosures.cmm - rts/StgStdThunks.cmm - rts/configure.ac - − rts/external-symbols.list.in - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - rts/include/rts/Constants.h - + rts/include/rts/RtsToHsIface.h - rts/include/rts/Types.h - rts/include/rts/prof/CCS.h - rts/include/rts/storage/Block.h - rts/include/stg/MiscClosures.h - rts/include/stg/Prim.h - rts/posix/Signals.c - libraries/ghc-prim/cbits/atomic.c → rts/prim/atomic.c - libraries/ghc-prim/cbits/bitrev.c → rts/prim/bitrev.c - libraries/ghc-prim/cbits/bswap.c → rts/prim/bswap.c - libraries/ghc-prim/cbits/clz.c → rts/prim/clz.c - libraries/ghc-prim/cbits/ctz.c → rts/prim/ctz.c - + rts/prim/int64x2minmax.c - libraries/ghc-prim/cbits/longlong.c → rts/prim/longlong.c - libraries/ghc-prim/cbits/mulIntMayOflo.c → rts/prim/mulIntMayOflo.c - libraries/ghc-prim/cbits/pdep.c → rts/prim/pdep.c - libraries/ghc-prim/cbits/pext.c → rts/prim/pext.c - libraries/ghc-prim/cbits/popcnt.c → rts/prim/popcnt.c - + rts/prim/vectorQuotRem.c - libraries/ghc-prim/cbits/word2float.c → rts/prim/word2float.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/sm/NonMoving.c - rts/sm/NonMovingMark.c - rts/sm/Scav.c - rts/wasm/JSFFI.c - rts/wasm/scheduler.cmm - rts/win32/libHSghc-internal.def - testsuite/tests/codeGen/should_run/T23146/all.T - + testsuite/tests/parser/should_run/T26415.hs - + testsuite/tests/parser/should_run/T26415.stdout - testsuite/tests/parser/should_run/all.T - + testsuite/tests/typecheck/should_compile/T25960.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T25004k.hs - + testsuite/tests/typecheck/should_fail/T25004k.stderr - testsuite/tests/typecheck/should_fail/all.T - utils/deriveConstants/Main.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e0050c9dd7a1c00098cdff641a925d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e0050c9dd7a1c00098cdff641a925d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T23162-part2
by Simon Peyton Jones (＠simonpj) 10 Nov '25

10 Nov '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/T23162-stage2
by Simon Peyton Jones (＠simonpj) 10 Nov '25

10 Nov '25

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

1 0

[Git][ghc/ghc][wip/spj-apporv-Oct24] make sure only expression wrapped around generated src span are ignored while...
by Apoorv Ingle (＠ani) 10 Nov '25

10 Nov '25

Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: 5a1495d4 by Apoorv Ingle at 2025-11-10T12:13:33-06:00 make sure only expression wrapped around generated src span are ignored while adding them to the error context stack - - - - - 2 changed files: - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Head.hs Changes: ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -955,14 +955,23 @@ addArgCtxt :: Int -> (HsExpr GhcRn, SrcSpan) -> LHsExpr GhcRn -- See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr -- See Note [Expanding HsDo with XXExprGhcRn] in GHC.Tc.Gen.Do addArgCtxt arg_no (app_head, app_head_lspan) (L arg_loc arg) thing_inside - | isGoodSrcSpan app_head_lspan - = do { traceTc "addArgCtxt" (vcat [text "goodSrcSpan", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg, ppr arg_no]) + | not (isGeneratedSrcSpan app_head_lspan) + = do { traceTc "addArgCtxt" (vcat [text "not generated Head" + , ppr app_head + , ppr app_head_lspan + , ppr arg_loc + , ppr arg + , ppr arg_no]) ; setSrcSpanA arg_loc $ addErrCtxt (FunAppCtxt (FunAppCtxtExpr app_head arg) arg_no) $ thing_inside } | otherwise - = do { traceTc "addArgCtxt" (vcat [text "generatedHead", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg]) + = do { traceTc "addArgCtxt" (vcat [text "generated Head" + , ppr app_head + , ppr app_head_lspan + , ppr arg_loc + , ppr arg]) ; addLExprCtxt (locA arg_loc) arg $ thing_inside } ===================================== compiler/GHC/Tc/Gen/Head.hs ===================================== @@ -1121,10 +1121,10 @@ add_expr_ctxt e thing_inside addLExprCtxt :: SrcSpan -> HsExpr GhcRn -> TcRn a -> TcRn a addLExprCtxt lspan e thing_inside - | isGoodSrcSpan lspan + | not (isGeneratedSrcSpan lspan) , (HsPar _ e') <- e = setSrcSpan lspan $ add_expr_ctxt (unLoc e') thing_inside - | isGoodSrcSpan lspan + | not (isGeneratedSrcSpan lspan) = setSrcSpan lspan $ add_expr_ctxt e thing_inside | otherwise = thing_inside View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1495d4ae1bd832e1e86796e6cb272… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1495d4ae1bd832e1e86796e6cb272… You're receiving this email because of your account on gitlab.haskell.org.

1 0