[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: EPA: Start using vocurly as basis for AnnListLayout
by Marge Bot (@marge-bot) 16 Oct '26
by Marge Bot (@marge-bot) 16 Oct '26
16 Oct '26
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
f34c79ee by Alan Zimmerman at 2026-10-15T04:54:47-04:00
EPA: Start using vocurly as basis for AnnListLayout
For the existing cases that populate AnnList.
This uses AnnListBraces when braces are explicitly supplied, and
AnnListLayout when vocurly is used
The change also shows up AnnList usages that can never capture layout,
these are cleared up later.
- - - - -
033ba59c by sheaf at 2026-10-15T04:55:44-04:00
Make exprFreeVars deep
exprFreeVars used to be a shallow free-variable finder (it didn't look
into kinds), but most callers wanted it to be deep. In particular,
'exprFreeVars' is often used to seed an 'InScopeSet', and that must
contain the /deep/ free variables.
This commit makes it deep, which allows us to get rid of calls to
'closeOverKinds' or other workarounds for shallowness in:
- 'GHC.Core.Opt.Simplify.Utils.abstractFloats'
- 'GHC.HsToCore.Binds.dsSpec_help'
- 'GHC.Core.Opt.Arity.etaBodyForJoinPoint'
- 'GHC.Core.FVs.freeVars'
- 'GHC.Core.Lint.lintCoreRule'
We also remove 'deepExprsFreeVarsDSet' and 'closeOverKindsDSet'.
Other places needed a little bit more care, in particular to properly
handle coercion variables free in kinds:
- 'GHC.Core.Opt.Specialise.specHeader' quantifies over the binder of
an unspecialised argument directly, instead of computing the free Ids
of the argument.
- 'GHC.HsToCore.dsWarnRuleShadowing' filters out 'CoVar's.
- 'GHC.Core.Opt.SpecConstr.callToPat' had some ad-hoc logic to compute
argument pattern types and a workaround with 'expandTypeSynonyms'.
That logic is removed in favour of a new 'argsToPats' function which
directly computes the argument pattern types by instantiating the
type of the head of the call pattern.
Fixes #27936
- - - - -
f93d523c by Luite Stegeman at 2026-10-15T04:56:34-04:00
testsuite: Use mkWeakMVar in memo001/memo002
mkWeakPtr in the memo001/memo001 tests created weak pointers
with the MVar box as the key, which is fragile in the presence
of optimization. The fix is using mkWeakMVar, keying on the
primitive MVar# instead.
Fixes #27924 and #27396
- - - - -
8c947573 by Simon Peyton Jones at 2026-10-16T13:11:53+01:00
Improve exprOkForSpeculation
Fixes #27910, which exposed an infelicity in exprOkForSpeculation
The new story is carefully described in new Note [exprOkForSpeculation],
esp (a-c) and (EOKS1).
- - - - -
ff549ac9 by Alan Zimmerman at 2026-10-16T11:03:26-04:00
EPA: Add TTG fields to FamilyInfo
This commit is a simple add, with unused extension fields.
It lays the groundwork for using them for exact print annotations
- - - - -
46 changed files:
- + changelog.d/27936
- compiler/GHC/Core.hs
- compiler/GHC/Core/FVs.hs
- compiler/GHC/Core/Lint.hs
- compiler/GHC/Core/Opt/Arity.hs
- compiler/GHC/Core/Opt/Simplify/Utils.hs
- compiler/GHC/Core/Opt/SpecConstr.hs
- compiler/GHC/Core/Opt/Specialise.hs
- compiler/GHC/Core/Subst.hs
- compiler/GHC/Core/TyCo/FVs.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/Core/Utils.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore.hs
- compiler/GHC/HsToCore/Binds.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/Utils/TcType.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/Var/FV.hs
- compiler/Language/Haskell/Syntax/Decls.hs
- compiler/Language/Haskell/Syntax/Extension.hs
- libraries/base/tests/Memo1.lhs
- libraries/base/tests/Memo2.lhs
- libraries/base/tests/all.T
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- + testsuite/tests/simplCore/should_compile/T27910.hs
- + testsuite/tests/simplCore/should_compile/T27910.stderr
- + testsuite/tests/simplCore/should_compile/T27936.hs
- testsuite/tests/simplCore/should_compile/all.T
- utils/check-exact/ExactPrint.hs
- 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/Interface/Rename.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6786471c314300e35bab7fb8d99163…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6786471c314300e35bab7fb8d99163…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/romes/async-rpc] 3 commits: generalized handleRemoteCall to allow forking.
by Andrea Vezzosi (@trac-Saizan) 16 Oct '26
by Andrea Vezzosi (@trac-Saizan) 16 Oct '26
16 Oct '26
Andrea Vezzosi pushed to branch wip/romes/async-rpc at Glasgow Haskell Compiler / GHC
Commits:
753abb81 by Andrea Vezzosi at 2026-10-16T16:04:25+02:00
generalized handleRemoteCall to allow forking.
- - - - -
ed3ec8fc by Andrea Vezzosi at 2026-10-16T16:16:56+02:00
GHCi.Server: handle RunTH and RunModFinalizers in forked thread
- - - - -
ee5d2db0 by Andrea Vezzosi at 2026-10-16T16:21:54+02:00
wip: GHCi.Message.Async: pipeCloseWrite if pipeWrite encounters IOError.
- - - - -
3 changed files:
- libraries/ghci/GHCi/Message.hs
- libraries/ghci/GHCi/Message/Async.hs
- libraries/ghci/GHCi/Server.hs
Changes:
=====================================
libraries/ghci/GHCi/Message.hs
=====================================
@@ -55,7 +55,6 @@ import qualified GHC.Exts.Heap as Heap
import GHC.ForeignSrcLang
import GHC.Fingerprint
import GHC.Conc (pseq, par)
-import GHC.IO (IO(..))
import Control.Concurrent
import Control.DeepSeq
import Control.Exception
@@ -665,14 +664,11 @@ remoteCall pipe msg = either throwIO (pure . runGet get)
-- | Handle a single 'Message' request on the interpreter and reply to the host
handleRemoteCall :: Pipe
- -> (Msg -> IO Msg) {-^ Msg hook -}
+ -> (CorrelationId -> Msg -> (Msg -> IO ()) %1 -> IO ()) {-^ called with action that handles req and writes reply -}
-> (forall a. (Show a, Binary a) => Message a -> IO a)
-> IO ()
-handleRemoteCall pipe hook k =
- handleAsyncReq pipe getMessage Nothing \writer msg0 -> IO \s0 ->
- case hook msg0 |#> s0 of -- unIO for linearity checking
- (# s1, Msg msg #) -> case k msg |#> s1 of
- (# s2, a #) -> writeReply writer (put a) |#> s2
+handleRemoteCall pipe forkHandler k =
+ handleAsyncReq pipe getMessage Nothing (\(Msg msg) -> fmap put . k $ msg) forkHandler
-- | Send a 'THMessage' request to the host and wait for a reply from the host
-- to the interpreter.
@@ -690,7 +686,5 @@ remoteTHCall pipe ii msg = either throwIO (pure . runGet get)
handleRemoteTHCall
:: Pipe -> InboxId -> (forall a. (Show a, Binary a) => THMessage a -> IO a) -> IO ()
handleRemoteTHCall pipe ii k =
- handleAsyncReq pipe getTHMessage (Just ii) \writer (THMsg msg) -> IO \s0 ->
- case k msg |#> s0 of -- unIO for linearity checking
- (# s1, a #) -> writeReply writer (put a) |#> s1
+ handleAsyncReq pipe getTHMessage (Just ii) (\(THMsg msg) -> fmap put . k $ msg) $ \ _ msg hndlr -> hndlr msg
=====================================
libraries/ghci/GHCi/Message/Async.hs
=====================================
@@ -24,7 +24,7 @@ module GHCi.Message.Async
-- ** Consume `reply` exactly once
, WriteReply(..)
- , writeReply, (|#>)
+ , writeReply, (|#>), bindIO
-- * Serializable exceptions
, SerializableException(..)
@@ -135,7 +135,11 @@ instance Exception PipeReadClosedException
-- and identify whether they are requests or replies.
writePipe :: Pipe -> IddMsg -> IO ()
-writePipe p@Pipe{..} = withLock p . putAll . execPut . put
+writePipe p@Pipe{..} msg = withLock p $ do
+ putAll (execPut (put msg)) `catch` \(e :: IOError) -> do
+ pipeCloseWrite
+ -- TODO: do we need a pipeCloseWrite TVar ?
+ throwIO e
-- | Only the 'drainPipe' thread should read from the pipe directly. Other
-- functions should wait for the matching reply to be delivered asynchronously.
@@ -222,10 +226,9 @@ remoteAsyncReq pipe msg ii = do
-- It must be used exactly once (all requests expect a reply, and you can't
-- reply more than once). Linear types enforce the handler replies in every
-- branch, and if the handler otherwise throws, it is handled by 'handleAsyncReq'.
-handleAsyncReq :: Pipe -> Get a -> (Maybe InboxId) -> (WriteReply Put %1 -> a -> IO r) -> IO r
-handleAsyncReq pipe getit mii k = mask $ \restore -> do
+handleAsyncReq :: Pipe -> Get a -> (Maybe InboxId) -> (a -> IO Put) -> (CorrelationId -> a -> (a -> IO ()) %1 -> IO ()) -> IO ()
+handleAsyncReq pipe getit mii hndlr k = mask $ \restore -> do
let am = pipeAsyncMngr pipe
- ack <- newEmptyMVar
-- Block waiting for request
mbreq <- atomically $ do
@@ -243,7 +246,6 @@ handleAsyncReq pipe getit mii k = mask $ \restore -> do
Just (uq, bs) -> do
let reply p = do
writePipe pipe (Reply uq (bimap toSerializableException runPut p))
- putMVar ack ()
-- Run the continuation which must reply exactly once with 'writeReply'
case runGetOrFail getit bs of
@@ -251,20 +253,11 @@ handleAsyncReq pipe getit mii k = mask $ \restore -> do
let exc = DecodeAsyncReqException err
reply (Left (toException exc))
throwIO exc
- Right (_, _, it) ->
- restore (k (WriteReply reply) it)
-
- -- If there's an exception before the reply is sent, reply with an error instead.
- `catch` \(e :: SomeException) -> do
-
- tryTakeMVar ack >>= \case
- Just () ->
- -- Already replied
- throwIO e
- Nothing -> do
- -- Reply with an error
- reply (Left e)
- throwIO e
+ Right (_, _, it) -> k uq it (\ msg -> do
+ try @SomeException (restore (hndlr msg)) >>= \x -> do
+ reply x
+ either throwIO (const $ pure ()) x
+ )
-- | 'handleSyncReq' failed to decode an incoming request payload using the given @'Get' a@
newtype DecodeAsyncReqException = DecodeAsyncReqException String deriving Show
@@ -451,6 +444,11 @@ writeReply (WriteReply r) = \x -> r (Right x)
(|#>) :: IO a %1 -> State# RealWorld -> (# State# RealWorld, a #)
(|#>) (IO fs) s = fs s
+bindIO :: (IO a) -> (a -> IO b) %1 -> IO b
+bindIO = \ m f -> IO (\s0 ->
+ case m |#> s0 of -- unIO for linearity checking
+ (# s1, x #) -> f x |#> s1)
+
--------------------------------------------------------------------------------
-- * Serializable Exceptions
--------------------------------------------------------------------------------
=====================================
libraries/ghci/GHCi/Server.hs
=====================================
@@ -1,4 +1,4 @@
-{-# LANGUAGE LambdaCase, CPP, RankNTypes, RecordWildCards, GADTs, ScopedTypeVariables #-}
+{-# LANGUAGE LambdaCase, CPP, RankNTypes, RecordWildCards, GADTs, ScopedTypeVariables, LinearTypes #-}
module GHCi.Server
( MessageHook
, CustomMessageHandler
@@ -31,7 +31,6 @@ import GHCi.Utils
import Control.DeepSeq
import Control.Exception
import Control.Monad
-import Control.Concurrent (threadDelay)
import Data.Binary
import Text.Printf
@@ -39,6 +38,15 @@ import System.Environment (getProgName, getArgs)
import System.Exit
import System.IO
+import Control.Concurrent
+import Control.Concurrent.STM
+import Data.IntMap (IntMap)
+import qualified Data.IntMap as IM
+import GHCi.Message.Async (bindIO)
+import qualified Unsafe.Coerce as Unsafe
+
+type CorrelationId = Int
+
type MessageHook = Msg -> IO Msg
-- | How to interpret the 'CustomCommand'.
@@ -54,22 +62,71 @@ serv :: Bool -> MessageHook -> Pipe -> (forall a .IO a -> IO a) -> IO ()
serv verbose hook pipe restore =
servWithCustom verbose hook pipe restore noCustomHandler
+
+data ThreadManager = ThreadManager
+ { managedThreads :: !(TVar (IntMap ThreadId))
+ , managerClosed :: !(TVar Bool)
+ }
+
+-- | Cancels and Waits for all threads spawned by ThreadManager to terminate before returning.
+withThreadManager :: (ThreadManager -> IO a) -> IO a
+withThreadManager k = do
+ managedThreads <- newTVarIO IM.empty
+ managerClosed <- newTVarIO False
+ let tm = ThreadManager{..}
+ k tm `finally` shutdown tm
+ where
+ shutdown ThreadManager{..} = do
+ ts <- atomically $ do
+ writeTVar managerClosed True
+ IM.elems <$> readTVar managedThreads
+ mapM_ killThread ts
+
+spawn :: ThreadManager -> CorrelationId -> IO () %1 -> IO ()
+spawn mng i = Unsafe.unsafeCoerce (spawn' mng i)
+
+spawn' :: ThreadManager -> CorrelationId -> IO () -> IO ()
+spawn' ThreadManager{..} i action = void $ mask_ $ forkIOWithUnmask $ \unmask -> do
+ tid <- myThreadId
+ registered <- atomically $ do
+ s <- readTVar managerClosed
+ unless s $ modifyTVar' managedThreads (IM.insert i tid)
+ pure (not s)
+ when registered $
+ (unmask action)
+ `finally` atomically (modifyTVar' managedThreads (IM.delete i))
+
+-- could be used to cancel a specific handler.
+-- cancel :: ThreadManager -> CorrelationId -> IO ()
+-- cancel ThreadManager{..} i = do
+-- ts <- atomically $ do
+-- readTVar managedThreads
+-- case IM.lookup i ts of
+-- Just tid -> killThread tid
+-- Nothing -> pure ()
+
servWithCustom
:: Bool
-> MessageHook
-> Pipe
- -> (forall a .IO a -> IO a)
+ -> (forall a. IO a -> IO a)
-> CustomMessageHandler
-> IO ()
-servWithCustom verbose hook pipe restore customHandler = newIORef False >>= loop
+servWithCustom verbose hook pipe restore customHandler = do
+ ref <- newIORef False
+ withThreadManager $ \mngr ->
+ loop ref mngr `finally` closePipe pipe
where
- loop doneRef = do
+ forkHandler mngr uq hndlr msg0@(Msg msg) = do
+ (do discardCtrlC
+ when verbose $ trace ("msg: " ++ (show msg))) `bindIO` \ _ -> do
+ case msg of
+ RunTH{} -> spawn mngr uq (hndlr msg0)
+ RunModFinalizers{} -> spawn mngr uq (hndlr msg0)
+ _ -> hndlr msg0
+ loop doneRef mngr = do
when verbose $ trace "reading pipe..."
- handleRemoteCall pipe hook $ \(msg :: Message a) -> do
-
- discardCtrlC
-
- when verbose $ trace ("msg: " ++ (show msg))
+ handleRemoteCall pipe (\uq msg act -> hook msg `bindIO` forkHandler mngr uq act) $ \(msg :: Message a) -> do
case msg of
CustomMessage tag payload -> handleCustom tag payload
Shutdown -> writeIORef doneRef True >> reply ()
@@ -79,8 +136,8 @@ servWithCustom verbose hook pipe restore customHandler = newIORef False >>= loop
_other -> run msg >>= reply
isDone <- readIORef doneRef
- if isDone then closePipe pipe
- else loop doneRef
+ if isDone then pure ()
+ else loop doneRef mngr
handleCustom tag payload = do
mresp <- customHandler tag payload
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/66d87bcad518937a6d50ff2fe692bd…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/66d87bcad518937a6d50ff2fe692bd…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
16 Oct '26
Simon Peyton Jones pushed to branch wip/T27910 at Glasgow Haskell Compiler / GHC
Commits:
8c947573 by Simon Peyton Jones at 2026-10-16T13:11:53+01:00
Improve exprOkForSpeculation
Fixes #27910, which exposed an infelicity in exprOkForSpeculation
The new story is carefully described in new Note [exprOkForSpeculation],
esp (a-c) and (EOKS1).
- - - - -
6 changed files:
- compiler/GHC/Core.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/Core/Utils.hs
- + testsuite/tests/simplCore/should_compile/T27910.hs
- + testsuite/tests/simplCore/should_compile/T27910.stderr
- testsuite/tests/simplCore/should_compile/all.T
Changes:
=====================================
compiler/GHC/Core.hs
=====================================
@@ -490,7 +490,7 @@ This is a well-kinded type, in an environment-based scheme. But `typeKind`
will panic, because the kind of the body of a forall must not mention
the forall'd variable (and the inner forall's body appears to do so).
-It might be possible to make `exprType` and `typeKind`` more complicated, so that
+It might be possible to make `exprType` and `typeKind` more complicated, so that
they do renaming on the fly. But instead we impose
INVARIANT (NoTypeShadowing):
=====================================
compiler/GHC/Core/Type.hs
=====================================
@@ -55,7 +55,7 @@ module GHC.Core.Type (
splitForAllForAllTyBinders, splitForAllForAllTyBinder_maybe,
splitForAllTyCoVar_maybe, splitForAllTyCoVar,
splitForAllTyVar_maybe, splitForAllCoVar_maybe,
- splitPiTy_maybe, splitPiTy, splitPiTys, collectPiTyBinders,
+ splitPiTy_maybe, splitPiTy, splitPiTys, splitUninstantiatedValArgTys,
getRuntimeArgTys,
mkTyConBindersPreferAnon,
mkPiTy, mkPiTys,
@@ -263,7 +263,6 @@ import GHC.Utils.Monad.StrictReader
import GHC.Data.FastString
import GHC.Data.Maybe ( orElse, isJust )
-import GHC.List (build)
-- $type_classification
-- #type_classification#
@@ -1599,17 +1598,20 @@ splitPiTys ty = split ty ty []
split orig_ty ty bs | Just ty' <- coreView ty = split orig_ty ty' bs
split orig_ty _ bs = (reverse bs, orig_ty)
-collectPiTyBinders :: Type -> [PiTyBinder]
-collectPiTyBinders ty = build $ \c n ->
- let
- split (ForAllTy b res) = Named b `c` split res
- split (FunTy { ft_af = af, ft_mult = w, ft_arg = arg, ft_res = res })
- = Anon (Scaled w arg) af `c` split res
- split ty | Just ty' <- coreView ty = split ty'
- split _ = n
- in
- split ty
-{-# INLINE collectPiTyBinders #-}
+splitUninstantiatedValArgTys :: Type -> [Type]
+-- This function takes a type apart, returning all its /value/
+-- argument types (including (forall (co::t1~t2).t)
+-- doing no instantiation at all.
+-- E.g. splitUinstantiatedValArgTys (forall a. a -> Int -> T a)
+-- returns [a, Int]
+-- It's a pretty specialised function, hence its long name
+splitUninstantiatedValArgTys ty = go ty
+ where
+ go (ForAllTy (Bndr b _) res) | isCoVar b = varType b : go res
+ | otherwise = go res
+ go (FunTy { ft_arg = arg, ft_res = res }) = arg : go res
+ go ty | Just ty' <- coreView ty = go ty'
+ go _ = []
-- | Extracts a list of run-time arguments from a function type,
-- looking through newtypes to the right of arrows.
=====================================
compiler/GHC/Core/Utils.hs
=====================================
@@ -2207,6 +2207,8 @@ fun_always_ok _ = True
-- | A special version of 'exprOkForSpeculation' used during
-- Note [Speculative evaluation]. When the predicate arg `fun_ok` returns False
-- for `b`, then `b` is never considered ok-for-spec.
+--
+-- This is the whole reason for the fun_ok arg to expr_ok.
exprOkForSpecEval :: (Id -> Bool) -> CoreExpr -> Bool
exprOkForSpecEval fun_ok = expr_ok fun_ok primOpOkForSpeculation
@@ -2240,10 +2242,9 @@ expr_ok fun_ok primop_ok (Case scrut bndr _ alts)
&& altsAreExhaustive alts
expr_ok fun_ok primop_ok other_expr
- | (expr, args) <- collectArgs other_expr
+ | (expr, val_args) <- collectValArgs other_expr
= case stripTicksTopE (not . tickishCounts) expr of
- Var f ->
- app_ok fun_ok primop_ok f args
+ Var f -> app_ok fun_ok primop_ok f val_args
-- 'LitRubbish' is the only literal that can occur in the head of an
-- application and will not be matched by the above case (Var /= Lit).
@@ -2258,9 +2259,10 @@ expr_ok fun_ok primop_ok other_expr
-----------------------------
app_ok :: (Id -> Bool) -> (PrimOp -> Bool) -> Id -> [CoreArg] -> Bool
-app_ok fun_ok primop_ok fun args
+app_ok fun_ok primop_ok fun val_args
| not (fun_ok fun)
- = False -- This code path is only taken for Note [Speculative evaluation]
+ = False -- This code path is only taken for exprOkForSpecEval
+ -- See Note [Speculative evaluation]
| idArity fun > n_val_args
-- Partial application: just check passing the arguments is OK
@@ -2281,17 +2283,18 @@ app_ok fun_ok primop_ok fun args
ClassOpId _ is_terminating_result
| is_terminating_result -- See Note [exprOkForSpeculation and type classes]
- -> assertPpr (n_val_args == 1) (ppr fun $$ ppr args) $
+ -> assertPpr (n_val_args == 1) (ppr fun $$ ppr val_args) $
True
-- assert: terminating result type => can't be applied;
-- c.f the _other case below
PrimOpId op _
| primOpIsDiv op
- , Lit divisor <- last args
+ , Lit divisor <- last val_args
-- there can be 2 args (most div primops) or 3 args
-- (WordQuotRem2Op), hence the use of last/init
- -> not (isZeroLit divisor) && all (expr_ok fun_ok primop_ok) (init args)
+ -> not (isZeroLit divisor) &&
+ all ok_for_spec (init val_args)
-- Special case for dividing operations that fail
-- In general they are NOT ok-for-speculation
-- (which primop_ok will catch), but they ARE OK
@@ -2300,12 +2303,14 @@ app_ok fun_ok primop_ok fun args
-- can get rid of a thunk in an inner loop
| otherwise -> primop_ok op && args_ok
+ -- Assumes that the primop does not evaluate its
+ -- definitely-lifted arguments
_other -- Unlifted and terminating types;
-- Also c.f. the Var case of exprIsHNF
| isTerminatingType fun_ty -- See Note [exprOkForSpeculation and type classes]
|| definitelyUnliftedType fun_ty
- -> assertPpr (n_val_args == 0) (ppr fun $$ ppr args)
+ -> assertPpr (n_val_args == 0) (ppr fun $$ ppr val_args)
True -- Both terminating types (e.g. Eq a), and unlifted types (e.g. Int#)
-- are non-functions and so will have no value args. The assert is
-- just to check this.
@@ -2321,32 +2326,43 @@ app_ok fun_ok primop_ok fun args
-- for evaluated-ness of the fun;
-- see Note [exprOkForSpeculation and evaluated variables]
where
- fun_ty = idType fun
- n_val_args = valArgCount args
- (arg_tys, _) = splitPiTys fun_ty
+ ok_for_spec = expr_ok fun_ok primop_ok -- Used for recursive calls
+
+ fun_ty = idType fun
+ n_val_args = length val_args
+ val_arg_tys = splitUninstantiatedValArgTys fun_ty
+ -- val_arg_tys are /uninstantiated/; see (EOKS1)
-- Even if a function call itself is OK, any unlifted
-- args are still evaluated eagerly and must be checked
- args_ok = all2Prefix arg_ok arg_tys args
- arg_ok :: PiTyVarBinder -> CoreExpr -> Bool
- arg_ok (Named _) _ = True -- A type argument
- arg_ok (Anon ty _) arg -- A term argument
- | definitelyLiftedType (scaledThing ty)
- = True -- lifted args are not evaluated eagerly
- | otherwise
- = expr_ok fun_ok primop_ok arg
+ -- arg_ok bndr arg = field_ok bndr NotMarkedStrict arg
+ -- See Note [exprOkForSpeculation] (a,b)
+ args_ok = all2Prefix arg_ok val_arg_tys val_args
+ arg_ok :: Type -> CoreExpr -> Bool
+ arg_ok arg_ty arg = ok_for_spec arg || definitely_lifted arg_ty arg
-- Used for strict DataCon worker arguments
-- See (SFC1) of Note [Strict fields in Core]
- fields_ok str_marks = all3Prefix field_ok arg_tys str_marks args
- field_ok :: PiTyVarBinder -> StrictnessMark -> CoreExpr -> Bool
- field_ok (Named _) _ _ = True
- field_ok (Anon ty _) str arg
- | NotMarkedStrict <- str -- iff it's a lazy field
- , definitelyLiftedType (scaledThing ty) -- and its type is lifted
- = True -- then the worker app does not eval
- | otherwise
- = expr_ok fun_ok primop_ok arg
+ -- See Note [exprOkForSpeculation] (a,b)
+ fields_ok str_marks = all3Prefix field_ok val_arg_tys str_marks val_args
+ field_ok :: Type -> StrictnessMark -> CoreExpr -> Bool
+ field_ok arg_ty str arg
+ = ok_for_spec arg || (definitely_lifted arg_ty arg && str==NotMarkedStrict)
+ -- The (ok_for_spec arg) test works for /both/ for unlifted types, /and/
+ -- for lifted but strict fields. E.g. K (I# 3) is ok-for-spec,
+ -- even if K is strict
+
+ -- We want to see if the argument type is definitely lifted.
+ -- But consider
+ -- (#,#) @rep1 @rep2 @ty1 @ty2 arg1 arg2
+ -- We don't /instantiate/ the type of (#,#) (although we could) so we don't
+ -- know if the argument type is lifted or not. So we look at the type of
+ -- the /actual/ argument (it's usually a variable) instead.
+ definitely_lifted uninstantiated_arg_ty arg
+ = case typeLevity_maybe uninstantiated_arg_ty of
+ Just Lifted -> True
+ Just Unlifted -> False
+ Nothing -> definitelyLiftedType (exprType arg)
-----------------------------
altsAreExhaustive :: [Alt b] -> Bool
@@ -2390,8 +2406,42 @@ cantEtaReduceFun fun
-- Don't undersaturate StrictWorkerIds.
-- See Note [CBV Function Ids: overview] in GHC.Types.Id.Info.
-{- Note [exprOkForSpeculation and type classes]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{- Note [exprOkForSpeculation]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Suppose we have
+ data T a = K !a Int# a
+
+Is the call (K e1 e2 e3) ok-for-speculation? Look at the arguments e1..e3,
+and their types. The call is ok-for-speculation if each argument satisfies
+`field_ok`, namely:
+ (a) (exprOkForSpeculation arg) holds, OR
+ (b) Arg type is definitely lifted and it is not marked strict
+
+For (a) we conservatively assume we are going to evaluate the argument.
+If it is ok-for-spec, then fine.
+
+But if the argument is of a lifted type, and not marked strict (notably by
+a data constructor) then (b) holds. For example
+ Just (reverse xs)
+is ok-for-spec. See (EOKS1) for the argument liftedness test.
+
+If we have a plain variable `x`, is that ok-for-spec? Not if it is lifted:
+it might be a thunk! Hence the (definitelyUnliftedType fun_ty) test.
+Remember, a naked variable `x` will land in `app_ok x []` with no arguments.
+See Note [exprOkForSpeculation and evaluated variables].
+
+(EOKS1) To get the lifted-ness or otherwise of the arguments we just look at the
+ /uninstantiated/ type of the data constructor or primop. We'd get better information
+ if we instantiated, but it's also more expensive. Example:
+ (#,#) :: forall r1 r2 (a::TYPE r1) (b::TYPE r2). a -> b -> (# a, b #)
+ If we have a call
+ (#,#) @LiftedRep @IntRep @Int @Int# 3 4#
+ then we could see accurate liftedness by instantiation, but we don't try.
+ Instead we get the actual type from (exprType arg). That could be expensive,
+ but it really only happens for unboxed tuples.
+
+Note [exprOkForSpeculation and type classes]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Consider (#22745, #15205)
\(d :: C a b). case eq_sel (sc_sel d) of
@@ -2674,8 +2724,7 @@ exprIsHNFlike is_con is_con_unf rubbish_lit_result e
-- PAP: Check unlifted val_args
args_hnf = all2Prefix check_arg val_arg_tys val_args
- fun_ty = idType id
- val_arg_tys = mapMaybe anonPiTyBinderType_maybe (collectPiTyBinders fun_ty)
+ val_arg_tys = splitUninstantiatedValArgTys (idType id)
-- val_arg_tys = map exprType val_args, but much less costly.
-- The obvious definition regresses T16577 by 30% so we don't do it.
@@ -2700,7 +2749,6 @@ exprIsHNFlike is_con is_con_unf rubbish_lit_result e
| otherwise
= Nothing
-
{-
Note [exprIsHNF Tick]
~~~~~~~~~~~~~~~~~~~~~
=====================================
testsuite/tests/simplCore/should_compile/T27910.hs
=====================================
@@ -0,0 +1,17 @@
+{-# LANGUAGE UnboxedTuples, MagicHash #-}
+module T27910 where
+import GHC.Exts
+
+k1 :: (# Int, Bool #) -> (# Int, Bool #) -> Int
+{-# NOINLINE k1 #-}
+k1 _ _ = 3
+
+k2 :: (# Int#, Int# #) -> (# Int#, Int# #) -> Int
+{-# NOINLINE k2 #-}
+k2 _ _ = 3
+
+lifted :: Int -> Bool -> Int
+lifted x y = case (# x, y #) of r -> k1 r r
+
+unlifted :: Int# -> Int# -> Int
+unlifted x y = case (# x, y #) of r -> k2 r r
=====================================
testsuite/tests/simplCore/should_compile/T27910.stderr
=====================================
@@ -0,0 +1,49 @@
+
+==================== FloatOut stats: ====================
+2 Lets floated to top level; 0 Lets floated elsewhere; from 4 Lambda groups
+
+
+
+==================== FloatOut stats: ====================
+4 Lets floated to top level; 0 Lets floated elsewhere; from 6 Lambda groups
+
+
+
+==================== Grand total simplifier statistics ====================
+Total ticks: 30
+
+8 PreInlineUnconditionally
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+2 PostInlineUnconditionally
+ 1 r
+ 1 r
+4 UnfoldingDone
+ 2 GHC.Internal.Prim.void#
+ 1 T27910.k1
+ 1 T27910.k2
+8 BetaReduction
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+4 KnownBranch
+ 2 wild
+ 1 ww
+ 1 ww
+4 CaseElim
+ 2 ww
+ 2 ww
+9 SimplifierDone 9
+
+
=====================================
testsuite/tests/simplCore/should_compile/all.T
=====================================
@@ -627,5 +627,5 @@ test('T27749',
compile, ['-O -g3 -ddump-simpl -dsuppress-uniques'])
test('T27629', only_ways(['optasm']), makefile_test, ['T27629'])
-
test('T27936', normal, compile, [''])
+test('T27910', grep_errmsg(r'KnownBranch'), compile, ['-O -dno-typeable-binds -ddump-simpl-stats -dsuppress-uniques'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c9475738abd6403dec943653f5cd48…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c9475738abd6403dec943653f5cd48…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/fendor/dep-json-link-nodes] 44 commits: Correct the documentation of `explicitUnits`
by Hannes Siebenhandl (@fendor) 16 Oct '26
by Hannes Siebenhandl (@fendor) 16 Oct '26
16 Oct '26
Hannes Siebenhandl pushed to branch wip/fendor/dep-json-link-nodes at Glasgow Haskell Compiler / GHC
Commits:
53eead15 by Wolfgang Jeltsch at 2026-09-24T20:12:03-04:00
Correct the documentation of `explicitUnits`
Resolves #27787.
- - - - -
35bf6f4b by Simon Jakobi at 2026-09-24T20:12:49-04:00
Remove stale specHeader bullet from Note [Don't make fillers for constraint types]
The Note said that Specialise.specHeader also calls mkAbsentFiller.
abfc224a27c removed that call: the specialiser no longer drops dead
arguments at all, see Note [Do not drop dead args from specialisations]
in GHC.Core.Opt.Specialise.
Assisted-by: Claude Fable 5.1
- - - - -
1abef1ef by Wolfgang Jeltsch at 2026-09-25T17:02:07-04:00
Improve the `mhu-closure` makefile
- - - - -
a79a68ea by Wolfgang Jeltsch at 2026-09-25T17:02:07-04:00
Make `ghci-multi` hide all unneeded packages
- - - - -
d6e72450 by Wolfgang Jeltsch at 2026-09-25T17:02:07-04:00
Improve the definition of the home unit closure property
- - - - -
c9a2766d by Wolfgang Jeltsch at 2026-09-25T17:02:07-04:00
Re-implement the home unit closure check
Compared to the previous implementation, the new one has the following
advantages:
* It is correct.
- It distinguishes between units that have the same unit ID but
different ABI hashes.
- When `-hide-all-packages` is not used, it considers as home unit
dependencies also units that are made implicitly available
because they are in the package database.
* It seems to be faster in usual settings.
- In particular, it does not have a preparation phase in which it
merges the dependency information from all home units, so that
its running time does not grow linearly with the size of the
package database in normal Cabal scenarios.
* It is (hopefully) clearer.
* It is better documented.
- - - - -
fa96acf8 by Wolfgang Jeltsch at 2026-09-25T17:02:07-04:00
Remove erroneous GHC flag in `hadrian-multi`
The flag was `-Werror=-Wno-error=incomplete-record-selectors`. Its
purpose was to permit incomplete record selectors, but because of the
illegal combination of `-Werror=` and `-Wno-error` it was ignored,
without any negative consequences.
- - - - -
9f48a5b9 by Alan Zimmerman at 2026-09-25T17:02:50-04:00
EPA: Add specific layout field to AnnList
Up to now AnnList has effectively served to represent lists of things
having layout, regardless of whether they do or not.
In Haskell, layout is optional in many places, as there is also an
alternative syntax using braces and semi-colons, which is free-form.
This commit introduces AnnListLayout, a data structure capturing this
distinction.
It is deliberately set up similarly to EpLayout, so that these two can
be merged in time.
The transition is done mechanically, where AnnListBraces is not used
yet, the original Nothing case maps to AnnListNoLayout, and the Just
case to AnnListLayout.
Later commits will fine tune these against the actual parser layout.
- - - - -
234bab08 by Vladislav Zavialov at 2026-09-29T17:22:54-04:00
Add regression test for #7803
Commit 2effe18ab5, first shipped with GHC 8.2.1, fixed #7803 "Superclass
methods are left unspecialized".
This change turns the example from the ticket description into a regression
test, checking that foo1 is fully specialised at Double, with no calls to the
overloaded exp5Tail.
Closes #7803
Assisted-by: Claude Opus 5
- - - - -
c406135c by Andreas Klebinger at 2026-10-01T06:57:28-04:00
RTS: Update flag parsing/handling:
Using 0 as argument to any of these flags now resets the flags setting to default:
- ``-n0`` disables nursery chunking.
- ``-K0`` (or a bare ``-K``) removes the stack size limit.
- ``-M0`` removes the heap size limit.
- ``-H0`` resets the suggested heap size, including the nursery scaling set by ``-H``.
- ``-AL0`` makes the large object allocation limit follow ``-A`` again.
GC Generations are now limited to 64.
-n larger than -A now emits a warning and disables chunking.
Fixes #27830 #27829
- - - - -
984ee82b by Andreas Klebinger at 2026-10-01T06:58:10-04:00
Fix MultiLayerModules timeout multiplier.
We accidentally used the compile multiplier for ghci commands which
use the run timeout setting to set the timeout.
Fixes #26263 and #27796.
- - - - -
50a9cf26 by Andreas Klebinger at 2026-10-01T06:58:10-04:00
testsuite: Include runtime in JUnit report.
- - - - -
e358619f by Alan Zimmerman at 2026-10-01T06:59:01-04:00
EPA: Use EpaLocation in EpVirtualBraces
Haddock processing uses EpLayout.EpVirtualBraces to record the current
layout column, for allocating haddock comments correctly.
For exact printing, we need the line as well as the col, so we know
how many lines to skip when the indented code block starts.
This commit updates EpLayout.EpVirtualBraces so that it carries an
EpaLocation instead of just the Int column, to allow it to be used for
both purposes.
It is a simple mechanical change, with no other impact, but it allows
us to use EpLayout instead of AnnListLayout in AnnList, in the next
commit in this series.
- - - - -
1d2a26ee by Andrew Lelechenko at 2026-10-01T20:22:04-04:00
Remove bitSize from MINIMAL pragma of class Bits
Cf. https://github.com/haskell/core-libraries-committee/issues/441
The function is deprecated for 12 years and has a default implementation,
yet it was never removed from the MINIMAL pragma, putting library authors
in a very awkward position. Let's finally remove bitSize from MINIMAL.
- - - - -
3cc21e4c by Hannes Siebenhandl at 2026-10-01T20:22:59-04:00
Add regression test for #27641
- - - - -
c35096f5 by Hannes Siebenhandl at 2026-10-01T20:23:00-04:00
Don't `:add` modules the loader will reject
Only home modules can be actually added to the loader context, thus we
only accept the module if it belongs to a home unit.
- - - - -
a563cb27 by Simon Jakobi at 2026-10-02T17:37:36-04:00
ci: accept modified changelog.d entries in lint-changelog
The changelog guide says to extend an existing entry rather than add a
new one when the feature is already documented. lint_changelog only
counted added files, so such MRs failed before the validator ran.
Fixes #27779.
Assisted-by: Claude Fable 5.1
- - - - -
03082cd4 by Simon Jakobi at 2026-10-02T17:38:17-04:00
changelog.d: Fix warning flag name in the semaphore-v2 entry
The entry refers to -Wsemaphore-version-mismatch, which does not exist.
The warning GHC emits when it cannot use a -jsem semaphore, including
on a protocol version mismatch, is -Wsemaphore-open-failure.
Context: !15729, #25087
Assisted-by: Claude Fable 5.1
- - - - -
a93705ee by Simon Jakobi at 2026-10-02T17:38:17-04:00
changelog.d: Fix the CLC proposal link in the T27455 entry
The entry used the Sphinx :ref: role with a URL as its target. :ref:
resolves only internal labels, so the generated release notes would
show the proposal name without a link. Use the plain hyperlink form
like the other entries.
Context: !16274, #27455
Assisted-by: Claude Fable 5.1
- - - - -
54381079 by Hannes Siebenhandl at 2026-10-02T17:39:01-04:00
Extend the `TrustOverlay` for wired-in units
The TrustOverlay only contained the `UnitId` of all on-disk units.
However, wired-in units are referred to by their wired-in unit id, which
is not the same as the on-disk unit id.
Thus, trust checks for wired-in units failed because the lookup was
using the wired-in unit, which wasn't present in the `TrustOverlay`.
We fix #27834, by copying the trust info for wired-in unit ids.
- - - - -
f8cfb1a5 by Hécate Kleidukos at 2026-10-04T19:36:39+02:00
[CLC 341] Strict variants of mutable types
This commit is the implementation of CLC Proposal 341
https://github.com/haskell/core-libraries-committee/issues/341
- - - - -
575c4bc6 by Rodrigo Mesquita at 2026-10-05T12:32:02-04:00
ttg: HsModuleName in the AST, ModuleName in GHC
This commit makes the AST fully independent from GHC by parsing a
"module name" as an `HsModuleName (= HText)` rather than constructing an
`ModuleName (= FastString)` straight away.
In the GHC side, everything remains as a `ModuleName`. We turn AST
`HsModuleName`s into fast strings with the cheap `mkFastStringShortText`
when we process the AST for manipulation within the compiler.
There are no performance regressions introduced by this approach.
This is the final piece of #21592
Alternative plans were discussed in
gitlab.haskell.org/ghc/ghc/-/merge_requests/16546#note_694647,
but the Simon suggested one won in simplicity and performance when
compared against my attempt at implementing my original plan of having
a family `ModuleNameP`.
- - - - -
b3b89d32 by mangoiv at 2026-10-05T22:03:32-04:00
hadrian: Persist the used flavour name in the build root (#20650)
This executes the idea proposed in #20650, teaching Hadrian to persist
the flavour used to build a build root. This both makes use of multiple
build roots more ergonomic (as the user no longer needs to repeat
themselves) and avoids a tiresome foot-gun (forgetting to specify a
flavour, often wholly invalidating a build root).
Closes #20650.
Co-authored-by: Sylvain Henry <sylvain(a)haskus.fr>
- - - - -
f977837b by mangoiv at 2026-10-05T22:04:21-04:00
configure: fix sed script and subst tooldir script
Fixes #27672
Adds sanity checking for SUBST_TOOLDIR
Metric Decrease:
LinkableUsage01
MultiLayerModulesTH_OneShot
T10547
T12234
T12425
T13035
T13820
T18140
T18730
T18923
T9198
TcPlugin_RewritePerf
mhu-perf
- - - - -
f1cb08be by Hannes Siebenhandl at 2026-10-05T22:05:03-04:00
Prepend in-memory unit database for backpack
The packageDbFlags are stored in reverse order. Thus, prepending will
ensure that the in-memory unit database is the last item on the unit
database stack.
Further, the in-memory unit database needs to be able to shadow units
from earlier unit databases in the unit database stack.
Moreover, a `-clear-package-db` would remove the in-memory database if
it weren't the last item on the stack.
Closes #27835
- - - - -
8d49ed42 by Kazu Yamamoto at 2026-10-06T19:37:25-04:00
Do not leave standard file descriptors free at startup (#24450)
A process may be started with stdout closed -- `prog >&-` from a shell does
exactly that. Nothing then reserves descriptor 1, and open(), pipe() and
socket() hand out the lowest free descriptor, so the next descriptor the
runtime creates for itself takes it: the ticker's pipe, or a capability's IO
manager control pipe.
'GHC.Internal.IO.StdHandles.stdout' is a CAF, built the first time the program
writes to stdout, which is long after that has happened. It builds a 'Handle'
over descriptor 1, which now belongs to the runtime, and nothing reports an
error because the descriptor is perfectly good. The program then writes its
output into the runtime's own plumbing.
What that looks like from the outside is a hang. The descriptor the Handle has
taken over is the read end of a pipe, so poll() for POLLOUT on it never says
yes and epoll_ctl() accepts a registration for it; the thread waiting to write
blocks for ever. Closing the Handle at exit closes the runtime's descriptor,
which is worse: the ticker then fails on every tick.
'hs_init_ghc' now opens /dev/null onto whichever of descriptors 0, 1 and 2 are
closed, before the runtime creates any descriptor of its own. Each is opened
for the access that descriptor would normally have, read-only for 0 and
write-only for 1 and 2, so that writing to 'stdin' or reading from 'stdout'
still fails rather than quietly succeeding against /dev/null. See
Note [Standard file descriptors must be open].
Moving only the descriptors the runtime opens would not do: the first file the
program itself opened would land on the free number instead. The fix has to
leave no free number. A program run this way therefore finds stdout connected
to /dev/null rather than failing with EBADF on the first write, which is what
such a program would get from most other language runtimes.
Co-Authored-By: Claude Opus 5 (1M context) <noreply(a)anthropic.com>
- - - - -
65bcf9e9 by Simon Jakobi at 2026-10-06T19:38:09-04:00
changelog: Repair the sentence describing #27477
The description read "programs using could crash", the object of
"using" having been lost. The synopsis already says which programs are
affected, so drop the dangling word.
Assisted-by: Claude Fable 5.1
- - - - -
15ece296 by mangoiv at 2026-10-08T15:14:56-04:00
ci: move hadrian/ghci into the lint category so it can be picked up by more runners
Fixes #27817
- - - - -
c0823135 by mangoiv at 2026-10-08T15:14:56-04:00
ci: make lint-adjacent jobs into platform independent
- move lint jobs into lint-anyarch tag
- unify lint jobs under the same platform independent container
- - - - -
f76464cf by Zubin Duggal at 2026-10-08T15:15:39-04:00
DmdAnal: Make AbsDmd neutral in maxDmd
fixes #27845
- - - - -
ffa56ae4 by sheaf at 2026-10-09T17:15:59+02:00
Preserve sign of zero when parsing -0.0#
This commit leverages the recently added GHC.Types.Literal.Floating
module in order to preserve the sign of negative zero from
source-written floating-point literals.
Fixes #27545
- - - - -
d538cac9 by Facundo Domínguez at 2026-10-09T20:26:38-04:00
Propagate annotations to simple interfaces
This allows annotations to be visible to plugins when run by
haddock. The LiquidHaskell plugin needs the annotations, in particular.
Fixes #26761
- - - - -
32c4f4ab by meooow25 at 2026-10-09T20:27:28-04:00
Bump containers submodule to 0.8.1
And fix affected tests.
* T4086a: containers depends on template-haskell-lift now instead of
template-haskell.
* T22611: Updated to be less dependent on containers internals.
- - - - -
c786065e by sheaf at 2026-10-09T20:28:20-04:00
Use an explicit pattern match in toIfaceIdDetails
The old wildcard pattern let this code bit rot: it did not properly account
for recently added 'IdDetails' such as 'RepPolyId', which resulted in
spurious 'pprTrace' messages that could even pollute HLS sessions.
Fixes #23785
- - - - -
e7cacf59 by sheaf at 2026-10-09T20:29:09-04:00
Take into account ifKind in freeNamesIfDecl
Commit 3c2f4bb4 added the 'ifKind' field to various constructors
of 'IfaceDecl', which preserves the original kind (before type synonym
expansion) for better error messages.
However, that commit forgot to update 'freeNamesIfDecl' correspondingly.
This could result in a "urk! lookup local fingerpring" crash when e.g.
a type's kind uses a type synonym defined later, as we failed to add a
dependency on the type synonym during dependency analysis.
Fixes #27916
- - - - -
41e80f41 by Simon Peyton Jones at 2026-10-11T14:38:51-04:00
Simplify the error-suppression mechanism in GHC.Tc.Errors
In `GHC.Tc.Errors.reportWanteds` we suppress some errors in favour of
others. But the mechanism had grown crufty, and #27331 exposed a bug.
This MR makes it simpler and more uniform, by doing everything via
the `ei_suppress` field of the ErrorItem.
Claude then found another closely-related bug (see the review linked
on !16564). That bug is immortalised in new test T18851d.
I'm still not happy with `ignoreConstraint` but we can worry about
that another day; I have not touched it.
Main changes
* Instead of /predicting/ when an error will be reported, we set
`cec_error_reported` when an error is /actually/ reported. (I renamed
it from `cec_suppress` to reflect this change.)
Now errors are suppressed only when a preceding error has actually been
reported. Simpler and more robust.
See `Note [cec_error_reported: suppressing less-serious errors]`
The big changes are in `reportWanteds` which looks very different.
* New `Note [ei_suppress: suppressing confusing errors]` describes the
(quite separate) `ei_suppress` mechanism for suppressing confusing
errors, mainly arising from non-empty rewriter sets
* In `tryTypeClassDefaulting`, instead of switching off type-class defaulting
if there is an insoluble /anywhere/, we just switch it off locally when
we find an insoluble sub-tree. See Note [When to do type-class defaulting]
and (W5) in Note [ApproximateWC]
* Greatly simplify `insolubleWantedCt`.
* I made type-class-defaulting be a bit more eager, only switched off when
a peer or ancestor (but not child) constraint is insoluble. See
Note [When to do type-class defaulting].
Small refactorings
* Rename `askNoErrs` to `askErrsFound` and flip its polarity
* The code for "check if ei_suppress is true of all items" code is
moved to `mkErrorItems` rather than in the large `reportWanteds`.
* Code for `has_gadt_match` moves to `mkGivenErrorReporter`, rather than
polluting the large `reportWanteds`.
* Many tests with `-fdefer-type-errors` get more warnings, especially
about ambiguous (Num a) constraints. This is by-design: see
Note [Always warn with -fdefer-type-errors]. Previously GHC was not
honouring this Note but now it is, hence the extra errors.
- - - - -
f217fc31 by Cheng Shao at 2026-10-11T14:39:33-04:00
compiler: ensure cross ghc --info output target unit ids
Previously, for cross ghcs, the base/ghc/ghc-internal unit ids in
--info output do not match the target unit ids reported by ghc-pkg,
breaking cross ghc release builds with hash-unit-ids when being used
with cabal 3.18. This patch fixes it by making --info output target
unit ids. Fixes #27919.
Co-authored-by: Codex <codex(a)openai.com>
- - - - -
92c08525 by fendor at 2026-10-13T16:45:26+02:00
Refactor Makefile to use phases appropriately
Process the dependency information independently of the Makefile
generation.
Introduces intermediate data types that contain all the relevant
information instead of ad-hoc generation of output lines.
- - - - -
821889fb by fendor at 2026-10-13T21:55:52+02:00
Add `-dep-json` flag to `ghc -M`
Add an optional flag to `ghc -M` that allows to write the dependency
information in JSON Lines format.
The JSON Lines format enables us to stream the output of the dependency
generation to a consumer.
The output of `-dep-json` is streamed to a temporary file and then
copied to the final destination to avoid partial writes.
Each line contains one of two possible json objects:
1. A Home Unit Dependency
* Contains the name of the home module, its unit, where it is
located, whether a preprocessor is used, and all of its imports.
Importantly, the imports include `-XExplicitLevelImports`
information.
* If requested via `-include-pkg-deps`, includes imports of external
units, e.g. modules from `base`.
* If requested via `-include-cpp-deps`, files included via CPP.
2. External Unit Dependency
* Only if `-include-pkg-deps` is given
* Contains unit-id, its package name and package id.
- - - - -
7efdd5c5 by fendor at 2026-10-13T21:55:52+02:00
Add multiple home unit support to `ghc -M`
Allows to process the module graph of multiple home units at once using
the same syntax as `--make` and `--interactive`:
ghc -M -unit @unitA -unit @unitB
The semantics are identical to `--make` and `--interactive`.
Each home unit can declare individually to use `-include-cpp-deps` and
`-include-pkg-deps`.
However, there can only be one output file, and `-dep-json` and
`-dep-makefile` can only be provided at the top of the cli invocation.
We introduce a new GHC API `doMkDepend` that allows to use multiple home
units conveniently.
The output of `-dep-json` and `-dep-makefile` does not change, since we
were careful to choose a format that supports multiple home units from
the start.
Single home units are still accepted like before with no changes.
- - - - -
57781c86 by fendor at 2026-10-13T21:55:52+02:00
Deprecate `doMkDependHS` in favour of `doMkDepend`
- - - - -
cd063639 by fendor at 2026-10-13T21:55:52+02:00
Improve `ghc -M` test-suite
Adds a more extensive test-suite for `ghc -M` mode.
Introduce a dedicated test mode for running `ghc -M` tests more
conveniently.
Adds lots of normalizers that help to write `ghc -M` tests in a platform
independent manner.
Adds utility scripts that help format the output of `ghc -M`.
Add new perf regression tests for json and makefile generation.
Add perf regression test for multiple home unit support.
- - - - -
c528ae79 by fendor at 2026-10-15T19:03:06+02:00
Add support for ghc-debug to ghc executable
- - - - -
c2af6488 by fendor at 2026-10-16T13:30:56+02:00
WIP: Add support for link nodes
- - - - -
343 changed files:
- .gitlab-ci.yml
- .gitlab/ci.sh
- .gitlab/hello.hs
- .gitmodules
- + changelog.d/24450
- + changelog.d/26761
- + changelog.d/27641
- + changelog.d/27845
- + changelog.d/T23785
- changelog.d/T27455
- + changelog.d/T27545
- + changelog.d/T27731
- + changelog.d/T27830-rts-flag-bounds
- + changelog.d/T27916
- + changelog.d/clc-341-strict-mutable-data-types
- + changelog.d/fix-cross-ghc-info-unit-id
- changelog.d/fix-parallel-gc-selector-race-27477
- + changelog.d/hadrian-persist-flavour
- + changelog.d/make-depends-json
- changelog.d/semaphore-v2
- changelog.d/unit-index
- compiler/GHC.hs
- compiler/GHC/Builtin/Modules.hs
- compiler/GHC/Builtin/WiredIn/Ids.hs
- compiler/GHC/ByteCode/Asm.hs
- compiler/GHC/ByteCode/Show.hs
- compiler/GHC/Core/DataCon.hs
- compiler/GHC/Core/Make.hs
- compiler/GHC/Core/Opt/CallerCC/Types.hs
- compiler/GHC/Core/Opt/WorkWrap/Utils.hs
- compiler/GHC/CoreToIface.hs
- compiler/GHC/Driver/Backpack.hs
- compiler/GHC/Driver/Downsweep.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Errors/Ppr.hs
- compiler/GHC/Driver/Errors/Types.hs
- compiler/GHC/Driver/Main/Compile.hs
- compiler/GHC/Driver/MakeFile.hs
- compiler/GHC/Driver/Pipeline.hs-boot
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Pipeline/Phases.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Driver/Session/Units.hs
- compiler/GHC/Hs/Doc.hs
- compiler/GHC/Hs/Dump.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Hs/ImpExp.hs
- compiler/GHC/Hs/Lit.hs
- compiler/GHC/HsToCore/Docs.hs
- compiler/GHC/HsToCore/Match/Literal.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/Iface/Decl.hs
- compiler/GHC/Iface/Errors/Types.hs
- compiler/GHC/Iface/Ext/Ast.hs
- compiler/GHC/Iface/Ext/Debug.hs
- compiler/GHC/Iface/Ext/Types.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Tidy.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/Annotation.hs
- compiler/GHC/Parser/Errors/Types.hs
- compiler/GHC/Parser/Header.hs
- compiler/GHC/Parser/Lexer.x
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Parser/PostProcess/Haddock.hs
- compiler/GHC/Parser/String.hs
- compiler/GHC/Rename/Env.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Rename/Names.hs
- compiler/GHC/Rename/Unbound.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- compiler/GHC/StgToJS/Linker/Linker.hs
- compiler/GHC/Tc/Deriv/Generics.hs
- compiler/GHC/Tc/Errors.hs
- compiler/GHC/Tc/Errors/Ppr.hs
- compiler/GHC/Tc/Errors/Types.hs
- compiler/GHC/Tc/Gen/Export.hs
- compiler/GHC/Tc/Instance/Family.hs
- compiler/GHC/Tc/Module.hs
- compiler/GHC/Tc/Solver/Default.hs
- compiler/GHC/Tc/Solver/Equality.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Types/Constraint.hs
- compiler/GHC/Tc/Types/ErrCtxt.hs
- compiler/GHC/Tc/Utils/Monad.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/Demand.hs
- compiler/GHC/Types/Unique.hs
- compiler/GHC/Types/UnresolvedImport.hs
- compiler/GHC/Unit/Env.hs
- compiler/GHC/Unit/External/Wired.hs
- compiler/GHC/Unit/Home.hs
- compiler/GHC/Unit/Module.hs
- compiler/GHC/Unit/Module/Env.hs
- + compiler/GHC/Unit/Module/Name.hs
- compiler/GHC/Unit/Parser.hs
- compiler/GHC/Unit/State.hs
- compiler/GHC/Unit/Types.hs
- compiler/GHC/Unit/Types.hs-boot
- compiler/GHC/Utils/Binary.hs
- compiler/GHC/Utils/Json.hs
- compiler/GHC/Utils/Outputable.hs
- compiler/Language/Haskell/Syntax.hs
- compiler/Language/Haskell/Syntax/Expr.hs
- compiler/Language/Haskell/Syntax/ImpExp.hs
- compiler/Language/Haskell/Syntax/Lit.hs
- compiler/Language/Haskell/Syntax/Module/Name.hs
- compiler/Language/Haskell/Syntax/Text.hs
- compiler/ghc.cabal.in
- distrib/configure.ac.in
- + docs/users_guide/make-depends-json-schema-1_0.json
- docs/users_guide/runtime_control.rst
- docs/users_guide/separate_compilation.rst
- + ghc-debug
- ghc/GHCi/UI.hs
- ghc/GHCi/UI/Info.hs
- ghc/Main.hs
- ghc/ghc-bin.cabal.in
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- hadrian/doc/flavours.md
- hadrian/ghci-multi-cabal.in
- hadrian/src/Packages.hs
- hadrian/src/Rules.hs
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Rules/Generate.hs
- hadrian/src/Settings.hs
- hadrian/src/Settings/Default.hs
- hadrian/src/Settings/Packages.hs
- + instructions.md
- libraries/base/base.cabal.in
- libraries/base/changelog.md
- libraries/base/src/Control/Concurrent/Chan.hs
- + libraries/base/src/Control/Concurrent/Chan/Strict.hs
- libraries/base/src/Control/Concurrent/MVar.hs
- + libraries/base/src/Control/Concurrent/MVar/Strict.hs
- libraries/base/src/Data/IORef.hs
- + libraries/base/src/Data/IORef/Strict.hs
- libraries/containers
- libraries/ghc-internal/src/GHC/Internal/Bits.hs
- linters/lint-codes/LintCodes/Static.hs
- m4/subst_tooldir.m4
- rts/RtsFlags.c
- rts/RtsStartup.c
- rts/include/rts/Flags.h
- rts/include/rts/storage/GC.h
- rts/sm/GC.c
- rts/sm/Storage.c
- testsuite/driver/junit.py
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- + testsuite/tests/backpack/should_compile/T27835.bkp
- + testsuite/tests/backpack/should_compile/T27835.stderr
- testsuite/tests/backpack/should_compile/all.T
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- + testsuite/tests/dmdanal/should_run/T27845.hs
- + testsuite/tests/dmdanal/should_run/T27845.stdout
- + testsuite/tests/dmdanal/should_run/T27845_Lib.hs
- + testsuite/tests/dmdanal/should_run/T27845b.hs
- + testsuite/tests/dmdanal/should_run/T27845b.stdout
- + testsuite/tests/dmdanal/should_run/T27845b_Lib.hs
- testsuite/tests/dmdanal/should_run/all.T
- + testsuite/tests/driver/mkdepend/Makefile
- + testsuite/tests/driver/mkdepend/README.md
- + testsuite/tests/driver/mkdepend/T24384/A.hs
- + testsuite/tests/driver/mkdepend/T24384/C.hs
- + testsuite/tests/driver/mkdepend/T24384/C.hs-boot
- + testsuite/tests/driver/mkdepend/T24384/D.hs
- + testsuite/tests/driver/mkdepend/T24384/E.hs
- + testsuite/tests/driver/mkdepend/T24384/dep-internal/DepInternal.hs
- + testsuite/tests/driver/mkdepend/T24384/dep-internal/dep-internal.pkg
- + testsuite/tests/driver/mkdepend/T24384/dep-public/DepPublic.hs
- + testsuite/tests/driver/mkdepend/T24384/dep-public/dep-public.pkg
- + testsuite/tests/driver/mkdepend/T24384/dep/Dep.hs
- + testsuite/tests/driver/mkdepend/T24384/dep/dep.pkg
- + testsuite/tests/driver/mkdepend/T24384/foo.h
- + testsuite/tests/driver/mkdepend/T24384/lib/B.hs
- + testsuite/tests/driver/mkdepend/T24384/lib/B.hs-boot
- + testsuite/tests/driver/mkdepend/T24384/preproc.sh
- + testsuite/tests/driver/mkdepend/T24384a.stdout
- + testsuite/tests/driver/mkdepend/T24384b.stdout
- + testsuite/tests/driver/mkdepend/T24384c.stdout
- + testsuite/tests/driver/mkdepend/all.T
- + testsuite/tests/driver/mkdepend/format_json.sh
- + testsuite/tests/driver/mkdepend/format_makefile.sh
- + testsuite/tests/driver/mkdepend/mhu01/a/A/Base.hs
- + testsuite/tests/driver/mkdepend/mhu01/a/A/Base.hs-boot
- + testsuite/tests/driver/mkdepend/mhu01/a/A/TH.hs
- + testsuite/tests/driver/mkdepend/mhu01/a/Util.hs
- + testsuite/tests/driver/mkdepend/mhu01/b/B/Normal.hs
- + testsuite/tests/driver/mkdepend/mhu01/b/B/Splice.hs
- + testsuite/tests/driver/mkdepend/mhu01/b/Util.hs
- + testsuite/tests/driver/mkdepend/mhu01/c/C.hs
- + testsuite/tests/driver/mkdepend/mhu01/unitA
- + testsuite/tests/driver/mkdepend/mhu01/unitB
- + testsuite/tests/driver/mkdepend/mhu01/unitC
- + testsuite/tests/driver/mkdepend/mhu02/A.hs
- + testsuite/tests/driver/mkdepend/mhu02/B.hs
- + testsuite/tests/driver/mkdepend/mhu02/pp.sh
- + testsuite/tests/driver/mkdepend/mhu02/unitA
- + testsuite/tests/driver/mkdepend/mhu02/unitB
- + testsuite/tests/driver/mkdepend/mhu03/pkg/A.hs
- + testsuite/tests/driver/mkdepend/mhu03/pkg/pp.sh
- + testsuite/tests/driver/mkdepend/mhu03/unitA
- + testsuite/tests/driver/mkdepend/mhu04/app/Main.hs
- + testsuite/tests/driver/mkdepend/mhu04/app/Utils.hs
- + testsuite/tests/driver/mkdepend/mhu04/lib/Lib.hs
- + testsuite/tests/driver/mkdepend/mhu04/lib/Lib/Internal.hs
- + testsuite/tests/driver/mkdepend/mhu04/unitApp
- + testsuite/tests/driver/mkdepend/mhu04/unitLib
- + testsuite/tests/driver/mkdepend/mhu05/app/Main.hs
- + testsuite/tests/driver/mkdepend/mhu05/lib/Lib.hs
- + testsuite/tests/driver/mkdepend/mhu05/lib/Lib/Internal.hs
- + testsuite/tests/driver/mkdepend/mhu05/test/Spec.hs
- + testsuite/tests/driver/mkdepend/mhu05/unitApp
- + testsuite/tests/driver/mkdepend/mhu05/unitLib
- + testsuite/tests/driver/mkdepend/mhu05/unitTest
- + testsuite/tests/driver/mkdepend/mkdepend01.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend01.dep-makefile
- + testsuite/tests/driver/mkdepend/mkdepend01/A.hs
- + testsuite/tests/driver/mkdepend/mkdepend_mhu01.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend_mhu01.dep-makefile
- + testsuite/tests/driver/mkdepend/mkdepend_mhu02.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend_mhu03.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend_mhu04.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend_mhu04.dep-makefile
- + testsuite/tests/driver/mkdepend/mkdepend_mhu05.dep-json
- + testsuite/tests/driver/mkdepend/mkdepend_mhu05.dep-makefile
- testsuite/tests/driver/multipleHomeUnits/mhu-closure/Makefile
- testsuite/tests/driver/multipleHomeUnits/mhu-closure/mhu-closure.stderr
- testsuite/tests/driver/multipleHomeUnits/mhu-closure/mhu-closure.stdout
- testsuite/tests/ghc-api/downsweep/IncrementalDownsweep.hs
- testsuite/tests/ghc-api/exactprint/T22919.stderr
- testsuite/tests/ghc-api/exactprint/Test20239.stderr
- testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
- testsuite/tests/ghci/prog020/ghci.prog020a.stderr
- testsuite/tests/ghci/prog020/ghci.prog020b.stderr
- testsuite/tests/ghci/prog021/prog021a.stderr
- testsuite/tests/ghci/prog021/prog021b.stderr
- testsuite/tests/ghci/prog022/ghci.prog022a.stderr
- testsuite/tests/ghci/prog022/ghci.prog022b.stderr
- testsuite/tests/ghci/prog022/ghci.prog022c.stderr
- testsuite/tests/ghci/prog022/ghci.prog022d.stderr
- testsuite/tests/ghci/prog022/ghci.prog022e.stderr
- testsuite/tests/ghci/prog022/ghci.prog022f.stderr
- testsuite/tests/ghci/scripts/Defer02.stderr
- + testsuite/tests/ghci/scripts/T27641.script
- + testsuite/tests/ghci/scripts/T27641.stderr
- + testsuite/tests/ghci/scripts/T27641.stdout
- + testsuite/tests/ghci/scripts/T27834.hs
- + testsuite/tests/ghci/scripts/T27834.script
- + testsuite/tests/ghci/scripts/T27834.stdout
- testsuite/tests/ghci/scripts/all.T
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
- testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr
- testsuite/tests/hiefile/should_run/T24544.hs
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
- testsuite/tests/interface-stability/base-exports.stdout-mingw32
- testsuite/tests/module/mod130.stderr
- testsuite/tests/module/mod185.stderr
- + testsuite/tests/numeric/should_run/T27545.hs
- + testsuite/tests/numeric/should_run/T27545.stdout
- testsuite/tests/numeric/should_run/all.T
- testsuite/tests/overloadedstrings/should_fail/T25926.stderr
- testsuite/tests/overloadedstrings/should_fail/T27124.stderr
- testsuite/tests/package/T4806a.stderr
- testsuite/tests/package/all.T
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- testsuite/tests/parser/should_compile/T14189.stderr
- testsuite/tests/parser/should_compile/T15279.stderr
- testsuite/tests/parser/should_compile/T15323.stderr
- testsuite/tests/parser/should_compile/T20452.stderr
- testsuite/tests/parser/should_compile/T20718.stderr
- testsuite/tests/parser/should_compile/T20718b.stderr
- testsuite/tests/parser/should_compile/T20846.stderr
- testsuite/tests/parser/should_compile/T23315/T23315.stderr
- testsuite/tests/patsyn/should_fail/records-nofieldselectors.stderr
- testsuite/tests/perf/compiler/all.T
- testsuite/tests/perf/compiler/large-project/all.T
- + testsuite/tests/perf/compiler/large-project/large-project-mhu.sh
- + testsuite/tests/plugins/T26761.hs
- + testsuite/tests/plugins/T26761.stderr
- + testsuite/tests/plugins/T26761Plugin.hs
- + testsuite/tests/plugins/T26761a.hs
- testsuite/tests/plugins/all.T
- testsuite/tests/printer/AnnotationNoListTuplePuns.stdout
- testsuite/tests/printer/T17697.stderr
- testsuite/tests/printer/T18791.stderr
- testsuite/tests/printer/Test20297.stdout
- testsuite/tests/printer/Test24533.stdout
- testsuite/tests/profiling/should_run/caller-cc/CallerCcParser.hs
- testsuite/tests/rename/should_fail/T15607.stderr
- testsuite/tests/rename/should_fail/T19843b.stderr
- + testsuite/tests/rts/T24450.hs
- + testsuite/tests/rts/T24450.stderr
- testsuite/tests/rts/all.T
- testsuite/tests/rts/rtsflags001.stderr-ws-32
- testsuite/tests/rts/rtsflags001.stderr-ws-64
- testsuite/tests/safeHaskell/ghci/p4.stderr
- testsuite/tests/safeHaskell/ghci/p6.stderr
- testsuite/tests/simplCore/should_compile/T22611.hs
- testsuite/tests/simplCore/should_compile/T22611.stderr
- + testsuite/tests/simplCore/should_compile/T22611a.hs
- + testsuite/tests/simplCore/should_compile/T7803.hs
- + testsuite/tests/simplCore/should_compile/T7803.stderr
- + testsuite/tests/simplCore/should_compile/T7803a.hs
- testsuite/tests/simplCore/should_compile/all.T
- testsuite/tests/typecheck/should_compile/T11254.stderr
- testsuite/tests/typecheck/should_compile/T15370.stderr
- + testsuite/tests/typecheck/should_compile/T27916.hs
- testsuite/tests/typecheck/should_compile/all.T
- testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr
- testsuite/tests/typecheck/should_fail/ClassOperator.stderr
- testsuite/tests/typecheck/should_fail/DoExpansion2.stderr
- testsuite/tests/typecheck/should_fail/DoExpansion3.stderr
- testsuite/tests/typecheck/should_fail/FunDepOrigin1b.hs
- testsuite/tests/typecheck/should_fail/T18851.stderr
- + testsuite/tests/typecheck/should_fail/T18851e.hs
- + testsuite/tests/typecheck/should_fail/T18851e.stderr
- + testsuite/tests/typecheck/should_fail/T18851f.hs
- + testsuite/tests/typecheck/should_fail/T18851f.stderr
- testsuite/tests/typecheck/should_fail/T22940.stderr
- testsuite/tests/typecheck/should_fail/T26823.stderr
- + testsuite/tests/typecheck/should_fail/T27731.hs
- + testsuite/tests/typecheck/should_fail/T27731.stderr
- testsuite/tests/typecheck/should_fail/T5691.stderr
- testsuite/tests/typecheck/should_fail/T7437.stderr
- testsuite/tests/typecheck/should_fail/all.T
- testsuite/tests/typecheck/should_fail/mc24.stderr
- testsuite/tests/typecheck/should_fail/tcfail019.stderr
- testsuite/tests/typecheck/should_fail/tcfail189.stderr
- utils/check-exact/ExactPrint.hs
- utils/check-exact/Main.hs
- utils/check-exact/Transform.hs
- utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/411a916737c3509cbc53f29cec5c25…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/411a916737c3509cbc53f29cec5c25…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
16 Oct '26
Hannes Siebenhandl pushed new branch wip/fendor/dep-stdout at Glasgow Haskell Compiler / GHC
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fendor/dep-stdout
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/mangoiv/ci-stages] fixup! ci: build and test stage
by Magnus (@MangoIV) 16 Oct '26
by Magnus (@MangoIV) 16 Oct '26
16 Oct '26
Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC
Commits:
7fb98261 by mangoiv at 2026-10-16T13:10:18+02:00
fixup! ci: build and test stage
- - - - -
3 changed files:
- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -963,6 +963,7 @@ function clean() {
--exclude=ci_timings.txt \
--exclude=ghc-*.tar.xz \
--exclude=junit.xml \
+ --exclude=_build/stage1/haddock-timing-files \
--exclude=unexpected-test-output.tar.gz
fi
}
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -955,9 +955,10 @@ job arch opsys buildConfig =
buildJobArtifacts = Artifacts
{ junitReport = "junit.xml"
, expireIn = "2 weeks"
- , artifactPaths = [binDistName arch opsys buildConfig ++ ".tar.xz"
- ,"junit.xml"
- ,"unexpected-test-output.tar.gz"]
+ , artifactPaths = [ binDistName arch opsys buildConfig ++ ".tar.xz"
+ , "junit.xml"
+ , "unexpected-test-output.tar.gz"
+ , "_build/stage1/haddock-timing-files"]
, artifactsWhen = ArtifactsAlways
}
=====================================
.gitlab/jobs.yaml
=====================================
@@ -13,7 +13,8 @@
"paths": [
"ghc-aarch64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -142,7 +143,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -266,7 +268,8 @@
"paths": [
"ghc-aarch64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -388,7 +391,8 @@
"paths": [
"ghc-aarch64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -510,7 +514,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -593,7 +598,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -838,7 +844,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -900,7 +907,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1082,7 +1090,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1206,7 +1215,8 @@
"paths": [
"ghc-i386-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1328,7 +1338,8 @@
"paths": [
"ghc-i386-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1450,7 +1461,8 @@
"paths": [
"ghc-i386-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1572,7 +1584,8 @@
"paths": [
"ghc-aarch64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1703,7 +1716,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1829,7 +1843,8 @@
"paths": [
"ghc-aarch64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1953,7 +1968,8 @@
"paths": [
"ghc-aarch64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2077,7 +2093,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2161,7 +2178,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2409,7 +2427,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2472,7 +2491,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2657,7 +2677,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2783,7 +2804,8 @@
"paths": [
"ghc-i386-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2907,7 +2929,8 @@
"paths": [
"ghc-i386-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3031,7 +3054,8 @@
"paths": [
"ghc-i386-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3155,7 +3179,8 @@
"paths": [
"ghc-x86_64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3292,7 +3317,8 @@
"paths": [
"ghc-x86_64-freebsd14-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3422,7 +3448,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3548,7 +3575,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3674,7 +3702,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3800,7 +3829,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3930,7 +3960,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4060,7 +4091,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4190,7 +4222,8 @@
"paths": [
"ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4320,7 +4353,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4383,7 +4417,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4568,7 +4603,8 @@
"paths": [
"ghc-x86_64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4692,7 +4728,8 @@
"paths": [
"ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4822,7 +4859,8 @@
"paths": [
"ghc-x86_64-linux-deb13-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4946,7 +4984,8 @@
"paths": [
"ghc-x86_64-linux-deb13-no_tntc-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5070,7 +5109,8 @@
"paths": [
"ghc-x86_64-linux-deb13-numa-slow-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5196,7 +5236,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5381,7 +5422,8 @@
"paths": [
"ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5511,7 +5553,8 @@
"paths": [
"ghc-x86_64-linux-deb13-unreg-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5635,7 +5678,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5698,7 +5742,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5822,7 +5867,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5946,7 +5992,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6135,7 +6182,8 @@
"paths": [
"ghc-x86_64-linux-deb13-zstd-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6259,7 +6307,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6322,7 +6371,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6509,7 +6559,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6572,7 +6623,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6635,7 +6687,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6885,7 +6938,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7009,7 +7063,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7133,7 +7188,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7263,7 +7319,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7386,7 +7443,8 @@
"paths": [
"ghc-x86_64-windows-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7510,7 +7568,8 @@
"paths": [
"ghc-x86_64-windows-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7635,7 +7694,8 @@
"paths": [
"ghc-aarch64-darwin-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7768,7 +7828,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7896,7 +7957,8 @@
"paths": [
"ghc-aarch64-linux-deb11-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8022,7 +8084,8 @@
"paths": [
"ghc-aarch64-linux-deb12-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8148,7 +8211,8 @@
"paths": [
"ghc-aarch64-linux-deb13-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8274,7 +8338,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8402,7 +8467,8 @@
"paths": [
"ghc-i386-linux-deb11-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8528,7 +8594,8 @@
"paths": [
"ghc-i386-linux-deb12-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8654,7 +8721,8 @@
"paths": [
"ghc-i386-linux-deb13-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8780,7 +8848,8 @@
"paths": [
"ghc-x86_64-darwin-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8919,7 +8988,8 @@
"paths": [
"ghc-x86_64-freebsd14-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9051,7 +9121,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-release+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9179,7 +9250,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-release+fully_static+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9307,7 +9379,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9435,7 +9508,8 @@
"paths": [
"ghc-x86_64-linux-deb11-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9499,7 +9573,8 @@
"paths": [
"ghc-x86_64-linux-deb11-release+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9687,7 +9762,8 @@
"paths": [
"ghc-x86_64-linux-deb12-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9813,7 +9889,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9939,7 +10016,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10003,7 +10081,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10129,7 +10208,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10319,7 +10399,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10445,7 +10526,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10571,7 +10653,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10696,7 +10779,8 @@
"paths": [
"ghc-x86_64-windows-int_native-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10822,7 +10906,8 @@
"paths": [
"ghc-x86_64-windows-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10949,7 +11034,8 @@
"paths": [
"ghc-x86_64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11084,7 +11170,8 @@
"paths": [
"ghc-x86_64-freebsd14-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11212,7 +11299,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11336,7 +11424,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11460,7 +11549,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11584,7 +11674,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11712,7 +11803,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11842,7 +11934,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11972,7 +12065,8 @@
"paths": [
"ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12100,7 +12194,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12162,7 +12257,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12344,7 +12440,8 @@
"paths": [
"ghc-x86_64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12466,7 +12563,8 @@
"paths": [
"ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12594,7 +12692,8 @@
"paths": [
"ghc-x86_64-linux-deb13-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12716,7 +12815,8 @@
"paths": [
"ghc-x86_64-linux-deb13-no_tntc-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12840,7 +12940,8 @@
"paths": [
"ghc-x86_64-linux-deb13-numa-slow-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12964,7 +13065,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13146,7 +13248,8 @@
"paths": [
"ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13274,7 +13377,8 @@
"paths": [
"ghc-x86_64-linux-deb13-unreg-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13396,7 +13500,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13458,7 +13563,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13580,7 +13686,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13702,7 +13809,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13890,7 +13998,8 @@
"paths": [
"ghc-x86_64-linux-deb13-zstd-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14012,7 +14121,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14074,7 +14184,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14258,7 +14369,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14320,7 +14432,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14382,7 +14495,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14628,7 +14742,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14750,7 +14865,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14872,7 +14988,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15000,7 +15117,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15121,7 +15239,8 @@
"paths": [
"ghc-x86_64-windows-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15243,7 +15362,8 @@
"paths": [
"ghc-x86_64-windows-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fb98261c04b31b7f7de590bb9f5b37…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fb98261c04b31b7f7de590bb9f5b37…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/mangoiv/ci-stages] fixup! ci: build and test stage
by Magnus (@MangoIV) 16 Oct '26
by Magnus (@MangoIV) 16 Oct '26
16 Oct '26
Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC
Commits:
7fb98261 by mangoiv at 2026-10-16T13:10:18+02:00
fixup! ci: build and test stage
- - - - -
3 changed files:
- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
Changes:
=====================================
.gitlab/ci.sh
=====================================
@@ -963,6 +963,7 @@ function clean() {
--exclude=ci_timings.txt \
--exclude=ghc-*.tar.xz \
--exclude=junit.xml \
+ --exclude=_build/stage1/haddock-timing-files \
--exclude=unexpected-test-output.tar.gz
fi
}
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -955,9 +955,10 @@ job arch opsys buildConfig =
buildJobArtifacts = Artifacts
{ junitReport = "junit.xml"
, expireIn = "2 weeks"
- , artifactPaths = [binDistName arch opsys buildConfig ++ ".tar.xz"
- ,"junit.xml"
- ,"unexpected-test-output.tar.gz"]
+ , artifactPaths = [ binDistName arch opsys buildConfig ++ ".tar.xz"
+ , "junit.xml"
+ , "unexpected-test-output.tar.gz"
+ , "_build/stage1/haddock-timing-files"]
, artifactsWhen = ArtifactsAlways
}
=====================================
.gitlab/jobs.yaml
=====================================
@@ -13,7 +13,8 @@
"paths": [
"ghc-aarch64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -142,7 +143,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -266,7 +268,8 @@
"paths": [
"ghc-aarch64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -388,7 +391,8 @@
"paths": [
"ghc-aarch64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -510,7 +514,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -593,7 +598,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -838,7 +844,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -900,7 +907,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1082,7 +1090,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1206,7 +1215,8 @@
"paths": [
"ghc-i386-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1328,7 +1338,8 @@
"paths": [
"ghc-i386-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1450,7 +1461,8 @@
"paths": [
"ghc-i386-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1572,7 +1584,8 @@
"paths": [
"ghc-aarch64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1703,7 +1716,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1829,7 +1843,8 @@
"paths": [
"ghc-aarch64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -1953,7 +1968,8 @@
"paths": [
"ghc-aarch64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2077,7 +2093,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2161,7 +2178,8 @@
"paths": [
"ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2409,7 +2427,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2472,7 +2491,8 @@
"paths": [
"ghc-aarch64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2657,7 +2677,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2783,7 +2804,8 @@
"paths": [
"ghc-i386-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -2907,7 +2929,8 @@
"paths": [
"ghc-i386-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3031,7 +3054,8 @@
"paths": [
"ghc-i386-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3155,7 +3179,8 @@
"paths": [
"ghc-x86_64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3292,7 +3317,8 @@
"paths": [
"ghc-x86_64-freebsd14-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3422,7 +3448,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3548,7 +3575,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3674,7 +3702,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3800,7 +3829,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -3930,7 +3960,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4060,7 +4091,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4190,7 +4222,8 @@
"paths": [
"ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4320,7 +4353,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4383,7 +4417,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4568,7 +4603,8 @@
"paths": [
"ghc-x86_64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4692,7 +4728,8 @@
"paths": [
"ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4822,7 +4859,8 @@
"paths": [
"ghc-x86_64-linux-deb13-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -4946,7 +4984,8 @@
"paths": [
"ghc-x86_64-linux-deb13-no_tntc-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5070,7 +5109,8 @@
"paths": [
"ghc-x86_64-linux-deb13-numa-slow-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5196,7 +5236,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5381,7 +5422,8 @@
"paths": [
"ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5511,7 +5553,8 @@
"paths": [
"ghc-x86_64-linux-deb13-unreg-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5635,7 +5678,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5698,7 +5742,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5822,7 +5867,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -5946,7 +5992,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6135,7 +6182,8 @@
"paths": [
"ghc-x86_64-linux-deb13-zstd-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6259,7 +6307,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6322,7 +6371,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6509,7 +6559,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6572,7 +6623,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6635,7 +6687,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -6885,7 +6938,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7009,7 +7063,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7133,7 +7188,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7263,7 +7319,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7386,7 +7443,8 @@
"paths": [
"ghc-x86_64-windows-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7510,7 +7568,8 @@
"paths": [
"ghc-x86_64-windows-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7635,7 +7694,8 @@
"paths": [
"ghc-aarch64-darwin-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7768,7 +7828,8 @@
"paths": [
"ghc-aarch64-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -7896,7 +7957,8 @@
"paths": [
"ghc-aarch64-linux-deb11-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8022,7 +8084,8 @@
"paths": [
"ghc-aarch64-linux-deb12-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8148,7 +8211,8 @@
"paths": [
"ghc-aarch64-linux-deb13-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8274,7 +8338,8 @@
"paths": [
"ghc-i386-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8402,7 +8467,8 @@
"paths": [
"ghc-i386-linux-deb11-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8528,7 +8594,8 @@
"paths": [
"ghc-i386-linux-deb12-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8654,7 +8721,8 @@
"paths": [
"ghc-i386-linux-deb13-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8780,7 +8848,8 @@
"paths": [
"ghc-x86_64-darwin-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -8919,7 +8988,8 @@
"paths": [
"ghc-x86_64-freebsd14-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9051,7 +9121,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-release+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9179,7 +9250,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-release+fully_static+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9307,7 +9379,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-release+no_split_sections.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9435,7 +9508,8 @@
"paths": [
"ghc-x86_64-linux-deb11-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9499,7 +9573,8 @@
"paths": [
"ghc-x86_64-linux-deb11-release+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9687,7 +9762,8 @@
"paths": [
"ghc-x86_64-linux-deb12-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9813,7 +9889,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -9939,7 +10016,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10003,7 +10081,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10129,7 +10208,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10319,7 +10399,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10445,7 +10526,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10571,7 +10653,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10696,7 +10779,8 @@
"paths": [
"ghc-x86_64-windows-int_native-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10822,7 +10906,8 @@
"paths": [
"ghc-x86_64-windows-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -10949,7 +11034,8 @@
"paths": [
"ghc-x86_64-darwin-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11084,7 +11170,8 @@
"paths": [
"ghc-x86_64-freebsd14-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11212,7 +11299,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11336,7 +11424,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11460,7 +11549,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11584,7 +11674,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11712,7 +11803,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11842,7 +11934,8 @@
"paths": [
"ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -11972,7 +12065,8 @@
"paths": [
"ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12100,7 +12194,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12162,7 +12257,8 @@
"paths": [
"ghc-x86_64-linux-deb11-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12344,7 +12440,8 @@
"paths": [
"ghc-x86_64-linux-deb12-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12466,7 +12563,8 @@
"paths": [
"ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12594,7 +12692,8 @@
"paths": [
"ghc-x86_64-linux-deb13-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12716,7 +12815,8 @@
"paths": [
"ghc-x86_64-linux-deb13-no_tntc-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12840,7 +12940,8 @@
"paths": [
"ghc-x86_64-linux-deb13-numa-slow-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -12964,7 +13065,8 @@
"paths": [
"ghc-x86_64-linux-deb13-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13146,7 +13248,8 @@
"paths": [
"ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13274,7 +13377,8 @@
"paths": [
"ghc-x86_64-linux-deb13-unreg-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13396,7 +13500,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13458,7 +13563,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13580,7 +13686,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+llvm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13702,7 +13809,8 @@
"paths": [
"ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -13890,7 +13998,8 @@
"paths": [
"ghc-x86_64-linux-deb13-zstd-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14012,7 +14121,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14074,7 +14184,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-release.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14258,7 +14369,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14320,7 +14432,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14382,7 +14495,8 @@
"paths": [
"ghc-x86_64-linux-fedora43-validate+debug_info+ubsan.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14628,7 +14742,8 @@
"paths": [
"ghc-x86_64-linux-rocky8-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14750,7 +14865,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu22_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -14872,7 +14988,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15000,7 +15117,8 @@
"paths": [
"ghc-x86_64-linux-ubuntu24_04-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15121,7 +15239,8 @@
"paths": [
"ghc-x86_64-windows-int_native-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
@@ -15243,7 +15362,8 @@
"paths": [
"ghc-x86_64-windows-validate.tar.xz",
"junit.xml",
- "unexpected-test-output.tar.gz"
+ "unexpected-test-output.tar.gz",
+ "_build/stage1/haddock-timing-files"
],
"reports": {
"junit": "junit.xml"
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fb98261c04b31b7f7de590bb9f5b37…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fb98261c04b31b7f7de590bb9f5b37…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
16 Oct '26
Simon Peyton Jones pushed to branch wip/T27910 at Glasgow Haskell Compiler / GHC
Commits:
efa0e15a by Simon Peyton Jones at 2026-10-16T11:10:17+01:00
Improve exprOkForSpeculation
Fixes #27910, which exposed an infelicity in exprOkForSpeculation
The new story is carefully described in new Note [exprOkForSpeculation],
esp (a-c) and (EOKS1).
- - - - -
6 changed files:
- compiler/GHC/Core.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/Core/Utils.hs
- + testsuite/tests/simplCore/should_compile/T27910.hs
- + testsuite/tests/simplCore/should_compile/T27910.stderr
- testsuite/tests/simplCore/should_compile/all.T
Changes:
=====================================
compiler/GHC/Core.hs
=====================================
@@ -490,7 +490,7 @@ This is a well-kinded type, in an environment-based scheme. But `typeKind`
will panic, because the kind of the body of a forall must not mention
the forall'd variable (and the inner forall's body appears to do so).
-It might be possible to make `exprType` and `typeKind`` more complicated, so that
+It might be possible to make `exprType` and `typeKind` more complicated, so that
they do renaming on the fly. But instead we impose
INVARIANT (NoTypeShadowing):
=====================================
compiler/GHC/Core/Type.hs
=====================================
@@ -55,7 +55,7 @@ module GHC.Core.Type (
splitForAllForAllTyBinders, splitForAllForAllTyBinder_maybe,
splitForAllTyCoVar_maybe, splitForAllTyCoVar,
splitForAllTyVar_maybe, splitForAllCoVar_maybe,
- splitPiTy_maybe, splitPiTy, splitPiTys, collectPiTyBinders,
+ splitPiTy_maybe, splitPiTy, splitPiTys, splitUninstantiatedValArgTys,
getRuntimeArgTys,
mkTyConBindersPreferAnon,
mkPiTy, mkPiTys,
@@ -263,7 +263,6 @@ import GHC.Utils.Monad.StrictReader
import GHC.Data.FastString
import GHC.Data.Maybe ( orElse, isJust )
-import GHC.List (build)
-- $type_classification
-- #type_classification#
@@ -1599,17 +1598,20 @@ splitPiTys ty = split ty ty []
split orig_ty ty bs | Just ty' <- coreView ty = split orig_ty ty' bs
split orig_ty _ bs = (reverse bs, orig_ty)
-collectPiTyBinders :: Type -> [PiTyBinder]
-collectPiTyBinders ty = build $ \c n ->
- let
- split (ForAllTy b res) = Named b `c` split res
- split (FunTy { ft_af = af, ft_mult = w, ft_arg = arg, ft_res = res })
- = Anon (Scaled w arg) af `c` split res
- split ty | Just ty' <- coreView ty = split ty'
- split _ = n
- in
- split ty
-{-# INLINE collectPiTyBinders #-}
+splitUninstantiatedValArgTys :: Type -> [Type]
+-- This function takes a type apart, returning all its /value/
+-- argument types (including (forall (co::t1~t2).t)
+-- doing no instantiation at all.
+-- E.g. splitUinstantiatedValArgTys (forall a. a -> Int -> T a)
+-- returns [a, Int]
+-- It's a pretty specialised function, hence its long name
+splitUninstantiatedValArgTys ty = go ty
+ where
+ go (ForAllTy (Bndr b _) res) | isCoVar b = varType b : go res
+ | otherwise = go res
+ go (FunTy { ft_arg = arg, ft_res = res }) = arg : go res
+ go ty | Just ty' <- coreView ty = go ty'
+ go _ = []
-- | Extracts a list of run-time arguments from a function type,
-- looking through newtypes to the right of arrows.
=====================================
compiler/GHC/Core/Utils.hs
=====================================
@@ -2207,6 +2207,8 @@ fun_always_ok _ = True
-- | A special version of 'exprOkForSpeculation' used during
-- Note [Speculative evaluation]. When the predicate arg `fun_ok` returns False
-- for `b`, then `b` is never considered ok-for-spec.
+--
+-- This is the whole reason for the fun_ok arg to expr_ok.
exprOkForSpecEval :: (Id -> Bool) -> CoreExpr -> Bool
exprOkForSpecEval fun_ok = expr_ok fun_ok primOpOkForSpeculation
@@ -2240,10 +2242,9 @@ expr_ok fun_ok primop_ok (Case scrut bndr _ alts)
&& altsAreExhaustive alts
expr_ok fun_ok primop_ok other_expr
- | (expr, args) <- collectArgs other_expr
+ | (expr, val_args) <- collectValArgs other_expr
= case stripTicksTopE (not . tickishCounts) expr of
- Var f ->
- app_ok fun_ok primop_ok f args
+ Var f -> app_ok fun_ok primop_ok f val_args
-- 'LitRubbish' is the only literal that can occur in the head of an
-- application and will not be matched by the above case (Var /= Lit).
@@ -2258,9 +2259,10 @@ expr_ok fun_ok primop_ok other_expr
-----------------------------
app_ok :: (Id -> Bool) -> (PrimOp -> Bool) -> Id -> [CoreArg] -> Bool
-app_ok fun_ok primop_ok fun args
+app_ok fun_ok primop_ok fun val_args
| not (fun_ok fun)
- = False -- This code path is only taken for Note [Speculative evaluation]
+ = False -- This code path is only taken for exprOkForSpecEval
+ -- See Note [Speculative evaluation]
| idArity fun > n_val_args
-- Partial application: just check passing the arguments is OK
@@ -2281,17 +2283,18 @@ app_ok fun_ok primop_ok fun args
ClassOpId _ is_terminating_result
| is_terminating_result -- See Note [exprOkForSpeculation and type classes]
- -> assertPpr (n_val_args == 1) (ppr fun $$ ppr args) $
+ -> assertPpr (n_val_args == 1) (ppr fun $$ ppr val_args) $
True
-- assert: terminating result type => can't be applied;
-- c.f the _other case below
PrimOpId op _
| primOpIsDiv op
- , Lit divisor <- last args
+ , Lit divisor <- last val_args
-- there can be 2 args (most div primops) or 3 args
-- (WordQuotRem2Op), hence the use of last/init
- -> not (isZeroLit divisor) && all (expr_ok fun_ok primop_ok) (init args)
+ -> not (isZeroLit divisor) &&
+ all ok_for_spec (init val_args)
-- Special case for dividing operations that fail
-- In general they are NOT ok-for-speculation
-- (which primop_ok will catch), but they ARE OK
@@ -2300,12 +2303,14 @@ app_ok fun_ok primop_ok fun args
-- can get rid of a thunk in an inner loop
| otherwise -> primop_ok op && args_ok
+ -- Assumes that the primop does not evaluate its
+ -- definitely-lifted arguments
_other -- Unlifted and terminating types;
-- Also c.f. the Var case of exprIsHNF
| isTerminatingType fun_ty -- See Note [exprOkForSpeculation and type classes]
|| definitelyUnliftedType fun_ty
- -> assertPpr (n_val_args == 0) (ppr fun $$ ppr args)
+ -> assertPpr (n_val_args == 0) (ppr fun $$ ppr val_args)
True -- Both terminating types (e.g. Eq a), and unlifted types (e.g. Int#)
-- are non-functions and so will have no value args. The assert is
-- just to check this.
@@ -2321,32 +2326,43 @@ app_ok fun_ok primop_ok fun args
-- for evaluated-ness of the fun;
-- see Note [exprOkForSpeculation and evaluated variables]
where
- fun_ty = idType fun
- n_val_args = valArgCount args
- (arg_tys, _) = splitPiTys fun_ty
+ ok_for_spec = expr_ok fun_ok primop_ok -- Used for recursive calls
+
+ fun_ty = idType fun
+ n_val_args = length val_args
+ val_arg_tys = splitUninstantiatedValArgTys fun_ty
+ -- val_arg_tys are /uninstantiated/; see (EOKS1)
-- Even if a function call itself is OK, any unlifted
-- args are still evaluated eagerly and must be checked
- args_ok = all2Prefix arg_ok arg_tys args
- arg_ok :: PiTyVarBinder -> CoreExpr -> Bool
- arg_ok (Named _) _ = True -- A type argument
- arg_ok (Anon ty _) arg -- A term argument
- | definitelyLiftedType (scaledThing ty)
- = True -- lifted args are not evaluated eagerly
- | otherwise
- = expr_ok fun_ok primop_ok arg
+ -- arg_ok bndr arg = field_ok bndr NotMarkedStrict arg
+ -- See Note [exprOkForSpeculation] (a-c)
+ args_ok = all2Prefix arg_ok val_arg_tys val_args
+ arg_ok :: Type -> CoreExpr -> Bool
+ arg_ok arg_ty arg = ok_for_spec arg || definitely_lifted arg_ty arg
-- Used for strict DataCon worker arguments
-- See (SFC1) of Note [Strict fields in Core]
- fields_ok str_marks = all3Prefix field_ok arg_tys str_marks args
- field_ok :: PiTyVarBinder -> StrictnessMark -> CoreExpr -> Bool
- field_ok (Named _) _ _ = True
- field_ok (Anon ty _) str arg
- | NotMarkedStrict <- str -- iff it's a lazy field
- , definitelyLiftedType (scaledThing ty) -- and its type is lifted
- = True -- then the worker app does not eval
- | otherwise
- = expr_ok fun_ok primop_ok arg
+ -- See Note [exprOkForSpeculation] (a-c)
+ fields_ok str_marks = all3Prefix field_ok val_arg_tys str_marks val_args
+ field_ok :: Type -> StrictnessMark -> CoreExpr -> Bool
+ field_ok arg_ty str arg
+ = ok_for_spec arg || (definitely_lifted arg_ty arg && str==NotMarkedStrict)
+ -- The (ok_for_spec arg) test works for /both/ for unlifted types, /and/
+ -- for lifted but strict fields. E.g. K (I# 3) is ok-for-spec,
+ -- even if K is strict
+
+ -- We want to see if the argument type is definitely lifted.
+ -- But consider
+ -- (#,#) @rep1 @rep2 @ty1 @ty2 arg1 arg2
+ -- We don't /instantiate/ the type of (#,#) (although we could) so we don't
+ -- know if the argument type is lifted or not. So we look at the type of
+ -- the /actual/ argument (it's usually a variable) instead.
+ definitely_lifted uninstantiated_arg_ty arg
+ = case typeLevity_maybe uninstantiated_arg_ty of
+ Just Lifted -> True
+ Just Unlifted -> False
+ Nothing -> definitelyLiftedType (exprType arg)
-----------------------------
altsAreExhaustive :: [Alt b] -> Bool
@@ -2390,8 +2406,42 @@ cantEtaReduceFun fun
-- Don't undersaturate StrictWorkerIds.
-- See Note [CBV Function Ids: overview] in GHC.Types.Id.Info.
-{- Note [exprOkForSpeculation and type classes]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{- Note [exprOkForSpeculation]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Suppose we have
+ data T a = K !a Int# a
+
+Is the call (K e1 e2 e3) ok-for-speculation? Look at the arguments e1..e3,
+and their types. The call is ok-for-speculation if each argument satisfies
+`field_ok`, namely:
+ (a) (exprOkForSpeculation arg) holds, OR
+ (b) Arg type is definitely unlifted and it is not marked strict
+
+For (a) we conservatively assume we are going to evaluate the argument.
+If it is ok-for-spec, then fine.
+
+But if the argument is of a lifted type, and not marked strict (notably by
+a data constructor) then (b) holds. For example
+ Just (reverse xs)
+is ok-for-spec. See (EOKS1) for the argument liftedness test.
+
+If we have a plain variable `x`, is that ok-for-spec? Not if it is lifted:
+it might be a thunk! Hence the (definitelyUnliftedType fun_ty) test.
+Remember, a naked variable `x` will land in `app_ok x []` with no arguments.
+See Note [exprOkForSpeculation and evaluated variables].
+
+(EOKS1) To get the lifted-ness or otherwise of the arguments we just look at the
+ /uninstantiated/ type of the data constructor or primop. We'd get better information
+ if we instantiated, but it's also more expensive. Example:
+ (#,#) :: forall r1 r2 (a::TYPE r1) (b::TYPE r2). a -> b -> (# a, b #)
+ If we have a call
+ (#,#) @LiftedRep @IntRep @Int @Int# 3 4#
+ then we could see accurate liftedness by instantiation, but we don't try.
+ Instead we get the actual type from (exprType arg). That could be expensive,
+ but it really only happens for unboxed tuples.
+
+Note [exprOkForSpeculation and type classes]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Consider (#22745, #15205)
\(d :: C a b). case eq_sel (sc_sel d) of
@@ -2674,8 +2724,7 @@ exprIsHNFlike is_con is_con_unf rubbish_lit_result e
-- PAP: Check unlifted val_args
args_hnf = all2Prefix check_arg val_arg_tys val_args
- fun_ty = idType id
- val_arg_tys = mapMaybe anonPiTyBinderType_maybe (collectPiTyBinders fun_ty)
+ val_arg_tys = splitUninstantiatedValArgTys (idType id)
-- val_arg_tys = map exprType val_args, but much less costly.
-- The obvious definition regresses T16577 by 30% so we don't do it.
@@ -2700,7 +2749,6 @@ exprIsHNFlike is_con is_con_unf rubbish_lit_result e
| otherwise
= Nothing
-
{-
Note [exprIsHNF Tick]
~~~~~~~~~~~~~~~~~~~~~
=====================================
testsuite/tests/simplCore/should_compile/T27910.hs
=====================================
@@ -0,0 +1,17 @@
+{-# LANGUAGE UnboxedTuples, MagicHash #-}
+module T27910 where
+import GHC.Exts
+
+k1 :: (# Int, Bool #) -> (# Int, Bool #) -> Int
+{-# NOINLINE k1 #-}
+k1 _ _ = 3
+
+k2 :: (# Int#, Int# #) -> (# Int#, Int# #) -> Int
+{-# NOINLINE k2 #-}
+k2 _ _ = 3
+
+lifted :: Int -> Bool -> Int
+lifted x y = case (# x, y #) of r -> k1 r r
+
+unlifted :: Int# -> Int# -> Int
+unlifted x y = case (# x, y #) of r -> k2 r r
=====================================
testsuite/tests/simplCore/should_compile/T27910.stderr
=====================================
@@ -0,0 +1,49 @@
+
+==================== FloatOut stats: ====================
+2 Lets floated to top level; 0 Lets floated elsewhere; from 4 Lambda groups
+
+
+
+==================== FloatOut stats: ====================
+4 Lets floated to top level; 0 Lets floated elsewhere; from 6 Lambda groups
+
+
+
+==================== Grand total simplifier statistics ====================
+Total ticks: 30
+
+8 PreInlineUnconditionally
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+2 PostInlineUnconditionally
+ 1 r
+ 1 r
+4 UnfoldingDone
+ 2 GHC.Internal.Prim.void#
+ 1 T27910.k1
+ 1 T27910.k2
+8 BetaReduction
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+ 1 ds
+4 KnownBranch
+ 2 wild
+ 1 ww
+ 1 ww
+4 CaseElim
+ 2 ww
+ 2 ww
+9 SimplifierDone 9
+
+
=====================================
testsuite/tests/simplCore/should_compile/all.T
=====================================
@@ -627,5 +627,5 @@ test('T27749',
compile, ['-O -g3 -ddump-simpl -dsuppress-uniques'])
test('T27629', only_ways(['optasm']), makefile_test, ['T27629'])
-
test('T27936', normal, compile, [''])
+test('T27910', grep_errmsg(r'KnownBranch'), compile, ['-O -dno-typeable-binds -ddump-simpl-stats -dsuppress-uniques'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/efa0e15a57448ac704dba5dc0a0e0b0…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/efa0e15a57448ac704dba5dc0a0e0b0…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
[Git][ghc/ghc][wip/romes/async-rpc] interp: fix external interpreter shutdown deadlock on Windows
by Zubin (@wz1000) 16 Oct '26
by Zubin (@wz1000) 16 Oct '26
16 Oct '26
Zubin pushed to branch wip/romes/async-rpc at Glasgow Haskell Compiler / GHC
Commits:
66d87bca by Zubin Duggal at 2026-10-16T15:18:00+05:30
interp: fix external interpreter shutdown deadlock on Windows
On shutdown both GHC and iserv call `closePipe`, which stopped the drain
thread before closing the write end. On Windows the drain thread reads
with a safe foreign call to _read, which `throwTo' can't interrupt, so
the two sides were stuck in the deadlock deadlock.
Closing the write end first is not enough on its own. On Windows a read
on a pipe only unblocks once all write handles to it are closed [1].
However, all all four pipe ends were inheritable and we didn't close the
child's ends in the parent. This means a close on any one side wouldn't
unblock any reads, becuase the other side had another copy open.
* runWithPipes now uses System.Process.CommunicationHandle [2], which is
built for passing pipes to a child process: only the child's ends are
inheritable, and it simplifies our mess of CPP. Additionally, it is
important to close our copy of the endpoints passed to the child so
each side only keeps open copies it needs to allow a close to unblock
reads.
* readGhcHandle makes the handle non-inheritable so we don't have
additional references floating around that stop reads from unblocking
on close.
* In closePipe the ordering is subtle and important. We first fail any
requests still waiting for a reply, then close the write end so the
other side sees EOF. We take the write lock to close it, so we never
close under a concurrent write [3]. Only then do we stop the drain
thread, which closes the read end itself once its read has finished.
Bump bound to process >= 1.6.20 as this is the version with
System.Process.CommunicationHandle
[1] https://learn.microsoft.com/en-us/windows/win32/ipc/anonymous-pipe-operatio…
[2] https://github.com/haskell/process/pull/308
[3] https://gitlab.haskell.org/ghc/ghc/-/work_items/27801
- - - - -
6 changed files:
- compiler/GHC/Runtime/Utils.hs
- compiler/ghc.cabal.in
- libraries/ghci/GHCi/Message/Async.hs
- libraries/ghci/GHCi/Server.hs
- libraries/ghci/GHCi/Utils.hsc
- libraries/ghci/ghci.cabal.in
Changes:
=====================================
compiler/GHC/Runtime/Utils.hs
=====================================
@@ -1,84 +1,30 @@
-{-# LANGUAGE CPP #-}
-
module GHC.Runtime.Utils
( runWithPipes
)
where
import GHC.Prelude
+import GHC.Utils.Exception (onException)
-#if defined(mingw32_HOST_OS)
-import Foreign.C
-import GHC.IO.Handle.FD (fdToHandle)
-import GHC.Utils.Exception as Ex
-# if defined(__IO_MANAGER_WINIO__)
-import GHC.IO.SubSystem ((<!>))
-import GHC.IO.Handle.Windows (handleToHANDLE)
-import GHC.Event.Windows (associateHandle')
-# endif
-#else
-import System.Posix as Posix
-#endif
import System.Process
+import System.Process.CommunicationHandle
import System.IO
+-- | Spawn a process connected to us by two pipes. Important to close our copy
+-- of the endpoints passed to the child so each side only keeps open copies it
+-- needs. If we don't do that, then closing one end wouldn't interrupt reads on
+-- the other.
runWithPipes :: (CreateProcess -> IO ProcessHandle)
-> FilePath -> [String] -> [String] -> IO (ProcessHandle, Handle, Handle)
-#if defined(mingw32_HOST_OS)
-foreign import ccall "io.h _close"
- c__close :: CInt -> IO CInt
-
-foreign import ccall unsafe "io.h _get_osfhandle"
- _get_osfhandle :: CInt -> IO CIntPtr
-
-runWithPipesPOSIX :: (CreateProcess -> IO ProcessHandle)
- -> FilePath -> [String] -> [String] -> IO (ProcessHandle, Handle, Handle)
-runWithPipesPOSIX createProc prog pre_opts opts = do
- (rfd1, wfd1) <- createPipeFd -- we read on rfd1
- (rfd2, wfd2) <- createPipeFd -- we write on wfd2
- wh_client <- _get_osfhandle wfd1
- rh_client <- _get_osfhandle rfd2
- let args = pre_opts ++ (show wh_client : show rh_client : opts)
- ph <- createProc (proc prog args)
- rh <- mkHandle rfd1
- wh <- mkHandle wfd2
- return (ph, rh, wh)
- where mkHandle :: CInt -> IO Handle
- mkHandle fd = (fdToHandle fd) `Ex.onException` (c__close fd)
-
-# if defined (__IO_MANAGER_WINIO__)
-runWithPipesNative :: (CreateProcess -> IO ProcessHandle)
- -> FilePath -> [String] -> [String] -> IO (ProcessHandle, Handle, Handle)
-runWithPipesNative createProc prog pre_opts opts = do
- (rh, wfd1) <- createPipe -- we read on rfd1
- (rfd2, wh) <- createPipe -- we write on wfd2
- wh_client <- handleToHANDLE wfd1
- rh_client <- handleToHANDLE rfd2
- -- Associate the handle with the current manager
- -- but don't touch the ones we're passing to the child
- -- since it needs to register the handle with its own manager.
- associateHandle' =<< handleToHANDLE rh
- associateHandle' =<< handleToHANDLE wh
- let args = pre_opts ++ (show wh_client : show rh_client : opts)
- ph <- createProc (proc prog args)
- return (ph, rh, wh)
-
-runWithPipes = runWithPipesPOSIX <!> runWithPipesNative
-# else
-runWithPipes = runWithPipesPOSIX
-# endif
-#else
runWithPipes createProc prog pre_opts opts = do
- (rfd1, wfd1) <- Posix.createPipe -- we read on rfd1
- (rfd2, wfd2) <- Posix.createPipe -- we write on wfd2
- setFdOption rfd1 CloseOnExec True
- setFdOption wfd2 CloseOnExec True
- let args = pre_opts ++ (show wfd1 : show rfd2 : opts)
+ (rh, chTheyWrite) <- createWeReadTheyWritePipe
+ (chTheyRead, wh) <- createTheyReadWeWritePipe
+ let args = pre_opts ++ (show chTheyWrite : show chTheyRead : opts)
+ closeTheirs = do
+ closeCommunicationHandle chTheyWrite
+ closeCommunicationHandle chTheyRead
+ -- These handles have no finalizers, so close them ourselves if the spawn fails.
ph <- createProc (proc prog args)
- closeFd wfd1
- closeFd rfd2
- rh <- fdToHandle rfd1
- wh <- fdToHandle wfd2
+ `onException` (closeTheirs >> hClose rh >> hClose wh)
+ closeTheirs
return (ph, rh, wh)
-#endif
-
=====================================
compiler/ghc.cabal.in
=====================================
@@ -117,7 +117,7 @@ Library
Build-Depends: base >= 4.11 && < 4.24,
deepseq >= 1.4 && < 1.6,
directory >= 1 && < 1.4,
- process >= 1 && < 1.7,
+ process >= 1.6.20 && < 1.7,
bytestring >= 0.11 && < 0.13,
binary == 0.8.*,
text >= 2.0 && < 2.2,
=====================================
libraries/ghci/GHCi/Message/Async.hs
=====================================
@@ -106,29 +106,23 @@ mkPipeFromContinuations getSome putAll pipeCloseRead pipeCloseWrite = mdo
let p = Pipe { .. }
pure p
--- | Cleanly close our ends of the Pipe, terminating the async manager's
--- drain-read-end thread. Also calls 'pipeCloseRead' and 'pipeCloseWrite', in that order.
+-- | Close our ends of the pipe.
--
--- If the pipe was created using 'mkPipeFromHandles', the handles are also closed.
---
--- The requests we've sent that are pending are all canceled with
--- 'PipeReadClosedException' by ourselves.
---
--- No special notification is sent to the remote process, a message to that
--- effect should be sent ahead of time if one is needed (see 'Shutdown').
+-- The ordering is subtle and important. We first fail any requests still
+-- waiting for a reply, then close the write end so the other side sees EOF.
+-- We take the write lock to close it, so we never close under a concurrent
+-- write. Only then do we stop the drain thread, which closes the read end
+-- itself once its read has finished. On Windows its read can't be
+-- interrupted, so this waits for the other side to close its write end too.
closePipe :: Pipe -> IO ()
-closePipe Pipe{..} = do
-
- readAlreadyClosed <- atomically $ swapTVar pipeReadClosed True
-
- -- this triggers pipeCloseRead
- unless readAlreadyClosed $ do
-
- -- releases handle lock taken by reading, and cleans up by replying to every
- -- pending request with 'PipeReadClosedException'.
- throwTo (asyncDrainTid pipeAsyncMngr) PipeReadClosedException
-
- pipeCloseWrite
+closePipe p@Pipe{..} = do
+ readAlreadyClosed <- atomically $ do
+ closed <- readTVar pipeReadClosed
+ failPendingReplies p (toException PipeReadClosedException)
+ pure closed
+ withLock p pipeCloseWrite `finally`
+ unless readAlreadyClosed
+ (throwTo (asyncDrainTid pipeAsyncMngr) PipeReadClosedException)
-- | We've closed the pipe read end on this process
data PipeReadClosedException = PipeReadClosedException deriving Show
@@ -419,15 +413,18 @@ drainPipe p unmask = catch (unmask $ loop `finally` pipeCloseRead p) replyToPend
replyToPendings (toException PipeReadClosedException)
pure ()
- replyToPendings e = atomically $ do
- -- reqs are only added if pipe not closed;
- -- thus we close and take all pending atomically.
- writeTVar (pipeReadClosed p) True
- pendings <- swapTVar (pendingReply am) IntMap.empty -- take pending
- mapM_ (\p -> putTMVar p (Left e {-host exception-})) pendings
+ replyToPendings e = atomically $ failPendingReplies p e
am = pipeAsyncMngr p
+failPendingReplies :: Pipe -> SomeException -> STM ()
+failPendingReplies p e = do
+ -- reqs are only added if pipe not closed;
+ -- thus we close and take all pending atomically.
+ writeTVar (pipeReadClosed p) True
+ pendings <- swapTVar (pendingReply (pipeAsyncMngr p)) IntMap.empty
+ mapM_ (\wv -> putTMVar wv (Left e)) pendings
+
-- | An exception that can be thrown on the host process representing an
-- expection that happened on the remote one.
newtype RemoteProcessException = RemoteProcessException SerializableException deriving Show
=====================================
libraries/ghci/GHCi/Server.hs
=====================================
@@ -78,9 +78,6 @@ servWithCustom verbose hook pipe restore customHandler = newIORef False >>= loop
RunModFinalizers ii st qrefs -> wrapRunTH ii $ runModFinalizerRefs pipe ii st qrefs
_other -> run msg >>= reply
- -- closePipe here will wait until every active pipeWrite pipe exits, but
- -- they should never block for long, as the host process is either reading
- -- or has called pipeCloseRead.
isDone <- readIORef doneRef
if isDone then closePipe pipe
else loop doneRef
@@ -167,8 +164,8 @@ defaultServerWithCustom customHandler = do
(outh, inh, rest) <-
case args of
arg0:arg1:rest -> do
- inh <- readGhcHandle arg1
- outh <- readGhcHandle arg0
+ inh <- readGhcHandle ReadMode arg1
+ outh <- readGhcHandle WriteMode arg0
return (outh, inh, rest)
_ -> dieWithUsage
#endif
=====================================
libraries/ghci/GHCi/Utils.hsc
=====================================
@@ -8,19 +8,22 @@ where
import Prelude
import Foreign.C
import GHC.IO.Handle (Handle())
+import GHC.IO.IOMode
#if defined(mingw32_HOST_OS)
-import Foreign.Ptr (ptrToIntPtr,wordPtrToPtr)
+import Foreign.Ptr (ptrToIntPtr)
import GHC.IO (onException)
import GHC.IO.Handle.FD (fdToHandle)
-import GHC.Windows (HANDLE)
+import GHC.Windows (BOOL, DWORD, HANDLE, failIfFalse_)
import GHC.IO.SubSystem ((<!>))
import GHC.IO.Handle.Windows (mkHandleFromHANDLE)
import GHC.IO.Device as IODevice
import GHC.IO.Encoding (getLocaleEncoding)
-import GHC.IO.IOMode
import GHC.IO.Windows.Handle (fromHANDLE, Io(), NativeHandle())
+import System.Process.CommunicationHandle.Internal
+ ( CommunicationHandle(..), useCommunicationHandle )
#include <fcntl.h> /* for _O_BINARY */
+#include <windows.h>
#else
import System.Posix
@@ -54,18 +57,23 @@ getGhcHandle fd = fdToHandle $ Fd fd
#endif
-- | Read a handle passed on the command-line and prepare it to be used with the IO manager
-readGhcHandle :: String -> IO Handle
-readGhcHandle s = do
+-- also make the handle non-inheritable so we don't have additional references floating
+-- around that stop reads from unblocking on close
+readGhcHandle :: IOMode -> String -> IO Handle
#if defined(mingw32_HOST_OS)
- let fd = wordPtrToPtr (Prelude.read s)
-# if defined(__IO_MANAGER_WINIO__)
- -- register the handles we received with
- -- our I/O manager otherwise we can't use
- -- them correctly.
- return () <!> associateHandle' fd
-# endif
+readGhcHandle mode s = do
+ let ch@(CommunicationHandle h) = Prelude.read s
+ failIfFalse_ "SetHandleInformation" $
+ c_SetHandleInformation h (#const HANDLE_FLAG_INHERIT) 0
+ useCommunicationHandle (mode == ReadMode) ch
+
+foreign import ccall unsafe "windows.h SetHandleInformation"
+ c_SetHandleInformation :: HANDLE -> DWORD -> DWORD -> IO BOOL
#else
+readGhcHandle _ s = do
let fd = Prelude.read s
-#endif
+# if !defined(javascript_HOST_ARCH)
+ setFdOption (Fd fd) CloseOnExec True
+# endif
getGhcHandle fd
-
+#endif
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -108,6 +108,8 @@ library
if !os(windows)
Build-Depends: unix >= 2.7 && < 2.9
+ else
+ Build-Depends: process >= 1.6.20 && < 1.7
if arch(wasm32)
build-depends: ghc-experimental == @ProjectVersionForLib@.0
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66d87bcad518937a6d50ff2fe692bd3…
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66d87bcad518937a6d50ff2fe692bd3…
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0
16 Oct '26
Simon Peyton Jones pushed new branch wip/simpl-clo at Glasgow Haskell Compiler / GHC
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/simpl-clo
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
1
0