- ghc-commits - Haskell.org

[Git][ghc/ghc][master] Fix Data.List unqualified import warning
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 020e7587 by Sylvain Henry at 2025-08-13T21:09:00-04:00 Fix Data.List unqualified import warning - - - - - 1 changed file: - compiler/GHC/Runtime/Debugger/Breakpoints.hs Changes: ===================================== compiler/GHC/Runtime/Debugger/Breakpoints.hs ===================================== @@ -11,7 +11,7 @@ import Control.Monad.Catch import Control.Monad import Data.Array import Data.Function -import Data.List +import qualified Data.List as List import Data.Maybe import qualified Data.List.NonEmpty as NE import qualified Data.Semigroup as S @@ -51,16 +51,16 @@ findBreakByLine :: Int {-^ Line number -} -> TickArray -> Maybe (BreakTickIndex, findBreakByLine line arr | not (inRange (bounds arr) line) = Nothing | otherwise = - listToMaybe (sortBy (leftmostLargestRealSrcSpan `on` snd) comp) `mplus` - listToMaybe (sortBy (compare `on` snd) incomp) `mplus` - listToMaybe (sortBy (flip compare `on` snd) ticks) + listToMaybe (List.sortBy (leftmostLargestRealSrcSpan `on` snd) comp) `mplus` + listToMaybe (List.sortBy (compare `on` snd) incomp) `mplus` + listToMaybe (List.sortBy (flip compare `on` snd) ticks) where ticks = arr ! line starts_here = [ (ix,pan) | (ix, pan) <- ticks, srcSpanStartLine pan == line ] - (comp, incomp) = partition ends_here starts_here + (comp, incomp) = List.partition ends_here starts_here where ends_here (_,pan) = srcSpanEndLine pan == line -- | Find a breakpoint in the 'TickArray' of a module, given a line number and a column coordinate. @@ -68,8 +68,8 @@ findBreakByCoord :: (Int, Int) -> TickArray -> Maybe (BreakTickIndex, RealSrcSpa findBreakByCoord (line, col) arr | not (inRange (bounds arr) line) = Nothing | otherwise = - listToMaybe (sortBy (flip compare `on` snd) contains ++ - sortBy (compare `on` snd) after_here) + listToMaybe (List.sortBy (flip compare `on` snd) contains ++ + List.sortBy (compare `on` snd) after_here) where ticks = arr ! line @@ -88,7 +88,7 @@ enclosingTickSpan :: TickArray -> SrcSpan -> RealSrcSpan enclosingTickSpan _ (UnhelpfulSpan _) = panic "enclosingTickSpan UnhelpfulSpan" enclosingTickSpan ticks (RealSrcSpan src _) = assert (inRange (bounds ticks) line) $ - Data.List.minimumBy leftmostLargestRealSrcSpan $ enclosing_spans + List.minimumBy leftmostLargestRealSrcSpan $ enclosing_spans where line = srcSpanStartLine src enclosing_spans = [ pan | (_,pan) <- ticks ! line @@ -144,7 +144,7 @@ resolveFunctionBreakpoint inp = do lookupModuleInGraph mod_str = do graph <- getModuleGraph let hmods = ms_mod <$> mgModSummaries graph - pure $ find ((== mod_str) . moduleNameString . moduleName) hmods + pure $ List.find ((== mod_str) . moduleNameString . moduleName) hmods -- Check validity of an identifier to set a breakpoint: -- 1. The module of the identifier must exist @@ -165,7 +165,7 @@ resolveFunctionBreakpoint inp = do mb_modbreaks <- getModBreak modl let found = case mb_modbreaks of Nothing -> False - Just mb -> fun_str `elem` (intercalate "." <$> elems (modBreaks_decls mb)) + Just mb -> fun_str `elem` (List.intercalate "." <$> elems (modBreaks_decls mb)) if found then pure Nothing else pure $ Just $ text "No breakpoint found for" <+> quotes (text fun_str) @@ -182,7 +182,7 @@ findBreakForBind str_name modbreaks = filter (not . enclosed) ticks where ticks = [ (index, span) | (index, decls) <- assocs (modBreaks_decls modbreaks), - str_name == intercalate "." decls, + str_name == List.intercalate "." decls, RealSrcSpan span _ <- [modBreaks_locs modbreaks ! index] ] enclosed (_,sp0) = any subspan ticks where subspan (_,sp) = sp /= sp0 && View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/020e7587adb0215082f1eceb75bdfdf… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/020e7587adb0215082f1eceb75bdfdf… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Allow defining HasField instances for naughty fields
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 1107af89 by Oleg Grenrus at 2025-08-13T21:08:06-04:00 Allow defining HasField instances for naughty fields Resolves #26295 ... as HasField solver doesn't solve for fields with "naughty" selectors, we could as well allow defining HasField instances for these fields. - - - - - 4 changed files: - compiler/GHC/Tc/Validity.hs - + testsuite/tests/overloadedrecflds/should_run/T26295.hs - + testsuite/tests/overloadedrecflds/should_run/T26295.stdout - testsuite/tests/overloadedrecflds/should_run/all.T Changes: ===================================== compiler/GHC/Tc/Validity.hs ===================================== @@ -31,6 +31,7 @@ import GHC.Tc.Instance.Family import GHC.Tc.Types.Origin import GHC.Tc.Types.Rank import GHC.Tc.Errors.Types +import GHC.Tc.Utils.Env (tcLookupId) import GHC.Tc.Utils.TcType import GHC.Tc.Utils.Monad import GHC.Tc.Zonk.TcType @@ -60,6 +61,8 @@ import qualified GHC.LanguageExtensions as LangExt import GHC.Types.Error import GHC.Types.Basic ( TypeOrKind(..), UnboxedTupleOrSum(..) , unboxedTupleOrSumExtension ) +import GHC.Types.Id (isNaughtyRecordSelector) +import GHC.Types.FieldLabel (flSelector) import GHC.Types.Name import GHC.Types.Var.Env import GHC.Types.Var.Set @@ -1718,8 +1721,17 @@ checkHasFieldInst cls tys@[_k_ty, _r_rep, _a_rep, lbl_ty, r_ty, _a_ty] = | otherwise -> case isStrLitTy lbl_ty of Just lbl | let lbl_str = FieldLabelString lbl - , isJust (lookupTyConFieldLabel lbl_str tc) - -> add_err $ IllegalHasFieldInstanceTyConHasField tc lbl_str + , Just fl <- lookupTyConFieldLabel lbl_str tc + -> do + -- GHC does not provide HasField instances for naughty record selectors + -- (see Note [Naughty record selectors] in GHC.Tc.TyCl.Utils), + -- so don't prevent the user from writing such instances. + -- See GHC.Tc.Instance.Class.matchHasField. + -- Test case: T26295. + sel_id <- tcLookupId $ flSelector fl + if isNaughtyRecordSelector sel_id + then return () + else add_err $ IllegalHasFieldInstanceTyConHasField tc lbl_str | otherwise -> return () Nothing ===================================== testsuite/tests/overloadedrecflds/should_run/T26295.hs ===================================== @@ -0,0 +1,26 @@ +{-# LANGUAGE GHC2021 #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE OverloadedRecordDot #-} +{-# LANGUAGE UndecidableInstances #-} +import GHC.Records + +-- large-records mangles record definitions to look like below to +-- prevent selector function generation (even implicit ones) +data R = forall a b. (a ~ Int, b ~ Char) => MkR + { field_a :: a + , field_b :: b + } + +-- fields in R are naughty, so we can define custom HasField instancs for them +instance a ~ Int => HasField "field_a" R a where + getField (MkR a _) = a + +ex :: Int +ex = r.field_a + where + r :: R + r = MkR 42 'x' + +main :: IO () +main = print ex ===================================== testsuite/tests/overloadedrecflds/should_run/T26295.stdout ===================================== @@ -0,0 +1 @@ +42 ===================================== testsuite/tests/overloadedrecflds/should_run/all.T ===================================== @@ -20,3 +20,4 @@ test('T12243', normal, compile_and_run, ['']) test('T11228', normal, compile_and_run, ['']) test('T11671_run', normal, compile_and_run, ['']) test('T17551b', [req_th], compile_and_run, ['']) +test('T26295', [], compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1107af899a1222f0d6101dacddca7e6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1107af899a1222f0d6101dacddca7e6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: rts: ensure MessageBlackHole.link is always a valid closure
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a8b2fbae by Teo Camarasu at 2025-08-13T21:07:24-04:00 rts: ensure MessageBlackHole.link is always a valid closure We turn a MessageBlackHole into an StgInd in wakeBlockingQueue(). Therefore it's important that the link field, which becomes the indirection field, always points to a valid closure. It's unclear whether it's currently possible for the previous behaviour to lead to a crash, but it's good to be consistent about this invariant nonetheless. Co-authored-by: Andreas Klebinger <klebinger.andreas(a)gmx.at> - - - - - 4021181e by Teo Camarasu at 2025-08-13T21:07:24-04:00 rts: spin if we see a WHITEHOLE in messageBlackHole When a BLACKHOLE gets cancelled in raiseAsync, we indirect to a THUNK. GC can then shortcut this, replacing our BLACKHOLE with a fresh THUNK. This THUNK is not guaranteed to have a valid indirectee field. If at the same time, a message intended for the previous BLACKHOLE is processed and concurrently we BLACKHOLE the THUNK, thus temporarily turning it into a WHITEHOLE, we can get a segfault, since we look at the undefined indirectee field of the THUNK The fix is simple: spin if we see a WHITEHOLE, and it will soon be replaced with a valid BLACKHOLE. Resolves #26205 - - - - - 3 changed files: - rts/Messages.c - rts/StgMiscClosures.cmm - rts/Updates.h Changes: ===================================== rts/Messages.c ===================================== @@ -180,13 +180,22 @@ uint32_t messageBlackHole(Capability *cap, MessageBlackHole *msg) bh_info != &stg_CAF_BLACKHOLE_info && bh_info != &__stg_EAGER_BLACKHOLE_info && bh_info != &stg_WHITEHOLE_info) { - // if it is a WHITEHOLE, then a thread is in the process of - // trying to BLACKHOLE it. But we know that it was once a - // BLACKHOLE, so there is at least a valid pointer in the - // payload, so we can carry on. return 0; } + // If we see a WHITEHOLE then we should wait for it to turn into a BLACKHOLE. + // Otherwise we might look at the indirectee and segfault. + // See "Exception handling" in Note [Thunks, blackholes, and indirections] + // We might be looking at a *fresh* THUNK being WHITEHOLE-d so we can't + // guarantee that the indirectee is a valid pointer. +#if defined(THREADED_RTS) + if (bh_info == &stg_WHITEHOLE_info) { + while(ACQUIRE_LOAD(&bh->header.info) == &stg_WHITEHOLE_info) { + busy_wait_nop(); + } + } +#endif + // The blackhole must indirect to a TSO, a BLOCKING_QUEUE, an IND, // or a value. StgClosure *p; ===================================== rts/StgMiscClosures.cmm ===================================== @@ -31,6 +31,7 @@ import CLOSURE ENT_VIA_NODE_ctr; import CLOSURE RtsFlags; import CLOSURE stg_BLOCKING_QUEUE_CLEAN_info; import CLOSURE stg_BLOCKING_QUEUE_DIRTY_info; +import CLOSURE stg_END_TSO_QUEUE_closure; import CLOSURE stg_IND_info; import CLOSURE stg_MSG_BLACKHOLE_info; import CLOSURE stg_TSO_info; @@ -588,6 +589,9 @@ retry: MessageBlackHole_tso(msg) = CurrentTSO; MessageBlackHole_bh(msg) = node; + // Ensure that the link field is a valid closure, + // since we might turn this into an indirection in wakeBlockingQueue() + MessageBlackHole_link(msg) = stg_END_TSO_QUEUE_closure; SET_HDR(msg, stg_MSG_BLACKHOLE_info, CCS_SYSTEM); // messageBlackHole has appropriate memory barriers when this object is exposed. // See Note [Heap memory barriers]. ===================================== rts/Updates.h ===================================== @@ -333,6 +333,10 @@ * `AP_STACK` closure recording the aborted execution state. * See `RaiseAsync.c:raiseAsync` for details. * + * This can combine with indirection shortcutting during GC to replace a BLACKHOLE + * with a fresh THUNK. We should be very careful here since the THUNK will have an + * undefined value in the indirectee field. Looking at the indirectee field can then + * lead to a segfault such as #26205. * * CAFs * ---- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dfe6f464839e5dfae143b6d4ba1478… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dfe6f464839e5dfae143b6d4ba1478… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Refactoring: Don't misuse `MCDiagnostic` for lint messages
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: dfe6f464 by Simon Hengel at 2025-08-13T21:06:43-04:00 Refactoring: Don't misuse `MCDiagnostic` for lint messages `MCDiagnostic` is meant to be used for compiler diagnostics. Any code that creates `MCDiagnostic` directly, without going through `GHC.Driver.Errors.printMessage`, side steps `-fdiagnostics-as-json` (see e.g. !14475, !14492 !14548). To avoid this in the future I want to control more narrowly who creates `MCDiagnostic` (see #24113). Some parts of the compiler use `MCDiagnostic` purely for formatting purposes, without creating any real compiler diagnostics. This change introduces a helper function, `formatDiagnostic`, that can be used in such cases instead of constructing `MCDiagnostic`. - - - - - 4 changed files: - compiler/GHC/Core/Lint.hs - compiler/GHC/Stg/Lint.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Utils/Error.hs Changes: ===================================== compiler/GHC/Core/Lint.hs ===================================== @@ -3418,7 +3418,7 @@ addMsg show_context env msgs msg [] -> noSrcSpan (s:_) -> s !diag_opts = le_diagOpts env - mk_msg msg = mkLocMessage (mkMCDiagnostic diag_opts WarningWithoutFlag Nothing) msg_span + mk_msg msg = mkLintWarning diag_opts msg_span (msg $$ context) addLoc :: LintLocInfo -> LintM a -> LintM a ===================================== compiler/GHC/Stg/Lint.hs ===================================== @@ -107,7 +107,6 @@ import GHC.Core.Type import GHC.Types.Basic ( TopLevelFlag(..), isTopLevel, isMarkedCbv ) import GHC.Types.CostCentre ( isCurrentCCS ) -import GHC.Types.Error ( DiagnosticReason(WarningWithoutFlag) ) import GHC.Types.Id import GHC.Types.Var.Set import GHC.Types.Name ( getSrcLoc, nameIsLocalOrFrom ) @@ -116,7 +115,7 @@ import GHC.Types.SrcLoc import GHC.Utils.Logger import GHC.Utils.Outputable -import GHC.Utils.Error ( mkLocMessage, DiagOpts ) +import GHC.Utils.Error ( DiagOpts ) import qualified GHC.Utils.Error as Err import GHC.Unit.Module ( Module ) @@ -540,7 +539,7 @@ addErr diag_opts errs_so_far msg locs = errs_so_far `snocBag` mk_msg locs where mk_msg (loc:_) = let (l,hdr) = dumpLoc loc - in mkLocMessage (Err.mkMCDiagnostic diag_opts WarningWithoutFlag Nothing) + in Err.mkLintWarning diag_opts l (hdr $$ msg) mk_msg [] = msg ===================================== compiler/GHC/Types/Error.hs ===================================== @@ -72,6 +72,7 @@ module GHC.Types.Error , pprMessageBag , mkLocMessage , mkLocMessageWarningGroups + , formatDiagnostic , getCaretDiagnostic , jsonDiagnostic @@ -495,11 +496,11 @@ data MessageClass -- ^ Diagnostics from the compiler. This constructor is very powerful as -- it allows the construction of a 'MessageClass' with a completely -- arbitrary permutation of 'Severity' and 'DiagnosticReason'. As such, - -- users are encouraged to use the 'mkMCDiagnostic' smart constructor + -- users are encouraged to use higher level primitives -- instead. Use this constructor directly only if you need to construct -- and manipulate diagnostic messages directly, for example inside -- 'GHC.Utils.Error'. In all the other circumstances, /especially/ when - -- emitting compiler diagnostics, use the smart constructor. + -- emitting compiler diagnostics, use higher level primitives. -- -- The @Maybe 'DiagnosticCode'@ field carries a code (if available) for -- this diagnostic. If you are creating a message not tied to any @@ -656,32 +657,51 @@ mkLocMessageWarningGroups -> SrcSpan -- ^ location -> SDoc -- ^ message -> SDoc - -- Always print the location, even if it is unhelpful. Error messages - -- are supposed to be in a standard format, and one without a location - -- would look strange. Better to say explicitly "<no location info>". mkLocMessageWarningGroups show_warn_groups msg_class locn msg - = sdocOption sdocColScheme $ \col_scheme -> - let locn' = sdocOption sdocErrorSpans $ \case - True -> ppr locn - False -> ppr (srcSpanStart locn) - + = case msg_class of + MCDiagnostic severity reason code -> formatDiagnostic show_warn_groups locn severity reason code msg + _ -> sdocOption sdocColScheme $ \col_scheme -> + let msg_colour = getMessageClassColour msg_class col_scheme - col = coloured msg_colour . text msg_title = coloured msg_colour $ case msg_class of - MCDiagnostic SevError _ _ -> text "error" - MCDiagnostic SevWarning _ _ -> text "warning" MCFatal -> text "fatal" _ -> empty + in formatLocMessageWarningGroups locn msg_title empty empty msg + +formatDiagnostic + :: Bool -- ^ Print warning groups? + -> SrcSpan -- ^ location + -> Severity + -> ResolvedDiagnosticReason + -> Maybe DiagnosticCode + -> SDoc -- ^ message + -> SDoc +formatDiagnostic show_warn_groups locn severity reason code msg + = sdocOption sdocColScheme $ \col_scheme -> + let + msg_colour :: Col.PprColour + msg_colour = getSeverityColour severity col_scheme + + col :: String -> SDoc + col = coloured msg_colour . text + + msg_title :: SDoc + msg_title = coloured msg_colour $ + case severity of + SevError -> text "error" + SevWarning -> text "warning" + SevIgnore -> empty + + warning_flag_doc :: SDoc warning_flag_doc = - case msg_class of - MCDiagnostic sev reason _code - | Just msg <- flag_msg sev (resolvedDiagnosticReason reason) - -> brackets msg - _ -> empty + case flag_msg severity (resolvedDiagnosticReason reason) of + Nothing -> empty + Just msg -> brackets msg + ppr_with_hyperlink :: DiagnosticCode -> SDoc ppr_with_hyperlink code = -- this is a bit hacky, but we assume that if the terminal supports colors -- then it should also support links @@ -691,10 +711,11 @@ mkLocMessageWarningGroups show_warn_groups msg_class locn msg then ppr $ LinkedDiagCode code else ppr code + code_doc :: SDoc code_doc = - case msg_class of - MCDiagnostic _ _ (Just code) -> brackets (ppr_with_hyperlink code) - _ -> empty + case code of + Just code -> brackets (ppr_with_hyperlink code) + Nothing -> empty flag_msg :: Severity -> DiagnosticReason -> Maybe SDoc flag_msg SevIgnore _ = Nothing @@ -725,13 +746,35 @@ mkLocMessageWarningGroups show_warn_groups msg_class locn msg vcat [ text "locn:" <+> ppr locn , text "msg:" <+> ppr msg ] + warn_flag_grp :: [WarningGroup] -> SDoc warn_flag_grp groups | show_warn_groups, not (null groups) = text $ "(in " ++ intercalate ", " (map (("-W"++) . warningGroupName) groups) ++ ")" | otherwise = empty + in formatLocMessageWarningGroups locn msg_title code_doc warning_flag_doc msg + +formatLocMessageWarningGroups + :: SrcSpan -- ^ location + -> SDoc -- ^ title + -> SDoc -- ^ diagnostic code + -> SDoc -- ^ warning groups + -> SDoc -- ^ message + -> SDoc +formatLocMessageWarningGroups locn msg_title code_doc warning_flag_doc msg + = sdocOption sdocColScheme $ \col_scheme -> + let + -- Always print the location, even if it is unhelpful. Error messages + -- are supposed to be in a standard format, and one without a location + -- would look strange. Better to say explicitly "<no location info>". + locn' :: SDoc + locn' = sdocOption sdocErrorSpans $ \case + True -> ppr locn + False -> ppr (srcSpanStart locn) + -- Add prefixes, like Foo.hs:34: warning: -- <the warning message> + header :: SDoc header = locn' <> colon <+> msg_title <> colon <+> code_doc <+> warning_flag_doc @@ -741,11 +784,16 @@ mkLocMessageWarningGroups show_warn_groups msg_class locn msg msg) getMessageClassColour :: MessageClass -> Col.Scheme -> Col.PprColour -getMessageClassColour (MCDiagnostic SevError _reason _code) = Col.sError -getMessageClassColour (MCDiagnostic SevWarning _reason _code) = Col.sWarning +getMessageClassColour (MCDiagnostic severity _reason _code) = getSeverityColour severity getMessageClassColour MCFatal = Col.sFatal getMessageClassColour _ = const mempty +getSeverityColour :: Severity -> Col.Scheme -> Col.PprColour +getSeverityColour severity = case severity of + SevError -> Col.sError + SevWarning -> Col.sWarning + SevIgnore -> const mempty + getCaretDiagnostic :: MessageClass -> SrcSpan -> IO SDoc getCaretDiagnostic _ (UnhelpfulSpan _) = pure empty getCaretDiagnostic msg_class (RealSrcSpan span _) = ===================================== compiler/GHC/Utils/Error.hs ===================================== @@ -32,7 +32,7 @@ module GHC.Utils.Error ( emptyMessages, mkDecorated, mkLocMessage, mkMsgEnvelope, mkPlainMsgEnvelope, mkPlainErrorMsgEnvelope, mkErrorMsgEnvelope, - mkMCDiagnostic, diagReasonSeverity, + mkLintWarning, diagReasonSeverity, mkPlainError, mkPlainDiagnostic, @@ -160,12 +160,10 @@ diag_reason_severity opts reason = fmap ResolvedDiagnosticReason $ case reason o ErrorWithoutFlag -> (SevError, reason) --- | Make a 'MessageClass' for a given 'DiagnosticReason', consulting the --- 'DiagOpts'. -mkMCDiagnostic :: DiagOpts -> DiagnosticReason -> Maybe DiagnosticCode -> MessageClass -mkMCDiagnostic opts reason code = MCDiagnostic sev reason' code +mkLintWarning :: DiagOpts -> SrcSpan -> SDoc -> SDoc +mkLintWarning opts span = formatDiagnostic True span severity reason Nothing where - (sev, reason') = diag_reason_severity opts reason + (severity, reason) = diag_reason_severity opts WarningWithoutFlag -- -- Creating MsgEnvelope(s) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dfe6f464839e5dfae143b6d4ba14785… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dfe6f464839e5dfae143b6d4ba14785… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: Be more permissive when filtering out GNU_PROPERTY_TYPE linker warnings
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 51c701fe by Zubin Duggal at 2025-08-13T21:06:00-04:00 testsuite: Be more permissive when filtering out GNU_PROPERTY_TYPE linker warnings The warning text is slightly different with ld.bfd. Fixes #26249 - - - - - 1 changed file: - testsuite/driver/testlib.py Changes: ===================================== testsuite/driver/testlib.py ===================================== @@ -2988,7 +2988,7 @@ def normalise_errmsg(s: str) -> str: # filter out unsupported GNU_PROPERTY_TYPE (5), which is emitted by LLVM10 # and not understood by older binutils (ar, ranlib, ...) - s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE $5$ type: 0xc000000(.*)$', '', l)) + s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE (?:$5$ )?type: 0xc000000(.*)$', '', l)) s = re.sub(r'ld: warning: passed .* min versions $.*$ for platform macOS. Using [\.0-9]+.','',s) s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/51c701fef034e2062809eed5de3a51b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/51c701fef034e2062809eed5de3a51b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Report -pgms as a deprecated flag
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 3506fa7d by Simon Hengel at 2025-08-13T21:05:18-04:00 Report -pgms as a deprecated flag (instead of reporting an unspecific warning) Before: on the commandline: warning: Object splitting was removed in GHC 8.8 After: on the commandline: warning: [GHC-53692] [-Wdeprecated-flags] -pgms is deprecated: Object splitting was removed in GHC 8.8 - - - - - 1 changed file: - compiler/GHC/Driver/Session.hs Changes: ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -1145,8 +1145,8 @@ dynamic_flags_deps = [ $ noArgM $ \d -> do deprecate $ "use -pgml-supports-no-pie instead" pure $ alterToolSettings (\s -> s { toolSettings_ccSupportsNoPie = True }) d) - , make_ord_flag defFlag "pgms" - (HasArg (\_ -> addWarn "Object splitting was removed in GHC 8.8")) + , make_dep_flag defFlag "pgms" + (HasArg (\_ -> return ())) "Object splitting was removed in GHC 8.8" , make_ord_flag defFlag "pgma" $ hasArg $ \f -> alterToolSettings $ \s -> s { toolSettings_pgm_a = (f,[]) } , make_ord_flag defFlag "pgml" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3506fa7d4417ecd7225e413d3d77039… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3506fa7d4417ecd7225e413d3d77039… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] ghc-internal: Fix naturalAndNot for NB/NS case
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a766286f by Reed Mullanix at 2025-08-13T21:04:36-04:00 ghc-internal: Fix naturalAndNot for NB/NS case When the first argument to `naturalAndNot` is larger than a `Word` and the second is `Word`-sized, `naturalAndNot` will truncate the result: ``` >>> naturalAndNot ((2 ^ 65) .|. (2 ^ 3)) (2 ^ 3) 0 ``` In contrast, `naturalAndNot` does not truncate when both arguments are larger than a `Word`, so this appears to be a bug. Luckily, the fix is pretty easy: we just need to call `bigNatAndNotWord#` instead of truncating. Fixes #26230 - - - - - 6 changed files: - libraries/base/changelog.md - libraries/ghc-bignum/changelog.md - libraries/ghc-internal/src/GHC/Internal/Bignum/Natural.hs - + testsuite/tests/numeric/should_run/T26230.hs - + testsuite/tests/numeric/should_run/T26230.stdout - testsuite/tests/numeric/should_run/all.T Changes: ===================================== libraries/base/changelog.md ===================================== @@ -5,6 +5,7 @@ * Fix issues with toRational for types capable to represent infinite and not-a-number values ([CLC proposal #338](https://github.com/haskell/core-libraries-committee/issues/338)) * Modify the implementation of `Data.List.sortOn` to use `(>)` instead of `compare`. ([CLC proposal #332](https://github.com/haskell/core-libraries-committee/issues/332)) * `GHC.Exts.IOPort#` and its related operations have been removed ([CLC #213](https://github.com/haskell/core-libraries-committee/issues/213)) + * Fix bug where `naturalAndNot` was incorrectly truncating results ([CLC proposal #350](github.com/haskell/core-libraries-committee/issues/350)) ## 4.22.0.0 *TBA* * Shipped with GHC 9.14.1 ===================================== libraries/ghc-bignum/changelog.md ===================================== @@ -5,6 +5,8 @@ - `ghc-bignum`'s implementation has been merged into `ghc-internal`. Downstream users should import `GHC.Num.{Integer,Natural,BigNat}` stable modules from `base` instead. +- Fix bug where `naturalAndNot` was incorrectly truncating results (#26230) + ## 1.3 ===================================== libraries/ghc-internal/src/GHC/Internal/Bignum/Natural.hs ===================================== @@ -488,7 +488,7 @@ naturalAndNot :: Natural -> Natural -> Natural {-# NOINLINE naturalAndNot #-} naturalAndNot (NS n) (NS m) = NS (n `and#` not# m) naturalAndNot (NS n) (NB m) = NS (n `and#` not# (bigNatToWord# m)) -naturalAndNot (NB n) (NS m) = NS (bigNatToWord# n `and#` not# m) +naturalAndNot (NB n) (NS m) = NB (bigNatAndNotWord# n m) naturalAndNot (NB n) (NB m) = naturalFromBigNat# (bigNatAndNot n m) naturalOr :: Natural -> Natural -> Natural ===================================== testsuite/tests/numeric/should_run/T26230.hs ===================================== @@ -0,0 +1,8 @@ +import Data.Bits +import GHC.Num.Natural + +main = do + print $ naturalAndNot ((2 ^ 4) .|. (2 ^ 3)) (2 ^ 3) + print $ naturalAndNot ((2 ^ 129) .|. (2 ^ 65)) (2 ^ 65) + print $ naturalAndNot ((2 ^ 4) .|. (2 ^ 3)) ((2 ^ 65) .|. (2 ^ 3)) + print $ naturalAndNot ((2 ^ 65) .|. (2 ^ 3)) (2 ^ 3) ===================================== testsuite/tests/numeric/should_run/T26230.stdout ===================================== @@ -0,0 +1,4 @@ +16 +680564733841876926926749214863536422912 +16 +36893488147419103232 ===================================== testsuite/tests/numeric/should_run/all.T ===================================== @@ -88,3 +88,4 @@ test('div01', normal, compile_and_run, ['']) test('T24245', normal, compile_and_run, ['']) test('T25653', normal, compile_and_run, ['']) test('T18619', exit_code(1), compile_and_run, ['']) +test('T26230', normal, compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a766286fe759251eceb304c54ba5284… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a766286fe759251eceb304c54ba5284… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 3 commits: Store `StackTrace` and `StackSnapshot` in `Backtraces`
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: c91e2650 by fendor at 2025-08-13T21:03:43-04:00 Store `StackTrace` and `StackSnapshot` in `Backtraces` Instead of decoding the stack traces when collecting the `Backtraces`, defer this decoding until actually showing the `Backtraces`. This allows users to customise how `Backtraces` are displayed by using a custom implementation of `displayExceptionWithInfo`, overwriting the default implementation for `Backtraces` (`displayBacktraces`). - - - - - dee28cdd by fendor at 2025-08-13T21:03:43-04:00 Allow users to customise the collection of exception annotations Add a global `CollectExceptionAnnotationMechanism` which determines how `ExceptionAnnotation`s are collected upon throwing an `Exception`. This API is exposed via `ghc-experimental`. By overriding how we collect `Backtraces`, we can control how the `Backtraces` are displayed to the user by newtyping `Backtraces` and giving a different instance for `ExceptionAnnotation`. A concrete use-case for this feature is allowing us to experiment with alternative stack decoders, without having to modify `base`, which take additional information from the stack frames. This commit does not modify how `Backtraces` are currently collected or displayed. - - - - - 66024722 by fendor at 2025-08-13T21:03:43-04:00 Expose Backtraces internals from ghc-experimental Additionally, expose the same API `base:Control.Exception.Backtrace` to make it easier to use as a drop-in replacement. - - - - - 32 changed files: - + libraries/ghc-experimental/src/GHC/Exception/Backtrace/Experimental.hs - libraries/ghc-internal/src/GHC/Internal/Exception.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs-boot - + libraries/ghc-internal/tests/Makefile - + libraries/ghc-internal/tests/all.T - + libraries/ghc-internal/tests/backtraces/Makefile - + libraries/ghc-internal/tests/backtraces/T14532a.hs - + libraries/ghc-internal/tests/backtraces/T14532a.stdout - + libraries/ghc-internal/tests/backtraces/T14532b.hs - + libraries/ghc-internal/tests/backtraces/T14532b.stdout - + libraries/ghc-internal/tests/backtraces/all.T - testsuite/tests/arrows/should_compile/T21301.stderr - testsuite/tests/deSugar/should_fail/DsStrictFail.stderr - testsuite/tests/deSugar/should_run/T20024.stderr - testsuite/tests/deSugar/should_run/dsrun005.stderr - testsuite/tests/deSugar/should_run/dsrun007.stderr - testsuite/tests/deSugar/should_run/dsrun008.stderr - testsuite/tests/deriving/should_run/T9576.stderr - testsuite/tests/ghci/scripts/Defer02.stderr - testsuite/tests/ghci/scripts/T15325.stderr - testsuite/tests/patsyn/should_run/ghci.stderr - testsuite/tests/quotes/LiftErrMsgDefer.stderr - testsuite/tests/safeHaskell/safeLanguage/SafeLang15.stderr - testsuite/tests/type-data/should_run/T22332a.stderr - testsuite/tests/typecheck/should_run/T10284.stderr - testsuite/tests/typecheck/should_run/T13838.stderr - testsuite/tests/typecheck/should_run/T9497a-run.stderr - testsuite/tests/typecheck/should_run/T9497b-run.stderr - testsuite/tests/typecheck/should_run/T9497c-run.stderr - testsuite/tests/unsatisfiable/T23816.stderr - testsuite/tests/unsatisfiable/UnsatDefer.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50842f83f467ff54dd22470559a7af… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50842f83f467ff54dd22470559a7af… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Make unexpected LLVM versions a warning rather than an error.
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 50842f83 by Andreas Klebinger at 2025-08-13T21:03:01-04:00 Make unexpected LLVM versions a warning rather than an error. Typically a newer LLVM version *will* work so erroring out if a user uses a newer LLVM version is too aggressive. Fixes #25915 - - - - - 1 changed file: - compiler/GHC/Driver/Errors/Ppr.hs Changes: ===================================== compiler/GHC/Driver/Errors/Ppr.hs ===================================== @@ -281,7 +281,7 @@ instance Diagnostic DriverMessage where ++ llvmVersionStr supportedLlvmVersionLowerBound ++ " and " ++ llvmVersionStr supportedLlvmVersionUpperBound - ++ ") and reinstall GHC to make -fllvm work") + ++ ") and reinstall GHC to ensure -fllvm works") diagnosticReason = \case DriverUnknownMessage m @@ -352,7 +352,7 @@ instance Diagnostic DriverMessage where DriverInstantiationNodeInDependencyGeneration {} -> ErrorWithoutFlag DriverNoConfiguredLLVMToolchain - -> ErrorWithoutFlag + -> WarningWithoutFlag diagnosticHints = \case DriverUnknownMessage m View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/50842f83f467ff54dd22470559a7af7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/50842f83f467ff54dd22470559a7af7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: Clarify rationale for undefined atomic wrappers
by Marge Bot (＠marge-bot) 13 Aug '25

13 Aug '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a5e4b7d9 by Ben Gamari at 2025-08-13T21:02:18-04:00 rts: Clarify rationale for undefined atomic wrappers Since c06e3f46d24ef69f3a3d794f5f604cb8c2a40cbc the RTS has declared various atomic operation wrappers defined by ghc-internal as undefined. While the rationale for this isn't clear from the commit message, I believe that this is necessary due to the unregisterised backend. Specifically, the code generator will reference these symbols when compiling RTS Cmm sources. - - - - - 2 changed files: - rts/external-symbols.list.in - rts/rts.cabal Changes: ===================================== rts/external-symbols.list.in ===================================== @@ -54,6 +54,12 @@ ghczminternal_GHCziInternalziWord_W16zh_con_info ghczminternal_GHCziInternalziWord_W32zh_con_info ghczminternal_GHCziInternalziWord_W64zh_con_info ghczminternal_GHCziInternalziStable_StablePtr_con_info +ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure + +#if 0 +N.B. These symbols are defined in ghc-internal and may be referenced by the +unregisterised code-generator when compiling RTS Cmm sources. +#endif hs_atomic_add8 hs_atomic_add16 hs_atomic_add32 @@ -94,4 +100,3 @@ hs_atomicwrite8 hs_atomicwrite16 hs_atomicwrite32 hs_atomicwrite64 -ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure ===================================== rts/rts.cabal ===================================== @@ -596,8 +596,7 @@ library -- GHC already does `-undefined dynamic_lookup`, so we just do that for now, but -- we might try to get more precise with `-U` in the future. -- --- Note that the RTS also `-u`s some atomics symbols that *are* defined --- and --- defined within the RTS! It is not immediately clear why this is needed. This --- dates back to c06e3f46d24ef69f3a3d794f5f604cb8c2a40cbc which mentions a build --- failure that it was suggested that this fix, but the precise reasoning is not --- explained. +-- Note that the RTS also `-u`s some symbols for atomic operations that *are* defined +-- by `ghc-internal`. This is needed when the RTS is compiled when the RTS is +-- compiled with, e.g., the unregisterised backend since the code-generator will +-- reference these symbols when compiling atomic primops in Cmm sources. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a5e4b7d9fa56e8357f0b26c5c1a29c1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a5e4b7d9fa56e8357f0b26c5c1a29c1… You're receiving this email because of your account on gitlab.haskell.org.

1 0