- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/loop-backtrace] 3 commits: compiler/ipe: Prefer source ticks in current module for return frames
by Ben Gamari (＠bgamari) 21 Jun '26

21 Jun '26

Ben Gamari pushed to branch wip/loop-backtrace at Glasgow Haskell Compiler / GHC Commits: 8fbf9c06 by Ben Gamari at 2026-06-21T08:23:11-04:00 compiler/ipe: Prefer source ticks in current module for return frames Previously we would simply attribute return frames to the nearest enclosing tick in the calling frame. However, this will very frequently produce unhelpful results (e.g. pointing to `(>>)` rather than the calling function). - - - - - abd9dc0e by Ben Gamari at 2026-06-21T11:20:56-04:00 testsuite: Add LoopBacktrace test - - - - - 4010d192 by Ben Gamari at 2026-06-21T11:20:56-04:00 Throw nontermination exceptions via `throw` This ensures that the exception that results gets the usual backtrace annotations. - - - - - 16 changed files: - compiler/GHC/Driver/GenerateCgIPEStub.hs - compiler/GHC/Driver/Main/Compile.hs - libraries/base/src/Control/Exception/Base.hs - libraries/ghc-internal/include/RtsIfaceSymbols.h - libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs - rts/Prelude.h - rts/RtsStartup.c - rts/Schedule.c - rts/include/rts/RtsToHsIface.h - + testsuite/tests/rts/LoopBacktrace.hs - + testsuite/tests/rts/LoopBacktrace.stderr - + testsuite/tests/rts/LoopBacktrace.stdout - testsuite/tests/rts/all.T - + testsuite/tests/rts/ipe/T27408.hs - + testsuite/tests/rts/ipe/T27408.stdout - testsuite/tests/rts/ipe/all.T Changes: ===================================== compiler/GHC/Driver/GenerateCgIPEStub.hs ===================================== @@ -1,7 +1,9 @@ module GHC.Driver.GenerateCgIPEStub (generateCgIPEStub, lookupEstimatedTicks) where +import Control.Applicative ((<|>)) import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map +import Data.Maybe (listToMaybe) import Data.Semigroup ((<>)) import GHC.Cmm import GHC.Cmm.CLabel (CLabel, mkAsmTempLabel) @@ -10,6 +12,7 @@ import GHC.Cmm.Dataflow.Block (blockSplit, blockToList) import GHC.Cmm.Dataflow.Label import GHC.Cmm.Info.Build (emptySRT) import GHC.Cmm.Pipeline (cmmPipeline) +import GHC.Data.FastString (FastString, mkFastString) import GHC.Data.Stream (liftIO, liftEff) import qualified GHC.Data.Stream as Stream import GHC.Driver.Env (hsc_dflags, hsc_logger) @@ -28,9 +31,10 @@ import GHC.StgToCmm.Utils import GHC.StgToCmm.CgUtils (CgStream) import GHC.Types.IPE (InfoTableProvMap (provInfoTables), IpeSourceLocation) import GHC.Types.Name.Set (NonCaffySet) +import GHC.Types.SrcLoc (srcSpanFile) import GHC.Types.Tickish (GenTickish (SourceNote)) import GHC.Unit.Types (Module, moduleName) -import GHC.Unit.Module (moduleNameString) +import GHC.Unit.Module (moduleNameString, ModLocation, ml_hs_file) import qualified GHC.Utils.Logger as Logger import GHC.Utils.Outputable (ppr) import GHC.Types.Unique.DSM @@ -257,11 +261,12 @@ generateCgIPEStub hsc_env this_mod denv (nonCaffySet, moduleLFInfos, infoTablesW -- performance suffered considerably as a result (see #23103). lookupEstimatedTicks :: HscEnv + -> ModLocation -- ^ location of the module being compiled, for IPE provenance -> Map CmmInfoTable (Maybe IpeSourceLocation) -> IPEStats -> CmmGroupSRTs -> IO (Map CmmInfoTable (Maybe IpeSourceLocation), IPEStats) -lookupEstimatedTicks hsc_env ipes stats cmm_group_srts = +lookupEstimatedTicks hsc_env mod_location ipes stats cmm_group_srts = -- Pass 2: Create an entry in the IPE map for every info table listed in -- this CmmGroupSRTs. If the info table is a stack info table and -- -finfo-table-map-with-stack is enabled, look up its estimated source @@ -276,19 +281,24 @@ lookupEstimatedTicks hsc_env ipes stats cmm_group_srts = dflags = hsc_dflags hsc_env platform = targetPlatform dflags - -- Pass 1: Map every label meeting the conditions described in Note - -- [Stacktraces from Info Table Provenance Entries (IPE based stack - -- unwinding)] to the estimated source location (also as described in the - -- aformentioned note) + -- Source file of the module being compiled, used to prefer current-module + -- source ticks for return frames. See Note [Prefer current-module source + -- ticks for return frames]. + mb_src_file = mkFastString <$> ml_hs_file mod_location + + -- Pass 1: Map every label meeting the conditions described in + -- Note [Stacktraces from Info Table Provenance Entries (IPE based stack unwinding)] + -- to the estimated source location (also as described in the aformentioned + -- note). -- -- Note: It's important that this remains a thunk so we do not compute this -- map if -fno-info-table-with-stack is given labelsToSources :: Map CLabel IpeSourceLocation labelsToSources = if platformTablesNextToCode platform then - foldl' labelsToSourcesWithTNTC Map.empty cmm_group_srts + foldl' (labelsToSourcesWithTNTC mb_src_file) Map.empty cmm_group_srts else - foldl' labelsToSourcesSansTNTC Map.empty cmm_group_srts + foldl' (labelsToSourcesSansTNTC mb_src_file) Map.empty cmm_group_srts collectInfoTables :: (Map CmmInfoTable (Maybe IpeSourceLocation), IPEStats) @@ -331,15 +341,16 @@ lookupEstimatedTicks hsc_env ipes stats cmm_group_srts = -- | See Note [Stacktraces from Info Table Provenance Entries (IPE based stack unwinding)] labelsToSourcesWithTNTC - :: Map CLabel IpeSourceLocation + :: Maybe FastString -- ^ source file of the module being compiled + -> Map CLabel IpeSourceLocation -> GenCmmDecl RawCmmStatics CmmTopInfo CmmGraph -> Map CLabel IpeSourceLocation -labelsToSourcesWithTNTC acc (CmmProc _ _ _ cmm_graph) = +labelsToSourcesWithTNTC mb_src_file acc (CmmProc _ _ _ cmm_graph) = foldl' go acc (toBlockList cmm_graph) where go :: Map CLabel IpeSourceLocation -> CmmBlock -> Map CLabel IpeSourceLocation go acc block = - case (,) <$> returnFrameLabel <*> lastTickInBlock of + case (,) <$> returnFrameLabel <*> bestTickInBlock of Just (clabel, src_loc) -> Map.insert clabel src_loc acc Nothing -> acc where @@ -351,36 +362,135 @@ labelsToSourcesWithTNTC acc (CmmProc _ _ _ cmm_graph) = (CmmCall _ (Just l) _ _ _ _) -> Just $ mkAsmTempLabel l _ -> Nothing - lastTickInBlock = foldr maybeTick Nothing (blockToList middleBlock) + -- All SourceNotes in the block, in block order. + -- See Note [Prefer current-module source ticks for return frames]. + bestTickInBlock = preferThisFile mb_src_file procFallback (blockToList middleBlock) + + -- Enclosing current-module note for the whole proc (its function's own + -- span), used when a return frame's own block has no current-module tick. + procFallback = enclosingThisFileTick mb_src_file (toBlockList cmm_graph) +labelsToSourcesWithTNTC _ acc _ = acc + +{- +Note [Prefer current-module source ticks for return frames] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +A return frame's source location is taken from the `SourceNote`s of the block +that *ends* in the frame's call (see +Note [Stacktraces from Info Table Provenance Entries (IPE based stack unwinding] +above and `labelsToSourcesWithTNTC`). At `-O`, inlining means such a +block frequently carries `SourceNote`s for inlined library glue (`>>`, `>>=`, +`threadDelay`, ...) and the *nearest* note — the one historically chosen — is +often a library note rather than the user's code. The resulting IPE entry then +points at the library (its file and label; see `toCgIPE` in +GHC.StgToCmm.InfoTableProv, which takes the file from the note's own span), so a +backtrace of a thread blocked in such a primop shows no user frames. + +For a concrete example, compile (at -O1) + + -- Scan.hs + f3 :: IO () + f3 = threadDelay 1000000 >> putStrLn "done" + +The body of `f3` reaches the inlined `threadDelay`'s internal `delay#` in a +block whose notes are *all* from `Conc.IO`/`Base` — the user's `Scan.hs` tick +for `f3` sits only in the proc's entry block: + + entry: -- the proc's entry block + //tick src<.../Base.hs:2306:5-18> + //tick src<Scan.hs:13:1-43> -- the enclosing `f3` span + //tick src<.../Conc/IO.hs:(223,1)-(235,10)> + ... + delayBlk: -- no Scan.hs note here: + //tick src<.../Conc/IO.hs:232:5-13> + //tick src<.../Base.hs:2268:1-9> + //tick src<.../Conc/IO.hs:(232,25)-(235,10)> -- nearest note + call stg_delay#(R1) returns to delayCont, args: 8, res: 8, upd: 8; + +Naively taking the nearest note attributes `delayCont` to `Conc/IO.hs:232`, +i.e. an internal of `threadDelay`, rather than `f3`. + +To fix this we attribute a return frame's source location in the following +preference order: + + 1. the nearest tick in the frame's block whose file is that of the module + being compiled - the precise user call site. (When the user makes a + blocking call directly, e.g. `f v = takeMVar v`, such a note is present in + the call's block and this rule suffices; the `delayBlk` above has none.) + 2. failing that, the proc's *enclosing* current-module note (the outermost + current-module `SourceNote` in the proc, i.e. its function's own span). + For `f3` this is `src<Scan.hs:13:1-43>`, so `delayCont` is attributed to + `f3` rather than to `threadDelay`'s internals. + 3. failing that, the nearest note of any module (the historical behaviour). + +This mirrors the same-file preference the DWARF path uses in +`GHC.Cmm.DebugBlock.bestSrcTick` and that `GHC.Stg.Debug.quickSourcePos` uses +for closures. +-} - maybeTick :: CmmNode O O -> Maybe IpeSourceLocation -> Maybe IpeSourceLocation - maybeTick _ s@(Just _) = s - maybeTick (CmmTick (SourceNote span name)) Nothing = Just (span, name) - maybeTick _ _ = Nothing -labelsToSourcesWithTNTC acc _ = acc +-- | Pick the 'IpeSourceLocation' to attribute to a return frame from the +-- source-note-bearing nodes of its block (in block order). +-- +-- See Note [Prefer current-module source ticks for return frames]. +preferThisFile :: Maybe FastString -> Maybe IpeSourceLocation -> [CmmNode O O] -> Maybe IpeSourceLocation +preferThisFile mb_src_file procFallback nodes = + nearest fromThisFile <|> procFallback <|> nearest sourceNotes + where + sourceNotes = [ (span, name) | CmmTick (SourceNote span name) <- nodes ] + fromThisFile = case mb_src_file of + Just f -> filter ((== f) . srcSpanFile . fst) sourceNotes + Nothing -> [] + nearest = listToMaybe . reverse + +-- | The outermost 'SourceNote' from the module being compiled across a proc's +-- blocks (in 'toBlockList' order, so the entry block's note — the function's own +-- span — comes first). Used as a fallback so inlined cross-module code is still +-- labelled with the enclosing user function. 'Nothing' when the proc has no +-- current-module note (e.g. when compiling the library itself). +enclosingThisFileTick :: Maybe FastString -> [CmmBlock] -> Maybe IpeSourceLocation +enclosingThisFileTick mb_src_file blocks = + listToMaybe + [ (span, name) + | b <- blocks + , let (_, mid, _) = blockSplit b + , CmmTick (SourceNote span name) <- blockToList mid + , Just (srcSpanFile span) == mb_src_file ] -- | See Note [Stacktraces from Info Table Provenance Entries (IPE based stack unwinding)] labelsToSourcesSansTNTC - :: Map CLabel IpeSourceLocation + :: Maybe FastString -- ^ source file of the module being compiled + -> Map CLabel IpeSourceLocation -> GenCmmDecl RawCmmStatics CmmTopInfo CmmGraph -> Map CLabel IpeSourceLocation -labelsToSourcesSansTNTC acc (CmmProc _ _ _ cmm_graph) = +labelsToSourcesSansTNTC mb_src_file acc (CmmProc _ _ _ cmm_graph) = foldl' go acc (toBlockList cmm_graph) where + -- See 'enclosingThisFileTick'. + procFallback = enclosingThisFileTick mb_src_file (toBlockList cmm_graph) + go :: Map CLabel IpeSourceLocation -> CmmBlock -> Map CLabel IpeSourceLocation - go acc block = fst $ foldl' collectLabels (acc, Nothing) (blockToList middleBlock) + go acc block = fst $ foldl' collectLabels (acc, (Nothing, Nothing)) (blockToList middleBlock) where (_, middleBlock, _) = blockSplit block + -- We track the nearest preceding SourceNote from the module being + -- compiled and the nearest of any module, and prefer the former (then + -- the proc's enclosing current-module note) when attributing a return + -- frame. See Note [Prefer current-module source ticks for return frames]. collectLabels - :: (Map CLabel IpeSourceLocation, Maybe IpeSourceLocation) + :: (Map CLabel IpeSourceLocation, (Maybe IpeSourceLocation, Maybe IpeSourceLocation)) -> CmmNode O O - -> (Map CLabel IpeSourceLocation, Maybe IpeSourceLocation) - collectLabels (!acc, lastTick) b = - case (b, lastTick) of - (CmmStore _ (CmmLit (CmmLabel l)) _, Just src_loc) -> - (Map.insert l src_loc acc, Nothing) - (CmmTick (SourceNote span name), _) -> - (acc, Just (span, name)) - _ -> (acc, lastTick) -labelsToSourcesSansTNTC acc _ = acc + -> (Map CLabel IpeSourceLocation, (Maybe IpeSourceLocation, Maybe IpeSourceLocation)) + collectLabels (!acc, st@(lastThis, lastAny)) b = + case b of + CmmStore _ (CmmLit (CmmLabel l)) _ -> + case lastThis <|> procFallback <|> lastAny of + Just src_loc -> (Map.insert l src_loc acc, (Nothing, Nothing)) + Nothing -> (acc, st) + CmmTick (SourceNote span name) -> + let tick = (span, name) + lastThis' + | Just (srcSpanFile span) == mb_src_file = Just tick + | otherwise = lastThis + in (acc, (lastThis', Just tick)) + _ -> (acc, st) +labelsToSourcesSansTNTC _ acc _ = acc ===================================== compiler/GHC/Driver/Main/Compile.hs ===================================== @@ -699,7 +699,7 @@ hscGenHardCode hsc_env cgguts mod_loc output_filename = do _ -> do cmms <- {-# SCC "StgToCmm" #-} - doCodeGen hsc_env this_mod denv tycons + doCodeGen hsc_env this_mod mod_loc denv tycons cost_centre_info stg_binds @@ -956,14 +956,17 @@ This reduces residency towards the end of the CodeGen phase significantly (5-10%). -} -doCodeGen :: HscEnv -> Module -> InfoTableProvMap -> [TyCon] +doCodeGen :: HscEnv -> Module + -> ModLocation -- ^ location of the module being compiled, used to + -- prefer current-module IPE source locations + -> InfoTableProvMap -> [TyCon] -> CollectedCCs -> [CgStgTopBinding] -- ^ Bindings come already annotated with fvs -> IO (CgStream CmmGroupSRTs CmmCgInfos) -- Note we produce a 'Stream' of CmmGroups, so that the -- backend can be run incrementally. Otherwise it generates all -- the C-- up front, which has a significant space cost. -doCodeGen hsc_env this_mod denv tycons +doCodeGen hsc_env this_mod mod_location denv tycons cost_centre_info stg_binds_w_fvs = do let dflags = hsc_dflags hsc_env logger = hsc_logger hsc_env @@ -1032,7 +1035,7 @@ doCodeGen hsc_env this_mod denv tycons -- Positions] in GHC.Stg.Debug. (ipes', stats') <- if (gopt Opt_InfoTableMap dflags) then - liftIO $ lookupEstimatedTicks hsc_env ipes stats cmm_srts + liftIO $ lookupEstimatedTicks hsc_env mod_location ipes stats cmm_srts else return (ipes, stats) ===================================== libraries/base/src/Control/Exception/Base.hs ===================================== @@ -85,7 +85,6 @@ module Control.Exception.Base patError, noMethodBindingError, typeError, - nonTermination, nestedAtomically, noMatchingContinuationPrompt ) where ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -20,7 +20,7 @@ CLOSURE(GHCziInternalziIOziException, blockedIndefinitelyOnSTM_closure) CLOSURE(GHCziInternalziIOziException, cannotCompactFunction_closure) CLOSURE(GHCziInternalziIOziException, cannotCompactPinned_closure) CLOSURE(GHCziInternalziIOziException, cannotCompactMutable_closure) -CLOSURE(GHCziInternalziControlziExceptionziBase, nonTermination_closure) +CLOSURE(GHCziInternalziControlziExceptionziBase, nonTerminationError_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, nestedAtomically_closure) CLOSURE(GHCziInternalziControlziExceptionziBase, noMatchingContinuationPrompt_closure) #if defined(mingw32_HOST_OS) ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs ===================================== @@ -108,7 +108,7 @@ module GHC.Internal.Control.Exception.Base ( impossibleError, impossibleConstraintError, nonExhaustiveGuardsError, patError, noMethodBindingError, typeError, - nonTermination, nestedAtomically, noMatchingContinuationPrompt, + nonTerminationError, nestedAtomically, noMatchingContinuationPrompt, ) where import GHC.Internal.Base ( @@ -448,8 +448,9 @@ impossibleConstraintError s = errorWithoutStackTrace (unpackCStringUtf8# s) -- GHC's RTS calls this -nonTermination :: SomeException -nonTermination = toException NonTermination +nonTerminationError :: IO () +nonTerminationError = throwIO NonTermination + -- GHC's RTS calls this nestedAtomically :: SomeException ===================================== rts/Prelude.h ===================================== @@ -58,7 +58,7 @@ extern StgClosure ZCMain_main_closure; #define cannotCompactFunction_closure ghc_hs_iface->cannotCompactFunction_closure #define cannotCompactPinned_closure ghc_hs_iface->cannotCompactPinned_closure #define cannotCompactMutable_closure ghc_hs_iface->cannotCompactMutable_closure -#define nonTermination_closure ghc_hs_iface->nonTermination_closure +#define nonTerminationError_closure ghc_hs_iface->nonTerminationError_closure #define nestedAtomically_closure ghc_hs_iface->nestedAtomically_closure #define absentSumFieldError_closure ghc_hs_iface->absentSumFieldError_closure #define underflowException_closure ghc_hs_iface->underflowException_closure ===================================== rts/RtsStartup.c ===================================== @@ -193,7 +193,7 @@ static void initBuiltinGcRoots(void) getStablePtr((StgPtr)heapOverflow_closure); getStablePtr((StgPtr)unpackCString_closure); getStablePtr((StgPtr)blockedIndefinitelyOnMVar_closure); - getStablePtr((StgPtr)nonTermination_closure); + getStablePtr((StgPtr)nonTerminationError_closure); getStablePtr((StgPtr)blockedIndefinitelyOnSTM_closure); getStablePtr((StgPtr)allocationLimitExceeded_closure); getStablePtr((StgPtr)cannotCompactFunction_closure); ===================================== rts/Schedule.c ===================================== @@ -3276,6 +3276,17 @@ findAtomicallyFrameHelper (Capability *cap, StgTSO *tso) } } +static void throwNontermination(Capability *cap, StgTSO *tso) { + StgStack *stack = tso->stackobj; + stack->sp -= 3; + stack->sp[0] = (W_)&stg_enter_info; + stack->sp[1] = (W_)nonTerminationError_closure; + stack->sp[2] = (W_)&stg_ap_v_info; + tso->why_blocked = NotBlocked; + appendToRunQueue(cap,tso); +} + + /* ----------------------------------------------------------------------------- resurrectThreads is called after garbage collection on the list of threads found to be garbage. Each of these threads will be woken @@ -3313,8 +3324,7 @@ resurrectThreads (StgTSO *threads) (StgClosure *)blockedIndefinitelyOnMVar_closure); break; case BlockedOnBlackHole: - throwToSingleThreaded(cap, tso, - (StgClosure *)nonTermination_closure); + throwNontermination(cap, tso); break; case BlockedOnSTM: throwToSingleThreaded(cap, tso, ===================================== rts/include/rts/RtsToHsIface.h ===================================== @@ -25,7 +25,7 @@ typedef struct { StgClosure *cannotCompactFunction_closure; // GHC.Internal.IO.Exception.cannotCompactFunction_closure StgClosure *cannotCompactPinned_closure; // GHC.Internal.IO.Exception.cannotCompactPinned_closure StgClosure *cannotCompactMutable_closure; // GHC.Internal.IO.Exception.cannotCompactMutable_closure - StgClosure *nonTermination_closure; // GHC.Internal.Control.Exception.Base.nonTermination_closure + StgClosure *nonTerminationError_closure; // GHC.Internal.Control.Exception.Base.nonTerminationError_closure StgClosure *nestedAtomically_closure; // GHC.Internal.Control.Exception.Base.nestedAtomically_closure StgClosure *noMatchingContinuationPrompt_closure; // GHC.Internal.Control.Exception.Base.noMatchingContinuationPrompt_closure StgClosure *blockedOnBadFD_closure; // GHC.Internal.Event.Thread.blockedOnBadFD_closure ===================================== testsuite/tests/rts/LoopBacktrace.hs ===================================== @@ -0,0 +1,17 @@ +{-# OPTIONS_GHC -finfo-table-map -forig-thunk-info #-} + +import GHC.Exception.Backtrace.Experimental + +x :: Integer +x = x + 1 + +testing :: IO () +testing = do + putStrLn "hello" + print x + putStrLn "world" + +main :: IO () +main = do + setBacktraceMechanismState IPEBacktrace True + testing ===================================== testsuite/tests/rts/LoopBacktrace.stderr ===================================== @@ -0,0 +1,21 @@ +LoopBacktrace: Uncaught exception ghc-internal:GHC.Internal.Control.Exception.Base.NonTermination: + +<<loop>> + +IPE backtrace: + GHC.Internal.Exception.Backtrace.collectBacktraces' (libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs:(179,1)-(202,25)) + GHC.Internal.Exception.Backtrace.collectBacktraces (libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs:174:39-56) + GHC.Internal.Exception.toExceptionWithBacktrace (libraries/ghc-internal/src/GHC/Internal/Exception.hs:(179,26)-(181,53)) + GHC.Internal.IO.throwIO (libraries/ghc-internal/src/GHC/Internal/IO.hs:293:36) + Cmm$rts/HeapStackCheck.cmm. (:) + GHC.Internal.Bignum.Integer.integerAdd (libraries/ghc-internal/src/GHC/Internal/Bignum/Integer.hs:(547,1)-(571,52)) + Cmm$rts/Updates.cmm. (:) + Main.x (LoopBacktrace.hs:6:1-9) + GHC.Internal.Show.show (libraries/ghc-internal/src/GHC/Internal/Show.hs:497:10-21) + GHC.Internal.IO.Handle.Text.hPutStr' (libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs:667:29-37) + GHC.Internal.Base.thenIO (libraries/ghc-internal/src/GHC/Internal/Base.hs:2337:1-72) + Cmm$rts/Exception.cmm. (:) + Cmm$rts/StgStartup.cmm. (:) +HasCallStack backtrace: + throwIO, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:452:23 in ghc-internal:GHC.Internal.Control.Exception.Base + ===================================== testsuite/tests/rts/LoopBacktrace.stdout ===================================== @@ -0,0 +1 @@ +hello ===================================== testsuite/tests/rts/all.T ===================================== @@ -687,3 +687,5 @@ test('ClosureTable', ['-debug -O0 ClosureTable_c.c -I{top}/../rts -I{top}/../rts/include']) test('resizeMutableByteArrayInPlace', [req_cmm, extra_ways(['optasm', 'sanity']), only_ways(['optasm', 'sanity'])], compile_and_run, ['']) + +test('LoopBacktrace', [exit_code(1)], compile_and_run, ['']) ===================================== testsuite/tests/rts/ipe/T27408.hs ===================================== @@ -0,0 +1,18 @@ +module Main where + +import GHC.Stack.CloneStack (StackEntry(..), cloneMyStack, decode) + +userFunction :: IO [StackEntry] +userFunction = do + putStr "" + stk <- cloneMyStack + putStr "" + es <- decode stk + putStr "" + return es + +main :: IO () +main = do + entries <- userFunction + let ours = filter ((== "Main") . moduleName) entries + mapM_ (\e -> putStrLn (moduleName e ++ "\t" ++ functionName e)) ours ===================================== testsuite/tests/rts/ipe/T27408.stdout ===================================== @@ -0,0 +1,3 @@ +Main +Main main +Main userFunction ===================================== testsuite/tests/rts/ipe/all.T ===================================== @@ -4,6 +4,16 @@ def noCapabilityOutputFilter(s): test('ipeMap', [extra_files(['ipe_lib.c', 'ipe_lib.h']), c_src, omit_ghci], compile_and_run, ['ipe_lib.c']) +# Return frames whose Cmm block is dominated by inlined library ticks (e.g. the +# (>>)/(>>=) of a user do-block at -O) should still be attributed to the user's +# module. See Note [Prefer current-module source ticks for return frames] in +# GHC.Driver.GenerateCgIPEStub. +test('T27408', + [ omit_ghci # cloneMyStack# is not available in ghci + , js_broken(22261) # cloneMyStack# not yet implemented in the JS backend + ], + compile_and_run, ['-O1 -finfo-table-map -g3']) + # Manually create IPE entries and dump them to event log (stderr). test('ipeEventLog', [ c_src, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0d15e5c07946bc36198706eefd457b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0d15e5c07946bc36198706eefd457b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/interactive-error-hints] Add a flag to control GHCi specific error hints (close #27409)
by Simon Hengel (＠sol) 21 Jun '26

21 Jun '26

Simon Hengel pushed to branch wip/sol/interactive-error-hints at Glasgow Haskell Compiler / GHC Commits: a350548f by Simon Hengel at 2026-06-21T21:23:29+07:00 Add a flag to control GHCi specific error hints (close #27409) - - - - - 10 changed files: - + changelog.d/interactive-error-hints - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Outputable.hs - docs/users_guide/ghci.rst - ghc/GHCi/UI/Exception.hs - ghc/Main.hs - testsuite/tests/ghci/scripts/ghci024.stdout Changes: ===================================== changelog.d/interactive-error-hints ===================================== @@ -0,0 +1,6 @@ +section: compiler +synopsis: + Add flags `-finteractive-error-hints` / `-fno-interactive-error-hints` that + control whether GHCi specific error hints are printed. +issues: #27409 +mrs: !16225 ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -1570,6 +1570,7 @@ initSDocContext dflags style = SDC , sdocLineLength = pprCols dflags , sdocCanUseUnicode = useUnicode dflags , sdocPrintErrIndexLinks = overrideWith (canUseErrorLinks dflags) (useErrorLinks dflags) + , sdocInteractiveErrorHints = gopt Opt_InteractiveErrorHints dflags , sdocHexWordLiterals = gopt Opt_HexWordLiterals dflags , sdocPprDebug = dopt Opt_D_ppr_debug dflags , sdocPrintUnicodeSyntax = gopt Opt_PrintUnicodeSyntax dflags ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -861,6 +861,7 @@ data GeneralFlag -- Error message suppression | Opt_ShowErrorContext + | Opt_InteractiveErrorHints -- Object code determinism | Opt_ObjectDeterminism ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -2665,6 +2665,7 @@ fFlagsDeps = [ (addWarn "-compact-unwind is only implemented by the darwin platform. Ignoring.") return dflags)), flagSpec "show-error-context" Opt_ShowErrorContext, + flagSpec "interactive-error-hints" Opt_InteractiveErrorHints, flagSpec "cmm-thread-sanitizer" Opt_CmmThreadSanitizer, flagSpec "split-sections" Opt_SplitSections, flagSpec "break-points" Opt_InsertBreakpoints, ===================================== compiler/GHC/Types/Hint/Ppr.hs ===================================== @@ -43,19 +43,44 @@ instance Outputable GhcHint where -> case extHint of SuggestSingleExtension extraUserInfo ext -> ("Perhaps you intended to use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False SuggestAnyExtension extraUserInfo exts -> (enable "any" <+> unquotedListWith "or" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo True SuggestExtensions extraUserInfo exts -> (enable "all" <+> unquotedListWith "and" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo False SuggestExtensionInOrderTo extraUserInfo ext -> ("Use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False where extension_with_implied ext = "the" <+> quotes (ppr ext) <+> "extension" <+> pprImpliedExtensions ext implied ext = quotes (ppr ext) <+> pprImpliedExtensions ext enable any_or_all = "Enable" <+> any_or_all <+> "of the following extensions" <> colon + + interactiveErrorHints :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + interactiveErrorHints exts doc enable_any = sdocOption sdocInteractiveErrorHints $ \ case + True -> suggestSetExt exts doc enable_any + False -> doc + + -- Suggest enabling extension with :set -X<ext> + -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing + suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds + where + header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" + which + | [ _ext ] <- exts + = text "this" + | otherwise + = if enable_any + then text "these" + else text "all of these" + exts_cmds + | enable_any + = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts + | otherwise + = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) + SuggestCorrectPragmaName suggestions -> text "Perhaps you meant" <+> quotedListWithOr (map text suggestions) SuggestMissingDo ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -398,6 +398,7 @@ data SDocContext = SDC -- ^ True if Unicode encoding is supported -- and not disabled by GHC_NO_UNICODE environment variable , sdocPrintErrIndexLinks :: !Bool + , sdocInteractiveErrorHints :: !Bool , sdocHexWordLiterals :: !Bool , sdocPprDebug :: !Bool , sdocPrintUnicodeSyntax :: !Bool @@ -466,6 +467,7 @@ defaultSDocContext = SDC , sdocLineLength = defaultSDocCols , sdocCanUseUnicode = False , sdocPrintErrIndexLinks = False + , sdocInteractiveErrorHints = False , sdocHexWordLiterals = False , sdocPprDebug = False , sdocPrintUnicodeSyntax = False ===================================== docs/users_guide/ghci.rst ===================================== @@ -2114,6 +2114,27 @@ mostly obvious. If disabled, only the target given last on the command line interface will be added to interactive context of the GHCi session. +.. ghc-flag:: -finteractive-error-hints + :shortdesc: Print GHCi specific error hints. + :type: dynamic + :reverse: -fno-interactive-error-hints + :category: + + :default: on + :since: XXX + + By default, GHCi extends error hints with GHCi specific instructions. + + Example: + + .. code-block:: none + + Perhaps you intended to use the ‘BlockArguments’ extension + You may enable this language extension in GHCi with: + :set -XBlockArguments + + This can be disabled with `-fno-interactive-error-hints`. + Packages ~~~~~~~~ ===================================== ghc/GHCi/UI/Exception.hs ===================================== @@ -23,8 +23,6 @@ import GHC.Driver.Errors.Types import GHC.Iface.Errors.Ppr import GHC.Iface.Errors.Types -import qualified GHC.LanguageExtensions as LangExt - import GHC.Tc.Errors.Ppr import GHC.Tc.Errors.Types @@ -137,7 +135,7 @@ instance Diagnostic GhciMessage where GhciUnknownMessage m -> diagnosticReason m diagnosticHints = \case - GhciGhcMessage m -> map GhciGhcHint (ghciDiagnosticHints m) + GhciGhcMessage m -> map GhciGhcHint (diagnosticHints m) GhciCommandMessage m -> map GhciCommandHint (diagnosticHints m) GhciUnknownMessage m -> diagnosticHints m @@ -146,40 +144,6 @@ instance Diagnostic GhciMessage where GhciCommandMessage m -> diagnosticCode m GhciUnknownMessage m -> diagnosticCode m - --- | Modifications to hint messages which we want to display in GHCi. -ghciDiagnosticHints :: GhcMessage -> [GhcHint] -ghciDiagnosticHints msg = map modifyHintForGHCi (diagnosticHints msg) - where - modifyHintForGHCi :: GhcHint -> GhcHint - modifyHintForGHCi = \case - SuggestExtension extHint -> SuggestExtension $ modifyExtHintForGHCi extHint - hint -> hint - modifyExtHintForGHCi :: LanguageExtensionHint -> LanguageExtensionHint - modifyExtHintForGHCi = \case - SuggestSingleExtension doc ext -> SuggestSingleExtension (suggestSetExt [ext] doc False) ext - SuggestExtensionInOrderTo doc ext -> SuggestExtensionInOrderTo (suggestSetExt [ext] doc False) ext - SuggestAnyExtension doc exts -> SuggestAnyExtension (suggestSetExt exts doc True ) exts - SuggestExtensions doc exts -> SuggestExtensions (suggestSetExt exts doc False) exts - -- Suggest enabling extension with :set -X<ext> - -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing - suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc - suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds - where - header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" - which - | [ _ext ] <- exts - = text "this" - | otherwise - = if enable_any - then text "these" - else text "all of these" - exts_cmds - | enable_any - = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts - | otherwise - = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) - -- | Modifications to error messages which we want to display in GHCi ghciDiagnosticMessage :: GhcMessageOpts -> GhcMessage -> DecoratedSDoc ghciDiagnosticMessage ghc_opts msg = ===================================== ghc/Main.hs ===================================== @@ -199,6 +199,7 @@ main' postLoadMode units dflags0 args flagWarnings = do | DoRun <- postLoadMode = def_ghci_flags | otherwise = dflags1 where def_ghci_flags = dflags1 `gopt_set` Opt_ImplicitImportQualified + `gopt_set` Opt_InteractiveErrorHints `gopt_set` Opt_IgnoreOptimChanges `gopt_set` Opt_IgnoreHpcChanges -- Setting this by default has the nice effect that ===================================== testsuite/tests/ghci/scripts/ghci024.stdout ===================================== @@ -12,6 +12,7 @@ other dynamic, non-language, flag settings: -fimplicit-import-qualified -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a350548f23f793f4244e76d5a606d57… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a350548f23f793f4244e76d5a606d57… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/decode-orig-update-frames] ghc-heap: Expose OrigThunkInfo frames
by Ben Gamari (＠bgamari) 21 Jun '26

21 Jun '26

Ben Gamari pushed to branch wip/decode-orig-update-frames at Glasgow Haskell Compiler / GHC Commits: d0789dfe by Ben Gamari at 2026-06-21T10:19:10-04:00 ghc-heap: Expose OrigThunkInfo frames Introduce a new constructor to StgStackFrame which exposes orig_update_frames, allowing better backtraces when this feature is enabled. - - - - - 3 changed files: - libraries/ghc-internal/cbits/Stack.cmm - libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs - libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs Changes: ===================================== libraries/ghc-internal/cbits/Stack.cmm ===================================== @@ -3,6 +3,10 @@ #include "Cmm.h" +#if !defined(UnregisterisedCompiler) +import CLOSURE stg_orig_thunk_info_frame_info; +#endif + // StgStack_marking was not available in the Stage0 compiler at the time of // writing. Because, it has been added to derivedConstants when Stack.cmm was // developed. @@ -168,6 +172,18 @@ getStackInfoTableAddrzh(P_ stack) { return (info); } +// (StgInfoTable*) getOrigThunkInfoPtrzh(StgStack* stack, StgWord offsetWords) +getOrigThunkInfoPtrzh(P_ stack, W_ offsetWords) { + P_ p; + p = StgStack_sp(stack) + WDS(offsetWords); + ASSERT(LOOKS_LIKE_CLOSURE_PTR(p)); + if (%INFO_PTR(UNTAG(p)) == stg_orig_thunk_info_frame_info) { + return (StgOrigThunkInfoFrame_info_ptr(UNTAG(p))); + } else { + return (NULL); + } +} + // (StgClosure*) getStackClosurezh(StgStack* stack, StgWord offsetWords) getStackClosurezh(P_ stack, W_ offsetWords) { P_ ptr; ===================================== libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs ===================================== @@ -568,6 +568,17 @@ data GenStackFrame b = , stack_payload :: ![GenStackField b] } + -- | An @stg_orig_thunk_info_frame@ pushed by @-forig-thunk-info@. It records + -- the original info table of the thunk being updated (in 'orig_info_tbl'), + -- which is otherwise lost when the thunk is blackholed. + -- See @Note [Original thunk info table frames]@ in "GHC.StgToCmm.Bind". + | OrigThunkInfo + { info_tbl :: !StgInfoTable + -- ^ the frame's own (RTS) info table + , orig_info_tbl :: !(Ptr StgInfoTable) + -- ^ the original info table of the thunk being updated + } + | RetFun { info_tbl :: !StgInfoTable , retFunSize :: !Word ===================================== libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs ===================================== @@ -192,6 +192,16 @@ foreign import prim "getInfoTableAddrszh" getInfoTableAddrs# :: StackSnapshot# - foreign import prim "getStackInfoTableAddrzh" getStackInfoTableAddr# :: StackSnapshot# -> Addr# +foreign import prim "getOrigThunkInfoPtrzh" getOrigThunkInfoPtr# :: StackSnapshot# -> Word# -> Addr# + +-- | @'Just' itbl@ if the frame at the given offset is an +-- @stg_orig_thunk_info_frame@ (where @itbl@ is the recorded original thunk +-- info table), otherwise 'Nothing'. +origThunkInfoFrame :: StackSnapshot# -> WordOffset -> Maybe (Ptr StgInfoTable) +origThunkInfoFrame stackSnapshot# index = + let p = Ptr (getOrigThunkInfoPtr# stackSnapshot# (wordOffsetToWord# index)) + in if p == nullPtr then Nothing else Just p + -- | Get the 'StgInfoTable' of the stack frame. -- Additionally, provides 'InfoProv' for the 'StgInfoTable' if there is any. getInfoTableOnStack :: StackSnapshot# -> WordOffset -> IO (StgInfoTable, Maybe InfoProv) @@ -380,6 +390,15 @@ unpackStackFrameTo (StackSnapshot stackSnapshot#, index) unpackUnderflowFrame fi bco = bco', bcoArgs = bcoArgs' } + RET_SMALL + | Just orig_itbl <- origThunkInfoFrame stackSnapshot# index -> do + orig_info_prov <- lookupIPE (castPtr orig_itbl) + finaliseStackFrame + OrigThunkInfo + { info_tbl = info, + orig_info_tbl = orig_itbl + } + orig_info_prov RET_SMALL -> let payload' = decodeSmallBitmap getSmallBitmap# stackSnapshot# index offsetStgClosurePayload in View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0789dfe174f086897f84a3b483e288… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d0789dfe174f086897f84a3b483e288… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/decode-orig-update-frames
by Ben Gamari (＠bgamari) 21 Jun '26

21 Jun '26

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

1 0

[Git][ghc/ghc][wip/tick-prefer-anf] Core: Preserve ANF when ticking a tick-headed expression (#27415)
by Ben Gamari (＠bgamari) 21 Jun '26

21 Jun '26

Ben Gamari pushed to branch wip/tick-prefer-anf at Glasgow Haskell Compiler / GHC Commits: 5db84ad6 by Ben Gamari at 2026-06-21T10:16:00-04:00 Core: Preserve ANF when ticking a tick-headed expression (#27415) `mkTickCpe` promises not to push a tick onto the arguments of an application, so that CorePrep's ANF invariant is maintained: an argument must be trivial and, in particular, tick-free (see the `arg` non-terminal in Note [CorePrep invariants] and Note [mkTick breaks ANF]). `getStgArgFromTrivialArg` relies on this. However, its handling of a tick-headed expression delegated to `tickTickedExpr`, which, when commuting the new tick past the existing tick stack and pushing it inwards, called `mkTick` (i.e. `mk_tick False`) directly -- silently dropping ANF preservation and re-enabling PSCC3. With `-prof -fprof-auto -finfo-table-map`, a definition such as foo = Just id has its body wrapped in an SCC by `-fprof-auto`. The SCC is commuted past the source notes heading the `Just` application and, with `preserve_anf` lost, pushed onto the (function-valued) argument as `(scc<foo> breakpoint) @a`. That argument is no longer trivial, so `getStgArgFromTrivialArg` panicked: getStgArgFromTrivialArg (scc<foo> id) @a_aiNd Fixes #27415. - - - - - 4 changed files: - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - + testsuite/tests/profiling/should_compile/T27415.hs - testsuite/tests/profiling/should_compile/all.T Changes: ===================================== compiler/GHC/Core/Utils.hs ===================================== @@ -343,7 +343,7 @@ mk_tick preserve_anf t orig_expr = mkTick' orig_expr mkTick' expr -- Deal with ticking a expression headed by one or more ticks. | Just (ts, e) <- tickedExpr_maybe expr - = tickTickedExpr t ts e + = tickTickedExpr preserve_anf t ts e mkTick' expr = case expr of Lam x e @@ -413,11 +413,13 @@ mk_tick preserve_anf t orig_expr = mkTick' orig_expr -- | Apply a tick to an expression headed by ticks. tickTickedExpr - :: CoreTickish -- ^ tick to add + :: Bool -- ^ preserve ANF? (See 'mkTickCpe' and + -- Note [mkTick breaks ANF] in GHC.CoreToStg.Prep) + -> CoreTickish -- ^ tick to add -> NE.NonEmpty CoreTickish -- ^ existing stack of ticks -> CoreExpr -- ^ inner core expression -> CoreExpr -tickTickedExpr t1 t2s e +tickTickedExpr preserve_anf t1 t2s e -- Case 1: common up 't1' with a tick in the stack. -- @@ -431,8 +433,24 @@ tickTickedExpr t1 t2s e -- Case 2: 't1' can be commuted past all the ticks in the stack, e.g. because -- it has tighter placement properties than all the ticks in the stack. -- Push it inwards to expose cancellation opportunities. + -- + -- We must thread 'preserve_anf' through here. Otherwise we may turn the + -- argument + -- + -- scc<f> (src<l> (Just x)) + -- + -- into the ill-formed argument + -- + -- src<l> (Just (scc<f> x)) -- SCC on an argument: not a CpeArg! + -- + -- whereas with preserve_anf we keep the SCC outside the application, + -- respecting ANF: + -- + -- src<l> (scc<f> (Just breakpoint)) + -- + -- See Note [mkTick breaks ANF] in GHC.CoreToStg.Prep and #27415. | all (tickishCommutable t1) t2s - = apply_ticks t2s $ mkTick t1 e + = apply_ticks t2s $ mk_tick preserve_anf t1 e -- Fallback: keep the new tick on the outside. | otherwise @@ -455,7 +473,7 @@ tickTickedExpr t1 t2s e {- Note [Pushing SCCs inwards] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Amongst all ticks, SCCs have the laxest placement properties (PlaceCostCentre, +Amongst all ticks, SCCs have the most lax placement properties (PlaceCostCentre, as described in Note [Tickish placement] GHC.Types.Tickish): (PSCC1) SCCs around non-function variables can be eliminated. ===================================== compiler/GHC/CoreToStg/Prep.hs ===================================== @@ -918,10 +918,14 @@ mkTick will push the SCC into the constructor application, resulting in: \ (eta :: Char -> Bool) -> BindP (p :: Int) (scc<oneM> eta) +i.e. the SCC ends up on the argument `eta`, which is no longer a valid `arg`. + To avoid this problem (at least until 'mkTick' is more thoroughly reworked to avoid this infelicity, see #27141), we define a variant of 'mkTick', called 'mkTickCpe', which does not push ticks into constructor applications (this is -the only optimisation done by 'mkTick' that can break ANF). +the only optimisation done by 'mkTick' that can break ANF). This is the concrete +meaning of the 'preserve_anf' flag threaded through 'GHC.Core.Utils.mk_tick': +when set, 'mk_tick' will not push a tick onto an application's arguments (PSCC3). We prefer using a small variant of 'mkTick' rather than using the 'Tick' constructor, as the latter can slightly degrade profiling reports by failing to ===================================== testsuite/tests/profiling/should_compile/T27415.hs ===================================== @@ -0,0 +1,10 @@ +{-# LANGUAGE ExistentialQuantification #-} + +module T27415 where + +import Control.Concurrent.MVar + +data ResultVar b = forall a . ResultVar (a -> b) (MVar (Maybe a)) + +mkResultVar :: MVar (Maybe a) -> ResultVar a +mkResultVar = ResultVar id ===================================== testsuite/tests/profiling/should_compile/all.T ===================================== @@ -23,3 +23,4 @@ test('T20938', [test_opts], compile, ['-O -prof']) test('T26056', [test_opts], compile, ['-O -prof']) test('T27121', [test_opts, extra_files(['T27121_aux.hs'])], multimod_compile, ['T27121', '-v0 -O -prof -fprof-auto']) test('T27182', [test_opts], compile, ['-O -prof -fprof-late']) +test('T27415', [test_opts], compile, ['-O -prof -fprof-auto -finfo-table-map']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5db84ad62896fbf5f8e2f2d70dd9e46… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5db84ad62896fbf5f8e2f2d70dd9e46… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/tick-prefer-anf
by Ben Gamari (＠bgamari) 21 Jun '26

21 Jun '26

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

1 0

[Git][ghc/ghc][wip/sol/interactive-error-hints] Add a flag to control GHCi specific error hints (close #27409)
by Simon Hengel (＠sol) 21 Jun '26

21 Jun '26

Simon Hengel pushed to branch wip/sol/interactive-error-hints at Glasgow Haskell Compiler / GHC Commits: ba2cf957 by Simon Hengel at 2026-06-21T13:01:45+07:00 Add a flag to control GHCi specific error hints (close #27409) - - - - - 9 changed files: - + changelog.d/interactive-error-hints - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Outputable.hs - docs/users_guide/ghci.rst - ghc/GHCi/UI/Exception.hs - ghc/Main.hs Changes: ===================================== changelog.d/interactive-error-hints ===================================== @@ -0,0 +1,6 @@ +section: compiler +synopsis: + Add flags `-finteractive-error-hints` / `-fno-interactive-error-hints` that + control whether GHCi specific error hints are printed. +issues: #27409 +mrs: !16225 ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -1570,6 +1570,7 @@ initSDocContext dflags style = SDC , sdocLineLength = pprCols dflags , sdocCanUseUnicode = useUnicode dflags , sdocPrintErrIndexLinks = overrideWith (canUseErrorLinks dflags) (useErrorLinks dflags) + , sdocInteractiveErrorHints = gopt Opt_InteractiveErrorHints dflags , sdocHexWordLiterals = gopt Opt_HexWordLiterals dflags , sdocPprDebug = dopt Opt_D_ppr_debug dflags , sdocPrintUnicodeSyntax = gopt Opt_PrintUnicodeSyntax dflags ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -861,6 +861,7 @@ data GeneralFlag -- Error message suppression | Opt_ShowErrorContext + | Opt_InteractiveErrorHints -- Object code determinism | Opt_ObjectDeterminism ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -2665,6 +2665,7 @@ fFlagsDeps = [ (addWarn "-compact-unwind is only implemented by the darwin platform. Ignoring.") return dflags)), flagSpec "show-error-context" Opt_ShowErrorContext, + flagSpec "interactive-error-hints" Opt_InteractiveErrorHints, flagSpec "cmm-thread-sanitizer" Opt_CmmThreadSanitizer, flagSpec "split-sections" Opt_SplitSections, flagSpec "break-points" Opt_InsertBreakpoints, ===================================== compiler/GHC/Types/Hint/Ppr.hs ===================================== @@ -43,19 +43,44 @@ instance Outputable GhcHint where -> case extHint of SuggestSingleExtension extraUserInfo ext -> ("Perhaps you intended to use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False SuggestAnyExtension extraUserInfo exts -> (enable "any" <+> unquotedListWith "or" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo True SuggestExtensions extraUserInfo exts -> (enable "all" <+> unquotedListWith "and" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo False SuggestExtensionInOrderTo extraUserInfo ext -> ("Use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False where extension_with_implied ext = "the" <+> quotes (ppr ext) <+> "extension" <+> pprImpliedExtensions ext implied ext = quotes (ppr ext) <+> pprImpliedExtensions ext enable any_or_all = "Enable" <+> any_or_all <+> "of the following extensions" <> colon + + interactiveErrorHints :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + interactiveErrorHints exts doc enable_any = sdocOption sdocInteractiveErrorHints $ \ case + True -> suggestSetExt exts doc enable_any + False -> doc + + -- Suggest enabling extension with :set -X<ext> + -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing + suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds + where + header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" + which + | [ _ext ] <- exts + = text "this" + | otherwise + = if enable_any + then text "these" + else text "all of these" + exts_cmds + | enable_any + = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts + | otherwise + = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) + SuggestCorrectPragmaName suggestions -> text "Perhaps you meant" <+> quotedListWithOr (map text suggestions) SuggestMissingDo ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -398,6 +398,7 @@ data SDocContext = SDC -- ^ True if Unicode encoding is supported -- and not disabled by GHC_NO_UNICODE environment variable , sdocPrintErrIndexLinks :: !Bool + , sdocInteractiveErrorHints :: !Bool , sdocHexWordLiterals :: !Bool , sdocPprDebug :: !Bool , sdocPrintUnicodeSyntax :: !Bool @@ -466,6 +467,7 @@ defaultSDocContext = SDC , sdocLineLength = defaultSDocCols , sdocCanUseUnicode = False , sdocPrintErrIndexLinks = False + , sdocInteractiveErrorHints = False , sdocHexWordLiterals = False , sdocPprDebug = False , sdocPrintUnicodeSyntax = False ===================================== docs/users_guide/ghci.rst ===================================== @@ -2114,6 +2114,27 @@ mostly obvious. If disabled, only the target given last on the command line interface will be added to interactive context of the GHCi session. +.. ghc-flag:: -finteractive-error-hints + :shortdesc: Print GHCi specific error hints. + :type: dynamic + :reverse: -fno-interactive-error-hints + :category: + + :default: on + :since: XXX + + By default, GHCi extends error hints with GHCi specific instructions. + + Example: + + .. code-block:: none + + Perhaps you intended to use the ‘BlockArguments’ extension + You may enable this language extension in GHCi with: + :set -XBlockArguments + + This can be disabled with `-fno-interactive-error-hints`. + Packages ~~~~~~~~ ===================================== ghc/GHCi/UI/Exception.hs ===================================== @@ -23,8 +23,6 @@ import GHC.Driver.Errors.Types import GHC.Iface.Errors.Ppr import GHC.Iface.Errors.Types -import qualified GHC.LanguageExtensions as LangExt - import GHC.Tc.Errors.Ppr import GHC.Tc.Errors.Types @@ -137,7 +135,7 @@ instance Diagnostic GhciMessage where GhciUnknownMessage m -> diagnosticReason m diagnosticHints = \case - GhciGhcMessage m -> map GhciGhcHint (ghciDiagnosticHints m) + GhciGhcMessage m -> map GhciGhcHint (diagnosticHints m) GhciCommandMessage m -> map GhciCommandHint (diagnosticHints m) GhciUnknownMessage m -> diagnosticHints m @@ -146,40 +144,6 @@ instance Diagnostic GhciMessage where GhciCommandMessage m -> diagnosticCode m GhciUnknownMessage m -> diagnosticCode m - --- | Modifications to hint messages which we want to display in GHCi. -ghciDiagnosticHints :: GhcMessage -> [GhcHint] -ghciDiagnosticHints msg = map modifyHintForGHCi (diagnosticHints msg) - where - modifyHintForGHCi :: GhcHint -> GhcHint - modifyHintForGHCi = \case - SuggestExtension extHint -> SuggestExtension $ modifyExtHintForGHCi extHint - hint -> hint - modifyExtHintForGHCi :: LanguageExtensionHint -> LanguageExtensionHint - modifyExtHintForGHCi = \case - SuggestSingleExtension doc ext -> SuggestSingleExtension (suggestSetExt [ext] doc False) ext - SuggestExtensionInOrderTo doc ext -> SuggestExtensionInOrderTo (suggestSetExt [ext] doc False) ext - SuggestAnyExtension doc exts -> SuggestAnyExtension (suggestSetExt exts doc True ) exts - SuggestExtensions doc exts -> SuggestExtensions (suggestSetExt exts doc False) exts - -- Suggest enabling extension with :set -X<ext> - -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing - suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc - suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds - where - header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" - which - | [ _ext ] <- exts - = text "this" - | otherwise - = if enable_any - then text "these" - else text "all of these" - exts_cmds - | enable_any - = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts - | otherwise - = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) - -- | Modifications to error messages which we want to display in GHCi ghciDiagnosticMessage :: GhcMessageOpts -> GhcMessage -> DecoratedSDoc ghciDiagnosticMessage ghc_opts msg = ===================================== ghc/Main.hs ===================================== @@ -199,6 +199,7 @@ main' postLoadMode units dflags0 args flagWarnings = do | DoRun <- postLoadMode = def_ghci_flags | otherwise = dflags1 where def_ghci_flags = dflags1 `gopt_set` Opt_ImplicitImportQualified + `gopt_set` Opt_InteractiveErrorHints `gopt_set` Opt_IgnoreOptimChanges `gopt_set` Opt_IgnoreHpcChanges -- Setting this by default has the nice effect that View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ba2cf95766b9123dd6d1107c60ac22c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ba2cf95766b9123dd6d1107c60ac22c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/interactive-error-hints] Add new file
by Simon Hengel (＠sol) 21 Jun '26

21 Jun '26

Simon Hengel pushed to branch wip/sol/interactive-error-hints at Glasgow Haskell Compiler / GHC Commits: bda3322d by Simon Hengel at 2026-06-21T05:58:52+00:00 Add new file - - - - - 1 changed file: - + changelog.d/interactive-error-hints Changes: ===================================== changelog.d/interactive-error-hints ===================================== @@ -0,0 +1,4 @@ +section: compiler +synopsis: Add flags `-finteractive-error-hints` / `-fno-interactive-error-hints` that control whether GHCi specific error hints are printed. +issues: #27409 +mrs: !16225 \ No newline at end of file View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bda3322d62013931a6713cceb4889a9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bda3322d62013931a6713cceb4889a9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/interactive-error-hints
by Simon Hengel (＠sol) 21 Jun '26

21 Jun '26

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

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 33 commits: Implement CLC proposal #378
by Sven Tennie (＠supersven) 21 Jun '26

21 Jun '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: bab37cc6 by konsumlamm at 2026-06-13T19:10:21+02:00 Implement CLC proposal #378 Add `Data.Double` and `Data.Float` modules Document that GHC uses IEEE 754 - - - - - fb5246ad by fendor at 2026-06-15T18:07:23-04:00 Drop `preloadClosure` from `UnitState` It is always hard-coded to the same value. Backpack Unit instantiation isn't using it any more. Allows us to simplify the API and get rid of `improveUnit`. - - - - - 291ce3aa by ARATA Mizuki at 2026-06-15T18:08:26-04:00 RISC-V NCG: Zero-extend the result of castFloatToWord32 According to the ISA manual, FMV.X.W sign-extends the result. We need to truncate the result to avoid creating an exotic Word32 value. Fixes #27300 - - - - - 011be91f by ARATA Mizuki at 2026-06-15T18:08:26-04:00 RISC-V NCG: Treat d28-d31 (ft8-ft11) as caller-saved According to the calling convention, the registers d28-d31 (ft8-ft11) are caller-saved. Fixes #27306 - - - - - e8a54713 by ARATA Mizuki at 2026-06-15T18:08:26-04:00 RISC-V NCG: Set rounding mode when emitting `truncate` If we omit the rounding mode for `fcvt`, `dyn` will be used. We do not want that for `truncate`, so we set `rtz`. In other places, we set `rne` because we do not use the dynamic rounding mode. Fixes #27303 - - - - - 9438bec7 by Zubin Duggal at 2026-06-15T18:09:11-04:00 rts: fix validate build with gcc 16. `__attribute__((regparm(1)))` is ignored on x86_64 and now gcc warns that it is ignored: rts/sm/Evac.h:35:1: error: error: ‘regparm’ attribute ignored [-Werror=attributes] See https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ccead81bbc39668376eb5cf47066a… Fixes #27366 - - - - - 893e6133 by Andrew Lelechenko at 2026-06-15T23:55:36+01:00 base: more NonEmpty zips CLC proposal: https://github.com/haskell/core-libraries-committee/issues/409 - - - - - 1314f2fd by David Eichmann at 2026-06-16T05:46:52-04:00 Hadrian: fix ghc-internal .def file name - - - - - 7f72bcb3 by mangoiv at 2026-06-16T05:47:39-04:00 compiler: ignore camelCase and Eta reduce hlint hints These do not cohere with the style used in GHC. After disabling them, hlint lints are much less noisy again. - - - - - 842bef9f by Alan Zimmerman at 2026-06-16T05:48:25-04:00 EPA: Use standard type family declaration for Anno - - - - - f6d30767 by Wolfgang Jeltsch at 2026-06-16T15:32:34-04:00 Fix two issues in the documentation of pipeline interruption One issue is a typo (“interreuptible”), the other one the lack of an end of a sentence, which has been reconstructed from the message of 633bbc1fd4762a2bb73ba1c5b9e0c279f1dd3c40, the commit that introduced said documentation. - - - - - a3fa10e0 by Christian Georgii at 2026-06-16T15:33:26-04:00 Find plugins in sibling home units in multiple-home-unit sessions In a multiple-home-unit session (e.g. `cabal repl --enable-multi-repl` or HLS), enabling a plugin with -fplugin that is defined in (or reexported by) another home unit failed with a "hidden package" error. The plugin module finder only searched the current home unit and the registered external packages, never the sibling home units. findPluginModuleNoHsc now searches the home units that the current home unit depends on, following module reexports and respecting hidden modules, exactly as ordinary import resolution does in findImportedModuleNoHsc. To avoid two divergent copies of this logic, the shared home-unit search (the current home unit first, then its dependencies in priority order, with the accompanying ordering invariant) is extracted into findHomeModuleAmongDeps, which both findImportedModuleNoHsc and findPluginModuleNoHsc now call. Add testsuite/tests/driver/multipleHomeUnits/plugin01, which loads a plugin as byte-code from a sibling home unit, and plugin02, in which the consumer enables a plugin reexported by a sibling home unit without depending on the plugin's own home unit directly. Fixes #27349 - - - - - d216412b by Ian-Woo Kim at 2026-06-16T20:25:57-04:00 Make the order of usages deterministic It has been observed that the ordering of usages can be non-determinstic in parallel builds. Therefore, this contribution introduces sorting of usages based on a platform- and race-independent sorting criterion. Resolves #26877. Co-authored-by: Wolfgang Jeltsch <wolfgang(a)well-typed.com> - - - - - 8e1cc105 by Wolfgang Jeltsch at 2026-06-16T20:25:57-04:00 Change the descriptions of two existing changelog entries The descriptions now describe the changes in a user-friendly manner, as opposed to describing the contributions that led to these changes in a developer-friendly manner. - - - - - 636c1c7a by Ian Duncan at 2026-06-16T20:26:50-04:00 AArch64: use SXTH, not SXTW, for W32 signExtendReg signExtendReg was using SXTH (sign-extend halfword, 16-bit) for W32-to-W64 sign extension. This should be SXTW (sign-extend word, 32-bit). SXTH only sign-extends the lower 16 bits, producing wrong results for 32-bit values whose bit 15 differs from bit 31. Other fixes: - At sub-W64, code gen for MO_S_Mul2 should use W32 registers for SMULL source operands as per the ARM spec (SMULL Xd, Wn, Wm), and not W64. - Ensure signExtendReg uses the source width for the source operand in SXTW/SXTH/SXTB instructions. GNU as requires sxtw Xd,Wn (not sxtw Xd,Xn), while LLVM's integrated assembler on macOS is lenient. - Fix overflow flag computation for `MO_S_Mul2`. The overflow bit was exactly inverted for sub-W64 operands. Fixes #26978 and #27047 - - - - - b734c75d by Igor Ranieri at 2026-06-16T20:27:32-04:00 haddock: Update CONTRIBUTING with missing step, add missing test dependency - - - - - 7fe4f2ec by Luite Stegeman at 2026-06-17T05:35:09-04:00 tag inference: don't confuse functions with their return values inferTagRhs was mixing up taggedness for closures and return values for function closures. We really shouldn't assign TagTuple to a properly tagged function returning a tuple. We fix this by keeping track of functions (TagFun) separately from values (TagVal) and keeping track of their return value. TagFun is also used for join points. fixes #27005 - - - - - 4671c126 by Sebastian Graf at 2026-06-17T05:35:55-04:00 Seed the simplifier's in-scope set for open expressions simplifyExpr simplifies expressions typed at the GHCi prompt and the results of Template Haskell splices. Such an expression may be open: at a GHCi debugger breakpoint its free variables include RuntimeUnk skolems standing for as-yet-unknown types. The simplifier began with an in-scope set holding only the wildcard binder, so when it instantiated the unsafeCoerce# wrapper that GHCi builds around a result, it formed a substitution whose range mentioned a free skolem that was not in scope. That breaks the substitution invariant and, in a compiler built with assertions, trips substTy's sanity check. Seed the initial in-scope set with the free variables of the expression. For a closed expression this adds nothing. See Note [Seed the in-scope set for open expressions]. Fixes #17833 and its duplicate #21118. - - - - - 67d41299 by Sebastian Graf at 2026-06-18T05:18:24-04:00 Desugar a `case` scrutinee only once (#27383, #20251) In `dsExpr` for `HsCase` we desugared the scrutinee /twice/: once to build the Core `case` itself, and again inside `matchWrapper`, which re-desugared the source scrutinee (via `addHsScrutTmCs`) purely to record long-distance information for the pattern-match checker. For a single `case` that is merely wasteful. But for nested cases it is catastrophic. Consider case (case (case e of ... ) of ... ) of ... Desugaring the outer scrutinee desugars the middle `case` twice, each of which desugars the inner `case` twice, and so on. The work doubles at every level, so desugaring takes O(2^n) time in the nesting depth. That is the blowup reported in #27383; it is also what makes the machine-generated program in #20251 take an age to compile. The fix is simple. `matchWrapper` is handed the scrutinee anyway, so we give it the Core expression we have /already/ desugared, and record the long-distance term constraint with `addCoreScrutTmCs` instead of re-desugaring from source. This is just what `matchSinglePatVar` already does for single-pattern matches. So: * `matchWrapper` now takes `Maybe [CoreExpr]` rather than `Maybe [LHsExpr GhcTc]`. * The `HsCase` equation of `dsExpr` passes the already-desugared `core_discrim`; the arrow desugarer passes its match variables. * `addHsScrutTmCs` had no other use, so it is gone. Desugaring is now linear in the nesting depth. (The coverage checker still runs `simpleOptExpr` over each scrutinee, which leaves the total at O(n^2); that is ample.) The long-distance information itself is unchanged: the checker sees precisely the Core that backs the generated code. Test: deSugar/should_compile/T27383 - - - - - fa5defde by Rodrigo Mesquita at 2026-06-18T05:19:11-04:00 fix: Save FastStrings in the PMC There is no point in adding the unique to the occurrence FastString we create, since it is part of the Id anyway. Adding it to the FastString, meant each FastString was unique unnecessarily! In a separate branch, running the compiler on test `InstanceMatching` observed 30000 `FastString`s created by this code path. Plus, `fsLit "pm"` follows the existing pattern in `mkPmId`. - - - - - 4efb4a66 by Alan Zimmerman at 2026-06-18T14:41:14-04:00 TTG: Add extension points to HsConDetails Extend HsConDetails as data HsConDetails p arg rec = PrefixCon !(XPrefixCon p) [arg] -- C @t1 @t2 p1 p2 p3 | RecCon !(XRecCon p) rec -- C { x = p1, y = p2 } | InfixCon !(XInfixCon p) arg arg -- p1 `C` p2 | XHsConDetails !(XXHsConDetails p) type family XPrefixCon p type family XRecCon p type family XInfixCon p type family XXHsConDetails p - - - - - c8d27dd4 by Simon Jakobi at 2026-06-18T14:41:59-04:00 CI: quiet submodule clean output in after_script and setup The clean and cleanup_submodules functions ran 'git submodule foreach git clean -xdf', flooding the job log with 'Entering ...' and 'Removing ...' lines. Pass --quiet to 'git submodule' and -q to 'git clean' to drop the success output; errors are still reported. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 09326ca6 by Matthew Pickering at 2026-06-20T23:41:12+02:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - 521e55bf by Matthew Pickering at 2026-06-20T23:41:13+02:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 23c9b6c3 by Matthew Pickering at 2026-06-20T23:42:52+02:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: LinkableUsage02 ManyAlternatives ManyConstructors MultiComponentModulesRecomp MultiLayerModulesRecomp RecordUpdPerf T10421 T12150 T12227 T12425 T12707 T13035 T13379 T13820 T15703 T16577 T18140 T18282 T18698a T18698b T18923 T1969 T20049 T21839c T3294 T4801 T5030 T5321FD T5321Fun T5631 T5642 T6048 T783 T9020 T9198 T9233 T9630 T9872d T9961 parsing001 T3064 Metric Increase: T26989 hard_hole_fits ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> - - - - - 26fed8ab by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 80c8910e by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - 8215573d by Sven Tennie at 2026-06-20T23:42:52+02:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - 5acb7dbc by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. - - - - - 48345343 by Sven Tennie at 2026-06-20T23:42:52+02:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - 5e44fd05 by Sven Tennie at 2026-06-20T23:42:52+02:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - ab349ec2 by Sven Tennie at 2026-06-20T23:42:52+02:00 Fix T22744 for GHCJS In fact, this test needs Template Haskell, not necessarily an interpreter. - - - - - c73352d8 by Sven Tennie at 2026-06-20T23:42:52+02:00 haddock-test: fix GHCJS haddock test failures Add --ghc-pkg-path flag support so haddock test runner can find cross-prefixed ghc-pkg (e.g. javascript-unknown-ghcjs-ghc-pkg) which is not on $PATH in cross install directories. Skip haddockHtmlTest on GHCJS: Threaded.hs uses forkOS in a TH splice, which GHCJS RTS doesn't support. Mark with js_skip in all.T. - - - - - 216 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - + changelog.d/T17833 - + changelog.d/T26978 - + changelog.d/T27047 - + changelog.d/T27308 - + changelog.d/deterministic-usage-order - + changelog.d/fix-exponential-case-desugar-27383 - + changelog.d/fix-plugin-finder-multi-home-unit.md - changelog.d/module-graph-reuse-in-downsweep - changelog.d/more-efficient-home-unit-imports-finding - + changelog.d/stage2-cross-compilers - + changelog.d/tag-inference-27005 - compiler/.hlint.yaml - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToAsm/AArch64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToAsm/RV64/Instr.hs - compiler/GHC/CmmToAsm/RV64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/Regs.hs - compiler/GHC/Core/Opt/Simplify.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Data/List/NonEmpty.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Arrows.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match.hs-boot - compiler/GHC/HsToCore/Match/Constructor.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/EnforceEpt/Rewrite.hs - compiler/GHC/Stg/EnforceEpt/TagSig.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Unit.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Module/Deps.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Unit/Types.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - configure.ac - distrib/configure.ac.in - docs/users_guide/bugs.rst - hadrian/README.md - hadrian/bindist/config.mk.in - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Main.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Changelog.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.hs - libraries/base/base.cabal.in - libraries/base/changelog.md - + libraries/base/src/Data/Double.hs - + libraries/base/src/Data/Float.hs - libraries/base/src/Data/List/NonEmpty.hs - libraries/base/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Float.hs - m4/fp_find_nm.m4 - m4/prep_target_file.m4 - rts/sm/Evac.h - testsuite/ghc-config/ghc-config.hs - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxth-mul2.asm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxth-mul2.cmm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxtw.asm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxtw.cmm - testsuite/tests/codeGen/should_gen_asm/all.T - testsuite/tests/codeGen/should_run/T16617.hs - testsuite/tests/codeGen/should_run/T16617.stdout - + testsuite/tests/codeGen/should_run/aarch64-sxtw-cmm.cmm - + testsuite/tests/codeGen/should_run/aarch64-sxtw-run.hs - + testsuite/tests/codeGen/should_run/aarch64-sxtw-run.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/core-to-stg/T14895.stderr - + testsuite/tests/deSugar/should_compile/T27383.hs - testsuite/tests/deSugar/should_compile/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin01/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin01/appunit - + testsuite/tests/driver/multipleHomeUnits/plugin01/p/MyPlugin.hs - + testsuite/tests/driver/multipleHomeUnits/plugin01/pluginunit - + testsuite/tests/driver/multipleHomeUnits/plugin01/q/App.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin02/appunit - + testsuite/tests/driver/multipleHomeUnits/plugin02/p/MyPlugin.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/pluginunit - + testsuite/tests/driver/multipleHomeUnits/plugin02/q/App.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/r/RexLib.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/reexportunit - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/ghci.debugger/scripts/all.T - testsuite/tests/haddock/haddock_testsuite/Makefile - testsuite/tests/haddock/haddock_testsuite/all.T - testsuite/tests/haddock/should_compile_flag_haddock/T24221.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/javascript/closure/all.T - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/perf/compiler/all.T - testsuite/tests/printer/Test24533.stdout - testsuite/tests/simplCore/should_compile/T4201.stdout - + testsuite/tests/simplCore/should_run/T27005.hs - + testsuite/tests/simplCore/should_run/T27005.stdout - + testsuite/tests/simplCore/should_run/T27005_aux.hs - testsuite/tests/simplCore/should_run/all.T - testsuite/tests/simplStg/should_compile/T24806.hs - testsuite/tests/simplStg/should_compile/T24806.stderr - + testsuite/tests/simplStg/should_compile/T27005b.hs - + testsuite/tests/simplStg/should_compile/T27005b.stderr - testsuite/tests/simplStg/should_compile/all.T - testsuite/tests/simplStg/should_compile/inferTags004.hs - testsuite/tests/simplStg/should_compile/inferTags004.stderr - + testsuite/tests/simplStg/should_run/T27005a.hs - + testsuite/tests/simplStg/should_run/T27005a.stdout - testsuite/tests/simplStg/should_run/all.T - utils/check-exact/ExactPrint.hs - utils/haddock/CONTRIBUTING.md - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/haddock-test/haddock-test.cabal - utils/haddock/haddock-test/src/Test/Haddock/Config.hs - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/Test.html - utils/haddock/html-test/ref/TypeFamilies3.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0192cafe4afb31a125290b4231a4fc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0192cafe4afb31a125290b4231a4fc… You're receiving this email because of your account on gitlab.haskell.org.

1 0