- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/21101] 12 commits: hadrian: fix HLS support
by Sasha Bogicevic (＠Bogicevic) 16 Jul '26

16 Jul '26

Sasha Bogicevic pushed to branch wip/21101 at Glasgow Haskell Compiler / GHC Commits: ed261a7e by Cheng Shao at 2026-07-14T17:59:38-04:00 hadrian: fix HLS support This patch fixes hadrian's HLS support so one can rely on HLS when working on the hadrian codebase. Fixes #27480. Not building/linking shared libraries for hadrian is a severely premature optimization; this top-level setting in `cabal.project` only affects home packages while the dependencies in the cabal store are built with vanilla/dynamic anyway, and even adding dynamic builds to home packages would not be costly due to cabal's usage of `-dynamic-too`. - - - - - eee8ec5b by Cheng Shao at 2026-07-14T18:00:20-04:00 compiler: fix miscompiled %load_relaxed, add missing %store_relaxed This patch fixes the %load_relaxed cmm primop compilation logic to correctly use relaxed memory ordering, and adds the missing %store_relaxed primop. Parsing logic of %load/%store with explicit ordering is covered in the AtomicFetch test case. Fixes #27483. Co-authored-by: Codex <codex(a)openai.com> - - - - - 1718230f by Alan Zimmerman at 2026-07-14T18:01:06-04:00 EPA: Keep binds and sigs together in HsValBindsLR We combine them into a single list for GhcPs, wrapped in the ValBind data type, which is the bind equivalent of ValD, having constructors for binds and sigs. This simplifies exact print processing, especially when using it to update the contents of local binds, as we no longer need AnnSortKey BindTag - - - - - 6bd1ad2a by Andreas Klebinger at 2026-07-14T18:01:49-04:00 Bump nofib submodule to account for MonoLocalBinds. New versions of GHC enable MonoLocalBinds by default. This breaks some of the benchmarks. I've fixed this and this bump pulls in that fix. - - - - - 7eb0f1c9 by Cheng Shao at 2026-07-14T18:02:31-04:00 testsuite: fix bytecodeIPE test under +ipe flavours This patch fixes the bytecodeIPE test under +ipe flavours. It used to fail under +ipe because the RTS is built with IPE info, then stg_AP_info in RTS carries IPE info, so whereFrom wouldn't return Nothing. Now the test checks IPE info of a datacon in the ghci-loaded module which is not affected by whether the RTS is built with IPE info or not. Fixes #27498. Co-authored-by: Codex <codex(a)openai.com> - - - - - ef038aae by cydparser at 2026-07-15T04:35:41-04:00 Reduce bytes allocated for `capabilities` in RTS (fixes #27487) In rts/Capability.c, `capabilities` is an array of pointers, but it was allocated as if it were an array of Capability's. - - - - - d377e83e by Cheng Shao at 2026-07-15T04:36:27-04:00 rts: fix missing UNTAG in stg_readTVarIOzh This patch fixes missing UNTAG on the current value closure read from StgTVar. UNTAG is a no-op when it's stg_TREC_HEADER_info which is word aligned; it may be a tagged closure, and reading info table from the tagged address is an unaligned load which may cause issues on platforms with strict alignment requirements. Co-authored-by: Codex <codex(a)openai.com> - - - - - 8ed03842 by Cheng Shao at 2026-07-15T04:36:27-04:00 rts: fix missing UNTAG in stg_control0zh_ll This patch fixes missing UNTAG on the cont closure returned by captureContinuationAndAbort. In case it's not NULL, captureContinuationAndAbort returns a tagged StgContinuation closure, in which case it must be untagged before accessing the apply_mask_frame field. In the past it worked out of luck: when apply_mask_frame was NULL then mask_frame_offset is also 0 so the control flow didn't diverge to a wrong path. Still, this is horribly wrong and will crash once StgContinuation struct is refactored and fields are shuffled around. Co-authored-by: Codex <codex(a)openai.com> - - - - - 5aa7000a by Cheng Shao at 2026-07-15T04:37:08-04:00 compiler: fix redundant AP thunk codegen when not using -ticky-ap-thunk This patch fixes a double negation confusion in !7525 that results in some redundant AP thunk code generation when not using -ticky-ap-thunk. Now, we use `stgToCmmUseStdApThunk` to indicate whether precomputed AP thunks in the RTS should be used, which defaults to `True`, unless `-ticky-ap-thunk` is passed. `-finfo-table-map` now also implies `-ticky-ap-thunk`, since when doing IPE profiling we want the generated AP thunks to be unique. Fixes #27502. ------------------------- Metric Decrease: T3064 ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - b21b63e8 by Sasha Bogicevic at 2026-07-15T18:33:56+02:00 21101 Error message text for invalid record wildcard match - - - - - f57c7159 by Sasha Bogicevic at 2026-07-15T18:33:56+02:00 Improve error message for record wildcards with fieldless constructors TcRnIllegalWildcardsInConstructor now stores a RecordFieldPart, so the message distinguishes record patterns from record constructions, and its suggested fixes are structured GhcHints (SuggestEmptyRecordBraces, SuggestExplicitConstructorArguments) that tools like HLS can turn into code actions. Storing HsRecFieldContext directly is not possible: GHC.Tc.Errors.Types is reachable from the parser via GHC.Types.Error.Codes, while GHC.Rename.Pat depends on the parser — so we reuse the existing RecordFieldPart mirror and toRecordFieldPart. Fixes #21101 - - - - - 18267348 by Sasha Bogicevic at 2026-07-15T18:33:56+02:00 Record wildcard hints: show them in more contexts, and include arity (#21101) Address review feedback on !8673: * Emit SuggestExplicitConstructorArguments for record patterns as well as record construction, so `f (C {..}) = ...` also suggests rewriting to positional form. SuggestEmptyRecordBraces remains pattern-only, since `C {}` as an expression would construct a value with all fields unset. * Store the constructor's visible arity in ConHasPositionalArgs so the hint can say how many arguments to write, e.g. Apply ‘D’ to its two arguments instead The arity is threaded from the parsed declaration through LConsWithFields: the per-constructor payload changes from Maybe [Located Int] to Either VisArity [Located Int], where Left n means the constructor has n unlabelled arguments. Updates test baselines: T21101, T9815, T9815b, T9815ghci, T9815bghci. - - - - - 54 changed files: - + changelog.d/fix-cmm-atomic-load-store - + changelog.d/fix-use-std-ap-thunk - compiler/GHC/Cmm/Parser.y - compiler/GHC/Driver/Config/StgToCmm.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/StgToCmm/Bind.hs - compiler/GHC/StgToCmm/Config.hs - compiler/GHC/Tc/Deriv.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/GREInfo.hs - compiler/GHC/Types/Hint.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Extension.hs - ghc/GHCi/UI.hs - hadrian/cabal.project - nofib - rts/Capability.c - rts/ContinuationOps.cmm - rts/PrimOps.cmm - testsuite/tests/cmm/should_run/AtomicFetch.hs - testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm - testsuite/tests/ghci/scripts/bytecodeIPE.hs - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/printer/Test20297.stdout - + testsuite/tests/rename/should_fail/T21101.hs - + testsuite/tests/rename/should_fail/T21101.stderr - testsuite/tests/rename/should_fail/T9815.stderr - testsuite/tests/rename/should_fail/T9815b.stderr - testsuite/tests/rename/should_fail/T9815bghci.stderr - testsuite/tests/rename/should_fail/T9815ghci.stderr - testsuite/tests/rename/should_fail/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6f1d6da89bde72a30c975f84383f90… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6f1d6da89bde72a30c975f84383f90… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/21101] Record wildcard hints: show them in more contexts, and include arity (#21101)
by Sasha Bogicevic (＠Bogicevic) 16 Jul '26

16 Jul '26

Sasha Bogicevic pushed to branch wip/21101 at Glasgow Haskell Compiler / GHC Commits: 6f1d6da8 by Sasha Bogicevic at 2026-07-15T18:24:05+02:00 Record wildcard hints: show them in more contexts, and include arity (#21101) Address review feedback on !8673: * Emit SuggestExplicitConstructorArguments for record patterns as well as record construction, so `f (C {..}) = ...` also suggests rewriting to positional form. SuggestEmptyRecordBraces remains pattern-only, since `C {}` as an expression would construct a value with all fields unset. * Store the constructor's visible arity in ConHasPositionalArgs so the hint can say how many arguments to write, e.g. Apply ‘D’ to its two arguments instead The arity is threaded from the parsed declaration through LConsWithFields: the per-constructor payload changes from Maybe [Located Int] to Either VisArity [Located Int], where Left n means the constructor has n unlabelled arguments. Updates test baselines: T21101, T9815, T9815b, T9815ghci, T9815bghci. - - - - - 14 changed files: - compiler/GHC/Hs/Utils.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Types/GREInfo.hs - compiler/GHC/Types/Hint.hs - compiler/GHC/Types/Hint/Ppr.hs - testsuite/tests/rename/should_fail/T21101.stderr - testsuite/tests/rename/should_fail/T9815.stderr - testsuite/tests/rename/should_fail/T9815b.stderr - testsuite/tests/rename/should_fail/T9815bghci.stderr - testsuite/tests/rename/should_fail/T9815ghci.stderr Changes: ===================================== compiler/GHC/Hs/Utils.hs ===================================== @@ -1589,8 +1589,8 @@ hsConDeclsBinders in the following format: with its record fields, in the form of a list of Int indices into... - IntMap FieldOcc, an IntMap of record fields. -(In actual fact, we use [(ConRdrName, Maybe [Located Int])], with Nothing indicating -that the constructor has unlabelled fields: see Note [Local constructor info in the renamer] +(In actual fact, we use [(ConRdrName, Either VisArity [Located Int])], with Left n indicating +that the constructor has n unlabelled arguments: see Note [Local constructor info in the renamer] in GHC.Types.GREInfo.) This allows us to do the following (see GHC.Rename.Names.getLocalNonValBinders.new_tc): @@ -1611,7 +1611,7 @@ Other relevant test cases: rnfail015. -- See Note [Collecting record fields in data declarations]. data LConsWithFields p = LConsWithFields - { consWithFieldIndices :: [(LocatedA (IdP (GhcPass p)), Maybe [Located Int])] + { consWithFieldIndices :: [(LocatedA (IdP (GhcPass p)), Either VisArity [Located Int])] , consFields :: IntMap (LFieldOcc (GhcPass p)) } @@ -1651,16 +1651,15 @@ hsConDeclsBinders cons = go emptyFieldIndices cons LConsWithFields ns fs = go seen' rs get_flds_h98 :: FieldIndices p -> HsConDeclH98Details (GhcPass p) - -> (Maybe [Located Int], FieldIndices p) - get_flds_h98 seen (RecCon _ flds) = first Just $ get_flds seen flds - get_flds_h98 seen (PrefixCon _ []) = (Just [], seen) - get_flds_h98 seen _ = (Nothing, seen) + -> (Either VisArity [Located Int], FieldIndices p) + get_flds_h98 seen (RecCon _ flds) = first Right $ get_flds seen flds + get_flds_h98 seen (PrefixCon _ args) = (Left (length args), seen) + get_flds_h98 seen (InfixCon {}) = (Left 2, seen) get_flds_gadt :: FieldIndices p -> HsConDeclGADTDetails (GhcPass p) - -> (Maybe [Located Int], FieldIndices p) - get_flds_gadt seen (RecConGADT _ flds) = first Just $ get_flds seen flds - get_flds_gadt seen (PrefixConGADT _ []) = (Just [], seen) - get_flds_gadt seen _ = (Nothing, seen) + -> (Either VisArity [Located Int], FieldIndices p) + get_flds_gadt seen (RecConGADT _ flds) = first Right $ get_flds seen flds + get_flds_gadt seen (PrefixConGADT _ args) = (Left (length args), seen) get_flds :: FieldIndices p -> LocatedA [LHsConDeclRecField (GhcPass p)] -> ([Located Int], FieldIndices p) ===================================== compiler/GHC/Rename/Env.hs ===================================== @@ -423,7 +423,10 @@ lookupConstructorInfo qcon@(WithUserRdr _ con_name) = do { info <- lookupGREInfo_GRE con_name ; case info of IAmConLike con_info -> return con_info - UnboundGRE -> return $ ConInfo (ConIsData []) ConHasPositionalArgs + UnboundGRE -> return $ ConInfo (ConIsData []) (ConHasPositionalArgs 0) + -- The arity is a dummy: an unbound constructor never reaches the + -- code that consults it (see the isUnboundName guard in + -- GHC.Rename.Pat.rn_dotdot). IAmTyCon {} -> failIllegalTyCon WL_ConLike qcon _ -> pprPanic "lookupConstructorInfo: not a ConLike" $ vcat [ text "name:" <+> ppr con_name ] ===================================== compiler/GHC/Rename/Names.hs ===================================== @@ -71,7 +71,7 @@ import GHC.Types.FieldLabel import GHC.Types.Hint import GHC.Types.SourceFile import GHC.Types.SrcLoc as SrcLoc -import GHC.Types.Basic ( TyConFlavour (..), convImportLevel ) +import GHC.Types.Basic (TyConFlavour (..), convImportLevel, VisArity) import GHC.Types.Id import GHC.Types.PkgQual import GHC.Types.GREInfo (ConInfo(..), ConFieldInfo (..), ConLikeInfo (ConIsData)) @@ -875,15 +875,16 @@ getLocalNonValBinders fixity_env -- -- The information we needed was all set up for us: -- see Note [Collecting record fields in data declarations] in GHC.Hs.Utils. - mk_fld_env :: [(Name, Maybe [Located Int])] -> IntMap FieldLabel + mk_fld_env :: [(Name, Either VisArity [Located Int])] -> IntMap FieldLabel -> [(ConLikeName, ConInfo)] mk_fld_env names flds = [ (DataConName con, ConInfo (ConIsData (map fst names)) fld_info) - | (con, mb_fl_indxs) <- names - , let fld_info = case fmap (map ((flds IntMap.!) . unLoc)) mb_fl_indxs of - Nothing -> ConHasPositionalArgs - Just [] -> ConIsNullary - Just (fld:flds) -> ConHasRecordFields $ fld NE.:| flds ] + | (con, con_fl_indxs) <- names + , let fld_info = case fmap (map ((flds IntMap.!) . unLoc)) con_fl_indxs of + Left 0 -> ConIsNullary + Left arity -> ConHasPositionalArgs arity + Right [] -> ConIsNullary + Right (fld:flds) -> ConHasRecordFields $ fld NE.:| flds ] new_assoc :: DuplicateRecordFields -> FieldSelectors -> LInstDecl GhcPs -> RnM [GlobalRdrElt] @@ -939,10 +940,10 @@ getLocalNonValBinders fixity_env -- Add errors if a constructor has a duplicate record field. add_dup_fld_errs :: IntMap FieldLabel - -> (Name, Maybe [Located Int]) + -> (Name, Either VisArity [Located Int]) -> IOEnv (Env TcGblEnv TcLclEnv) () - add_dup_fld_errs all_flds (con, mb_con_flds) - | Just con_flds <- mb_con_flds + add_dup_fld_errs all_flds (con, con_flds_or_arity) + | Right con_flds <- con_flds_or_arity , let (_, dups) = removeDups (comparing unLoc) con_flds = for_ dups $ \ dup_flds -> -- Report the error at the location of the second occurrence ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -874,7 +874,11 @@ rnHsRecFields ctxt mk_arg (HsRecFields { rec_flds = flds, rec_dotdot = dotdot }) ; checkErr dd_flag (needFlagDotDot ctxt) ; (rdr_env, lcl_env) <- getRdrEnvs ; conInfo <- lookupConstructorInfo qcon - ; when (conFieldInfo conInfo == ConHasPositionalArgs) (addErr (TcRnIllegalWildcardsInConstructor (toRecordFieldPart ctxt) con)) + + ; case conFieldInfo conInfo of + ConHasPositionalArgs nbArgs -> + addErr $ TcRnIllegalWildcardsInConstructor (toRecordFieldPart ctxt) con nbArgs + _ -> return () ; let present_flds = mkOccSet $ map rdrNameOcc (getFieldRdrs flds) -- For constructor uses (but not patterns) ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -357,7 +357,7 @@ instance Diagnostic TcRnMessage where -> mkSimpleDecorated $ vcat [text "Illegal view pattern: " <+> ppr pat] TcRnCharLiteralOutOfRange c -> mkSimpleDecorated $ text "character literal out of range: '\\" <> char c <> char '\'' - TcRnIllegalWildcardsInConstructor ctx con + TcRnIllegalWildcardsInConstructor ctx con _ -> mkSimpleDecorated $ text "The data constructor" <+> quotes (ppr con) <+> text "does not have named record fields, so the record" @@ -2791,10 +2791,12 @@ instance Diagnostic TcRnMessage where -> [suggestExtension LangExt.ViewPatterns] TcRnCharLiteralOutOfRange{} -> noHints - TcRnIllegalWildcardsInConstructor ctx con + TcRnIllegalWildcardsInConstructor ctx con arity -> case ctx of - RecordFieldPattern{} -> [SuggestEmptyRecordBraces con] - _ -> [SuggestExplicitConstructorArguments con] + RecordFieldPattern{} -> [ SuggestEmptyRecordBraces con + , SuggestExplicitConstructorArguments con arity + ] + _ -> [SuggestExplicitConstructorArguments con arity] TcRnIgnoringAnnotations{} -> noHints TcRnAnnotationInSafeHaskell ===================================== compiler/GHC/Tc/Errors/Types.hs ===================================== @@ -824,6 +824,8 @@ data TcRnMessage where worded accordingly. Constructors with no fields at all do not trigger this error: since GHC proposal 496 ("Nullary record wildcards"), @C {..}@ is legal for nullary constructors. + The 'VisArity' field records the constructor's number of positional arguments + which the suggested fix mentions. Example(s): @@ -842,7 +844,7 @@ data TcRnMessage where rename/should_fail/T9815bghci.hs rename/should_fail/T21101.hs -} - TcRnIllegalWildcardsInConstructor :: !RecordFieldPart -> !Name -> TcRnMessage + TcRnIllegalWildcardsInConstructor :: !RecordFieldPart -> !Name -> !VisArity -> TcRnMessage {-| TcRnIgnoringAnnotations is a warning that occurs when the source code contains annotation pragmas but the platform in use does not support an ===================================== compiler/GHC/Types/GREInfo.hs ===================================== @@ -244,14 +244,14 @@ instance NFData ConLikeInfo where -- See Note [Local constructor info in the renamer] data ConFieldInfo = ConHasRecordFields (NonEmpty FieldLabel) - | ConHasPositionalArgs + | ConHasPositionalArgs !VisArity | ConIsNullary deriving stock Eq deriving Data instance NFData ConFieldInfo where rnf ConIsNullary = () - rnf ConHasPositionalArgs = () + rnf (ConHasPositionalArgs arity) = rnf arity rnf (ConHasRecordFields flds) = rnf flds mkConInfo :: ConLikeInfo -> VisArity -> [FieldLabel] -> ConInfo @@ -259,9 +259,9 @@ mkConInfo con_ty n flds = ConInfo { conLikeInfo = con_ty , conFieldInfo = mkConFieldInfo n flds } -mkConFieldInfo :: Arity -> [FieldLabel] -> ConFieldInfo +mkConFieldInfo :: VisArity -> [FieldLabel] -> ConFieldInfo mkConFieldInfo 0 _ = ConIsNullary -mkConFieldInfo _ fields = maybe ConHasPositionalArgs ConHasRecordFields +mkConFieldInfo arity fields = maybe (ConHasPositionalArgs arity) ConHasRecordFields $ NonEmpty.nonEmpty fields conInfoFields :: ConInfo -> [FieldLabel] @@ -269,7 +269,7 @@ conInfoFields = conFieldInfoFields . conFieldInfo conFieldInfoFields :: ConFieldInfo -> [FieldLabel] conFieldInfoFields (ConHasRecordFields fields) = NonEmpty.toList fields -conFieldInfoFields ConHasPositionalArgs = [] +conFieldInfoFields (ConHasPositionalArgs _) = [] conFieldInfoFields ConIsNullary = [] instance Outputable ConInfo where @@ -284,7 +284,7 @@ instance Outputable ConLikeInfo where instance Outputable ConFieldInfo where ppr ConIsNullary = text "ConIsNullary" - ppr ConHasPositionalArgs = text "ConHasPositionalArgs" + ppr (ConHasPositionalArgs arity) = text "ConHasPositionalArgs" <+> braces (ppr arity) ppr (ConHasRecordFields fieldLabels) = text "ConHasRecordFields" <+> braces (ppr fieldLabels) ===================================== compiler/GHC/Types/Hint.hs ===================================== @@ -45,7 +45,7 @@ import GHC.Types.InlinePragma (ActivationGhc) import GHC.Types.Name (Name, NameSpace, OccName (occNameFS), isSymOcc, nameOccName) import GHC.Types.Name.Reader (RdrName (Unqual), ImpDeclSpec, GlobalRdrElt) import GHC.Types.SrcLoc (SrcSpan) -import GHC.Types.Basic (RuleName) +import GHC.Types.Basic (RuleName, VisArity) import GHC.Parser.Errors.Basic import GHC.Utils.Outputable import GHC.Data.FastString (fsLit) @@ -560,9 +560,10 @@ data GhcHint of record syntax, for constructors without labelled fields. Triggered by 'GHC.Tc.Errors.Types.TcRnIllegalWildcardsInConstructor' - in a record construction. + in a record construction and record patterns. + The 'VisArity' is the number of positional arguments of the constructor. -} - | SuggestExplicitConstructorArguments !Name + | SuggestExplicitConstructorArguments !Name !VisArity -- | What the user should upgrade to resolve an @-jsem@ semaphore -- protocol version mismatch. ===================================== compiler/GHC/Types/Hint/Ppr.hs ===================================== @@ -348,8 +348,9 @@ instance Outputable GhcHint where SuggestEmptyRecordBraces con -> text "Use" <+> quotes (ppr con <> text "{}") <+> text "instead," <+> text "which matches" <+> quotes (ppr con) <+> text "regardless of its fields" - SuggestExplicitConstructorArguments con - -> text "Apply" <+> quotes (ppr con) <+> text "to its arguments instead" + SuggestExplicitConstructorArguments con nbArgs + -> text "Apply" <+> quotes (ppr con) <+> text "to its" + <+> speakNOf nbArgs (text "argument") <+> text "instead" perhapsAsPat :: SDoc perhapsAsPat = text "Perhaps you meant an as-pattern, which must not be surrounded by whitespace" ===================================== testsuite/tests/rename/should_fail/T21101.stderr ===================================== @@ -1,5 +1,6 @@ T21101.hs:7:3: error: [GHC-47217] The data constructor ‘D’ does not have named record fields, so the record pattern ‘D{..}’ is invalid. - Suggested fix: - Use ‘D{}’ instead, which matches ‘D’ regardless of its fields + Suggested fixes: + • Use ‘D{}’ instead, which matches ‘D’ regardless of its fields + • Apply ‘D’ to its two arguments instead ===================================== testsuite/tests/rename/should_fail/T9815.stderr ===================================== @@ -1,4 +1,4 @@ T9815.hs:6:13: error: [GHC-47217] The data constructor ‘N’ does not have named record fields, so the record construction ‘N{..}’ is invalid. - Suggested fix: Apply ‘N’ to its arguments instead + Suggested fix: Apply ‘N’ to its one argument instead ===================================== testsuite/tests/rename/should_fail/T9815b.stderr ===================================== @@ -1,4 +1,4 @@ T9815.hs:6:13: error: [GHC-47217] The data constructor ‘N’ does not have named record fields, so the record construction ‘N{..}’ is invalid. - Suggested fix: Apply ‘N’ to its arguments instead + Suggested fix: Apply ‘N’ to its one argument instead ===================================== testsuite/tests/rename/should_fail/T9815bghci.stderr ===================================== @@ -1,4 +1,4 @@ <interactive>:5:7: error: [GHC-47217] The data constructor ‘Arg’ does not have named record fields, so the record construction ‘Arg{..}’ is invalid. - Suggested fix: Apply ‘Arg’ to its arguments instead + Suggested fix: Apply ‘Arg’ to its two arguments instead ===================================== testsuite/tests/rename/should_fail/T9815ghci.stderr ===================================== @@ -1,4 +1,5 @@ <interactive>:3:7: error: [GHC-47217] The data constructor ‘Data.Semigroup.Arg’ does not have named record fields, so the record construction ‘Data.Semigroup.Arg{..}’ is invalid. - Suggested fix: Apply ‘Data.Semigroup.Arg’ to its arguments instead + Suggested fix: + Apply ‘Data.Semigroup.Arg’ to its two arguments instead View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6f1d6da89bde72a30c975f84383f908… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6f1d6da89bde72a30c975f84383f908… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/romes/27461-zb
by Rodrigo Mesquita (＠alt-romes) 16 Jul '26

16 Jul '26

Rodrigo Mesquita pushed new branch wip/romes/27461-zb at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/romes/27461-zb You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/fix-hadrian-hls
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao deleted branch wip/fix-hadrian-hls at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/fix-ipe-bytecodeIPE-test
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao deleted branch wip/fix-ipe-bytecodeIPE-test at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/fix-cmm-atomic-load-store
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao deleted branch wip/fix-cmm-atomic-load-store at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/rts-fix-missing-untag
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao deleted branch wip/rts-fix-missing-untag at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Deleted branch wip/fix-use-std-ap-thunk
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao deleted branch wip/fix-use-std-ap-thunk at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] fix wasm
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 1a86d8c2 by Cheng Shao at 2026-07-15T15:14:32+00:00 fix wasm - - - - - 7 changed files: - libraries/base/src/GHC/Essentials.hs - libraries/base/src/System/CPUTime/Posix/Times.hsc - libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Conc.hs - libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Conc/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Exports.hs - libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Imports.hs - libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Types.hs Changes: ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -353,7 +353,13 @@ import GHC.Internal.Ptr import GHC.Internal.Foreign.C.ConstPtr #if defined(javascript_HOST_ARCH) import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##, JSVal) +#elif defined(wasm32_HOST_ARCH) +import GHC.Internal.Wasm.Prim (JSVal) #else +data JSVal +#endif + +#if !defined(javascript_HOST_ARCH) {- Note [JS primitives known-keys for non-js target] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -373,7 +379,6 @@ be used unless compiling to JS) and toggle -fdefines-known-key-names for these s -} -- See Note [JS primitives known-keys for non-js target] -data JSVal unsafeUnpackJSStringUtf8## :: a unsafeUnpackJSStringUtf8## = error "unsafeUnpackJSStringUtf8## known-key was used when the compilation target wasn't javascript_HOST_ARCH" #endif ===================================== libraries/base/src/System/CPUTime/Posix/Times.hsc ===================================== @@ -14,6 +14,10 @@ import Data.Ratio import GHC.Internal.Foreign.C.Types import System.CPUTime.Utils +#if !HAVE_TIMES +import GHC.Essentials +#endif + -- for struct tms #if HAVE_SYS_TIMES_H #include <sys/times.h> ===================================== libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Conc.hs ===================================== @@ -7,7 +7,6 @@ module GHC.Internal.Wasm.Prim.Conc ( import GHC.Internal.Base import GHC.Internal.IO.Unsafe import GHC.Internal.Stable -import GHC.Internal.Types (Int, IO) {- ===================================== libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Conc/Internal.hs ===================================== @@ -6,7 +6,6 @@ module GHC.Internal.Wasm.Prim.Conc.Internal ( import GHC.Internal.Base import GHC.Internal.IO -import GHC.Internal.Types -- See W6 of Note [Tracking dependencies on primitives] in GHC.Internal.Base import GHC.Internal.Wasm.Prim.Imports () ===================================== libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Exports.hs ===================================== @@ -30,7 +30,7 @@ module GHC.Internal.Wasm.Prim.Exports ( js_promiseReject ) where -import GHC.Internal.Base (join, pure, ($), (*>), (=<<)) +import GHC.Internal.Base import GHC.Internal.Exception.Type import GHC.Internal.IO import GHC.Internal.IORef @@ -40,7 +40,6 @@ import GHC.Internal.Prim ( ) import GHC.Internal.Stable import GHC.Internal.TopHandler (flushStdHandles) -import GHC.Internal.Types (Any, Bool, Char, Double, Float) import GHC.Internal.Wasm.Prim.Types import GHC.Internal.Word import GHC.Internal.Unsafe.Coerce ( unsafeCoerce# ) ===================================== libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Imports.hs ===================================== @@ -35,7 +35,6 @@ import GHC.Internal.Stable import GHC.Internal.Prim ( RealWorld, State#, makeStablePtr#, newMVar#, readMVar#, ) -import GHC.Internal.Types (Any, IO(..)) import GHC.Internal.Wasm.Prim.Types import GHC.Internal.Unsafe.Coerce ( unsafeCoerce# ) import qualified GHC.Internal.Stack.Types as Rebindable ===================================== libraries/ghc-internal/src/GHC/Internal/Wasm/Prim/Types.hs ===================================== @@ -5,6 +5,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE UnliftedFFITypes #-} {-# LANGUAGE UnliftedNewtypes #-} +{-# OPTIONS_GHC -fdefines-known-key-names #-} module GHC.Internal.Wasm.Prim.Types ( JSVal# (..), @@ -20,13 +21,11 @@ module GHC.Internal.Wasm.Prim.Types ( import qualified GHC.Internal.Data.Typeable.Internal as Rebindable import GHC.Internal.Base -import GHC.Internal.Classes (Ord(..)) import GHC.Internal.Exception.Type import GHC.Internal.Foreign.C.String.Encoding import GHC.Internal.ForeignPtr import GHC.Internal.Prim (Int#, RealWorld, State#, mkWeak#, mkWeakNoFinalizer#) import GHC.Internal.Ptr -import GHC.Internal.Types (Any, Int, UnliftedType) import GHC.Internal.IO import GHC.Internal.IO.Encoding import GHC.Internal.Maybe (Maybe(..)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1a86d8c20fe1664f97d3b3bbf49b854… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1a86d8c20fe1664f97d3b3bbf49b854… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] fix js
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: faa211b9 by Cheng Shao at 2026-07-15T15:13:03+00:00 fix js - - - - - 2 changed files: - testsuite/tests/cabal/T27013a/all.T - testsuite/tests/javascript/Makefile Changes: ===================================== testsuite/tests/cabal/T27013a/all.T ===================================== @@ -1,4 +1,5 @@ test('T27013a', - [extra_files(['src/', 'composition.cabal', 'Setup.hs'])], + [extra_files(['src/', 'composition.cabal', 'Setup.hs']), + js_broken(22349)], makefile_test, []) ===================================== testsuite/tests/javascript/Makefile ===================================== @@ -30,4 +30,4 @@ T24744: grep -c "h\$$r1 = \"test_val_80_local_once" T24744.dump-js # check that the optimization occurred grep -c "h\$$r1 = h\$$decodeUtf8z" T24744.dump-js - grep -c "h\$$stc(h\$$mainZCMainzitestzuvalzu80zulocal,h\$$mainZCMainzitestzuvalzu80zulocal_e,\[h\$$ghczminternalZCGHCziInternalziCStringziunpackCStringzh,h\$$mainZCMainzimain7_1,h\$$mainZCMainzimain7_2\])" T24744.jsexe/out.js + grep -c "h\$$stc(h\$$mainZCMainzitestzuvalzu80zulocal,h\$$mainZCMainzitestzuvalzu80zulocal_e,\[h\$$ghczminternalZCGHCziInternalziTypesziunpackCStringzh,h\$$mainZCMainzimain7_1,h\$$mainZCMainzimain7_2\])" T24744.jsexe/out.js View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faa211b986d576a2b18f50d0c3a0ed0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faa211b986d576a2b18f50d0c3a0ed0… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0