- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/spj-apporv-Oct24] in QuicklookArg, wrap the inferAppHead_maybe with an optional error context...
by Apoorv Ingle (＠ani) 02 Dec '25

02 Dec '25

Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: 929a03d5 by Apoorv Ingle at 2025-12-02T15:32:25-06:00 in QuicklookArg, wrap the inferAppHead_maybe with an optional error context update. If the head is a XExpr, we need to flip the state to generated - - - - - 1 changed file: - compiler/GHC/Tc/Gen/App.hs Changes: ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -1959,7 +1959,8 @@ quickLookArg1 pos app_lspan (fun, fun_lspan) larg@(L arg_loc arg) sc_arg_ty@(Sca | otherwise = fun_lspan_arg' -- Step 1: get the type of the head of the argument - ; (fun_ue, mb_fun_ty) <- tcCollectingUsage $ tcInferAppHead_maybe rn_fun_arg + ; (fun_ue, mb_fun_ty) <- maybe_update_err_ctxt fun_lspan_arg rn_fun_arg $ + (tcCollectingUsage $ tcInferAppHead_maybe rn_fun_arg) -- tcCollectingUsage: the use of an Id at the head generates usage-info -- See the call to `tcEmitBindingUsage` in `check_local_id`. So we must -- capture and save it in the `EValArgQL`. See (QLA6) in @@ -2027,6 +2028,17 @@ quickLookArg1 pos app_lspan (fun, fun_lspan) larg@(L arg_loc arg) sc_arg_ty@(Sca , eaql_encl = arg_influences_enclosing_call , eaql_res_rho = app_res_rho }) }}} + +maybe_update_err_ctxt :: SrcSpan -> HsExpr GhcRn -> TcM a -> TcM a +maybe_update_err_ctxt fun_lspan_arg rn_fun_arg thing_inside + | not (isGeneratedSrcSpan fun_lspan_arg) + , XExpr (ExpandedThingRn{}) <- rn_fun_arg + = addLExprCtxt fun_lspan_arg rn_fun_arg $ thing_inside + | otherwise + = thing_inside + + + mk_origin :: SrcSpan -- SrcSpan of the argument -> HsExpr GhcRn -- The head of the expression application chain -> HsExpr GhcRn -- Fallback expression to appear in the error message View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/929a03d58f6a7c07341dde47ecd6293… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/929a03d58f6a7c07341dde47ecd6293… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/torsten.schmits/unit-index-debug
by Torsten Schmits (＠torsten.schmits) 02 Dec '25

02 Dec '25

Torsten Schmits pushed new branch wip/torsten.schmits/unit-index-debug at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/torsten.schmits/unit-index-de… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-25636] Converting naming to NullaryClosure
by recursion-ninja (＠recursion-ninja) 02 Dec '25

02 Dec '25

recursion-ninja pushed to branch wip/fix-25636 at Glasgow Haskell Compiler / GHC Commits: 3022392c by Recursion Ninja at 2025-12-02T13:09:14-05:00 Converting naming to NullaryClosure - - - - - 14 changed files: - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/StgToJS/Prim.hs - libraries/ghci/GHCi/CreateBCO.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/ResolvedBCO.hs - libraries/ghci/GHCi/Run.hs - libraries/ghci/ghci.cabal.in - rts/PrimOps.cmm Changes: ===================================== compiler/GHC/Builtin/primops.txt.pp ===================================== @@ -3937,9 +3937,9 @@ primop MkApUpd0_Op "mkApUpd0#" GenPrimOp with out_of_line = True -primop NewUDCOp "newUDC#" GenPrimOp +primop NewNullaryClosureOp "newNullaryClosure#" GenPrimOp Addr# -> State# s -> (# State# s, a #) - { @newUDC#@ allocates a new application of an + { @newNullaryClosure#@ allocates a new application of an unlifted data constructor (identified by its info table). } with effect = ReadWriteEffect ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -107,7 +107,7 @@ bcoFreeNames bco assembleBCOs :: Profile -> FlatBag (ProtoBCO Name) - -> FlatBag UnlinkedUDC + -> FlatBag UnlinkedNullaryClosure -> [TyCon] -> [(Name, ByteString)] -> Maybe InternalModBreaks ===================================== compiler/GHC/ByteCode/Linker.hs ===================================== @@ -59,7 +59,7 @@ linkBCO -> PkgsLoaded -> LinkerEnv -> LinkedBreaks - -> NameEnv Int -- Named UDCs + -> NameEnv Int -- Named NullaryClosures -> NameEnv Int -- Named BCOs -> UnlinkedBCO -> IO ResolvedBCO @@ -161,13 +161,13 @@ resolvePtr -> PkgsLoaded -> LinkerEnv -> LinkedBreaks - -> NameEnv Int -- Named UDCs + -> NameEnv Int -- Named NullaryClosures -> NameEnv Int -- Named BCOs -> BCOPtr -> IO ResolvedBCOPtr resolvePtr interp pkgs_loaded le lb udc_ix bco_ix ptr = case ptr of BCOPtrName nm - | Just ix <- lookupNameEnv udc_ix nm -- ref to another UDC in this group + | Just ix <- lookupNameEnv udc_ix nm -- ref to another NullaryClosure in this group -> return (ResolvedBCORefUnlifted ix) | Just ix <- lookupNameEnv bco_ix nm -- ref to another BCO in this group ===================================== compiler/GHC/ByteCode/Types.hs ===================================== @@ -16,7 +16,7 @@ module GHC.ByteCode.Types , RegBitmap(..) , NativeCallType(..), NativeCallInfo(..), voidTupleReturnInfo, voidPrimCallInfo , ByteOff(..), WordOff(..), HalfWord(..) - , UnlinkedUDC(..) + , UnlinkedNullaryClosure(..) , UnlinkedBCO(..), BCOPtr(..), BCONPtr(..) , ItblEnv, ItblPtr(..) , AddrEnv, AddrPtr(..) @@ -62,7 +62,7 @@ data CompiledByteCode = CompiledByteCode { bc_bcos :: FlatBag UnlinkedBCO -- ^ Bunch of interpretable bindings - , bc_udcs :: FlatBag UnlinkedUDC + , bc_udcs :: FlatBag UnlinkedNullaryClosure , bc_itbls :: [(Name, ConInfoTable)] -- ^ Mapping from DataCons to their info tables @@ -178,16 +178,16 @@ newtype AddrPtr = AddrPtr (RemotePtr ()) {- | Named reference to an unlifted data constructor -} -data UnlinkedUDC - = UnlinkedUDC { - unlinkedUDCName :: !Name, - unlinkedUDCInfo :: !ConInfoTable +data UnlinkedNullaryClosure + = UnlinkedNullaryClosure { + unlinkedNullaryClosureName :: !Name, + unlinkedNullaryClosureInfo :: !ConInfoTable } -instance NFData UnlinkedUDC where - rnf UnlinkedUDC{..} = - rnf unlinkedUDCName `seq` - rnf unlinkedUDCInfo +instance NFData UnlinkedNullaryClosure where + rnf UnlinkedNullaryClosure{..} = + rnf unlinkedNullaryClosureName `seq` + rnf unlinkedNullaryClosureInfo {- -------------------------------------------------------------------------------- ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -1019,21 +1019,21 @@ linkSomeBCOs :: Interp linkSomeBCOs interp pkgs_loaded le lb mods = foldr fun do_link mods [] where - fun :: CompiledByteCode -> ([([UnlinkedUDC], [UnlinkedBCO])] -> t) -> [([UnlinkedUDC], [UnlinkedBCO])] -> t + fun :: CompiledByteCode -> ([([UnlinkedNullaryClosure], [UnlinkedBCO])] -> t) -> [([UnlinkedNullaryClosure], [UnlinkedBCO])] -> t fun CompiledByteCode{..} inner accum = inner ((Foldable.toList bc_udcs, Foldable.toList bc_bcos) : accum) - do_link :: [([UnlinkedUDC], [UnlinkedBCO])] -> IO [(Name, HValueRef)] + do_link :: [([UnlinkedNullaryClosure], [UnlinkedBCO])] -> IO [(Name, HValueRef)] do_link [] = return [] do_link mods = do - let flat_UDCs = [ udc | (udcs, _) <- mods, udc <- udcs ] + let flat_NullaryClosures = [ udc | (udcs, _) <- mods, udc <- udcs ] flat_BCOs = [ bco | (_, bcos) <- mods, bco <- bcos ] - names_UDCs = map unlinkedUDCName flat_UDCs + names_NullaryClosures = map unlinkedNullaryClosureName flat_NullaryClosures names_BCOs = map unlinkedBCOName flat_BCOs index_BCO = mkNameEnv (zip names_BCOs [0 ..]) - index_UDC = mkNameEnv (zip names_UDCs [length names_BCOs ..]) + index_NullaryClosure = mkNameEnv (zip names_NullaryClosures [length names_BCOs ..]) - resolved_BCOs <- sequence [ linkBCO interp pkgs_loaded le lb index_UDC index_BCO bco | bco <- flat_BCOs ] + resolved_BCOs <- sequence [ linkBCO interp pkgs_loaded le lb index_NullaryClosure index_BCO bco | bco <- flat_BCOs ] hvrefs <- createBCOs interp resolved_BCOs return (zip names_BCOs hvrefs) ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -103,7 +103,7 @@ import Control.Monad.Trans.Reader (ReaderT(..)) import Control.Monad.Trans.State (StateT(..)) import Data.Bifunctor (Bifunctor(..)) -import GHCi.ResolvedBCO (ResolvedUDC(..)) +import GHCi.ResolvedBCO (ResolvedNullaryClosure(..)) -- ----------------------------------------------------------------------------- @@ -310,7 +310,7 @@ argBits platform (rep : args) -- Compile code for the right-hand side of a top-level binding -schemeTopBind :: (Id, CgStgRhs) -> BcM (Either UnlinkedUDC (ProtoBCO Name)) +schemeTopBind :: (Id, CgStgRhs) -> BcM (Either UnlinkedNullaryClosure (ProtoBCO Name)) schemeTopBind (id, rhs) | isUnliftedType (varType id), StgRhsCon _ dCon conNo _ _ _ <- rhs = do profile <- getProfile @@ -334,8 +334,8 @@ schemeTopBind (id, rhs) Numbered i -> i NoNumber -> 0 -- This defaulting seems unsafe? - finalizer :: ConInfoTable -> Either UnlinkedUDC a - finalizer = Left . UnlinkedUDC (getName id) + finalizer :: ConInfoTable -> Either UnlinkedNullaryClosure a + finalizer = Left . UnlinkedNullaryClosure (getName id) pure . finalizer $ ConInfoTable tables_next_to_code ===================================== compiler/GHC/StgToCmm/Prim.hs ===================================== @@ -1771,7 +1771,7 @@ emitPrimOp cfg primop = DataToTagSmallOp -> alwaysExternal DataToTagLargeOp -> alwaysExternal MkApUpd0_Op -> alwaysExternal - NewUDCOp -> alwaysExternal + NewNullaryClosureOp -> alwaysExternal NewBCOOp -> alwaysExternal UnpackClosureOp -> alwaysExternal ListThreadsOp -> alwaysExternal ===================================== compiler/GHC/StgToJS/Prim.hs ===================================== @@ -1164,7 +1164,7 @@ genPrim prof bound ty op = case op of GetSparkOp -> unhandledPrimop op AnyToAddrOp -> unhandledPrimop op MkApUpd0_Op -> unhandledPrimop op - NewUDCOp -> unhandledPrimop op + NewNullaryClosureOp -> unhandledPrimop op NewBCOOp -> unhandledPrimop op UnpackClosureOp -> unhandledPrimop op ClosureSizeOp -> unhandledPrimop op ===================================== libraries/ghci/GHCi/CreateBCO.hs ===================================== @@ -14,7 +14,7 @@ -- -- | Create real byte-code objects from 'ResolvedBCO's and 'NullaryDataConApp's. -module GHCi.CreateBCO (createBCOs, createUDCs) where +module GHCi.CreateBCO (createBCOs, createNullaryClosures) where import Prelude -- See note [Why do we import Prelude here?] import GHCi.BreakArray @@ -28,20 +28,20 @@ import Data.Array.Base import Foreign hiding (newArray) import Unsafe.Coerce (unsafeCoerce) import GHC.Arr ( Array(..) ) -import GHC.Exts hiding ( BCO, mkApUpd0#, newBCO#, newUDC# ) -import GHC.Internal.Base ( BCO, mkApUpd0#, newBCO#, newUDC# ) +import GHC.Exts hiding ( BCO, mkApUpd0#, newBCO#, newNullaryClosure# ) +import GHC.Internal.Base ( BCO, mkApUpd0#, newBCO#, newNullaryClosure# ) import GHC.IO import GHC.Exts.Heap ( StgInfoTable ) import Control.Exception ( ErrorCall(..) ) -createUDCs :: [RemotePtr StgInfoTable] -> IO [HValueRef] -createUDCs dcas = do - mapM createUnliftedDataConstructor dcas +createNullaryClosures :: [RemotePtr StgInfoTable] -> IO [HValueRef] +createNullaryClosures dcas = do + mapM createNullaryClosure dcas -createUnliftedDataConstructor :: RemotePtr StgInfoTable -> IO HValueRef -createUnliftedDataConstructor infoTablePtr = +createNullaryClosure :: RemotePtr StgInfoTable -> IO HValueRef +createNullaryClosure infoTablePtr = let !(Ptr !addr#) = fromRemotePtr infoTablePtr - in IO $ \s -> newUDC# addr# s + in IO $ \s -> newNullaryClosure# addr# s createBCOs :: [ResolvedBCO] -> IO [HValueRef] createBCOs bcos = do ===================================== libraries/ghci/GHCi/Message.hs ===================================== @@ -106,7 +106,7 @@ data Message a where -- see Note [Parallelize CreateBCOs serialization] CreateBCOs :: [ResolvedBCO] -> Message [HValueRef] - CreateUDCs :: [ResolvedUDC] -> Message [HValueRef] + CreateNullaryClosures :: [ResolvedNullaryClosure] -> Message [HValueRef] -- | Release 'HValueRef's FreeHValueRefs :: [HValueRef] -> Message () @@ -588,7 +588,7 @@ getMessage = do 38 -> Msg <$> (ResumeSeq <$> get) 39 -> Msg <$> (LookupSymbolInDLL <$> get <*> get) 40 -> Msg <$> (WhereFrom <$> get) - 41 -> Msg <$> (CreateUDCs <$> get) + 41 -> Msg <$> (CreateNullaryClosures <$> get) _ -> error $ "Unknown Message code " ++ (show b) putMessage :: Message a -> Put @@ -635,7 +635,7 @@ putMessage m = case m of ResumeSeq a -> putWord8 38 >> put a LookupSymbolInDLL dll str -> putWord8 39 >> put dll >> put str WhereFrom a -> putWord8 40 >> put a - CreateUDCs ptr -> putWord8 41 >> put ptr + CreateNullaryClosures ptr -> putWord8 41 >> put ptr {- Note [Parallelize CreateBCOs serialization] ===================================== libraries/ghci/GHCi/ResolvedBCO.hs ===================================== @@ -4,7 +4,7 @@ module GHCi.ResolvedBCO ( ResolvedBCO(..) , ResolvedBCOPtr(..) - , ResolvedUDC(..) + , ResolvedNullaryClosure(..) , isLittleEndian , BCOByteArray(..) , mkBCOByteArray @@ -52,7 +52,7 @@ instance Binary ConInfoTable instance NFData ConInfoTable -- ----------------------------------------------------------------------------- --- ResolvedUDC +-- ResolvedNullaryClosure -- | A 'ResolvedBCO' is one in which all the 'Name' references have been -- resolved to actual addresses or 'RemoteHValues'. @@ -69,11 +69,11 @@ data ResolvedBCO } deriving (Generic, Show) --- | A 'ResolvedUDC' is one in which all arguments have been applied to +-- | A 'ResolvedNullaryClosure' is one in which all arguments have been applied to -- a (potentially unlifted) data constructor. -newtype ResolvedUDC - = ResolvedUDC { - unliftedDataConInfo :: ConInfoTable -- RemotePtr StgInfoTable +newtype ResolvedNullaryClosure + = ResolvedNullaryClosure { + unliftedDataConInfo :: ConInfoTable } deriving (Binary, Generic, NFData, Show) ===================================== libraries/ghci/GHCi/Run.hs ===================================== @@ -79,8 +79,8 @@ run m = case m of MkConInfoTable infoTable -> convertInfoTable infoTable ResolveObjs -> resolveObjs FindSystemLibrary str -> findSystemLibrary str - CreateUDCs dcas -> - traverse (convertInfoTable . unliftedDataConInfo) dcas >>= createUDCs + CreateNullaryClosures dcas -> + traverse (convertInfoTable . unliftedDataConInfo) dcas >>= createNullaryClosures CreateBCOs bcos -> createBCOs bcos LookupClosure str -> lookupClosure str #endif ===================================== libraries/ghci/ghci.cabal.in ===================================== @@ -83,6 +83,7 @@ library GHCi.Utils Build-Depends: + rts, array == 0.5.*, base >= 4.8 && < 4.23, binary == 0.8.*, @@ -94,7 +95,6 @@ library ghc-heap >= 9.10.1 && <=@ProjectVersionMunged@, ghc-internal >= 9.1001.0 && <=@ProjectVersionForLib@.0, ghc-prim >= 0.5.0 && < 0.14, - rts, transformers >= 0.5 && < 0.7 if flag(bootstrap) ===================================== rts/PrimOps.cmm ===================================== @@ -2145,7 +2145,7 @@ stg_deRefStablePtrzh ( P_ sp ) Bytecode object primitives ------------------------------------------------------------------------- */ -stg_newUDHzh ( W_ datacon_itbl ) +stg_newNullaryClosurezh ( W_ datacon_itbl ) { W_ p; ALLOC_PRIM(SIZEOF_StgHeader); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3022392cd8909a164dd528d85fb13a4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3022392cd8909a164dd528d85fb13a4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26519] PPC NCG: Fix shift right MO code
by Peter Trommler (＠trommler) 02 Dec '25

02 Dec '25

Peter Trommler pushed to branch wip/T26519 at Glasgow Haskell Compiler / GHC Commits: 4a9ee3c5 by Peter Trommler at 2025-12-02T12:21:46+01:00 PPC NCG: Fix shift right MO code The shift amount in shift right [arithmetic] MOs is machine word width. Thereifore remove zero- or sign-entend shift amount. It looks harmless to extend the shift amount argument because the shift right instruction uses only the seven lowest bits (i. e. mod 128). But now we have a conversion operation from a smaller type to word width around a memory load at word width. The types are not matching up but there is no check done in CodeGen. The necessary conversion from word width down to the smaller width would be translated into a no-op on PowerPC anyway. So all seems harmless if it was not for a small optimisation in getRegister'. In getRegister' a load instruction with the smaller width of the conversion operation was generated. This the loaded the most significant bits of the word in memory on a big-endian platform. These bits were zero and hence shift right was used with shift amount zero and not one as required in test Sized. Fixes #26519 - - - - - 1 changed file: - compiler/GHC/CmmToAsm/PPC/CodeGen.hs Changes: ===================================== compiler/GHC/CmmToAsm/PPC/CodeGen.hs ===================================== @@ -469,48 +469,26 @@ getRegister' _ platform (CmmLoad mem pk _) return (Any II64 code) -- catch simple cases of zero- or sign-extended load -getRegister' _ _ (CmmMachOp (MO_UU_Conv W8 W32) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II32 (\dst -> addr_code `snocOL` LD II8 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_XX_Conv W8 W32) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II32 (\dst -> addr_code `snocOL` LD II8 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_UU_Conv W8 W64) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II64 (\dst -> addr_code `snocOL` LD II8 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_XX_Conv W8 W64) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II64 (\dst -> addr_code `snocOL` LD II8 dst addr)) - --- Note: there is no Load Byte Arithmetic instruction, so no signed case here - -getRegister' _ _ (CmmMachOp (MO_UU_Conv W16 W32) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II32 (\dst -> addr_code `snocOL` LD II16 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_SS_Conv W16 W32) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II32 (\dst -> addr_code `snocOL` LA II16 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_UU_Conv W16 W64) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II64 (\dst -> addr_code `snocOL` LD II16 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_SS_Conv W16 W64) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II64 (\dst -> addr_code `snocOL` LA II16 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_UU_Conv W32 W64) [CmmLoad mem _ _]) = do - Amode addr addr_code <- getAmode D mem - return (Any II64 (\dst -> addr_code `snocOL` LD II32 dst addr)) - -getRegister' _ _ (CmmMachOp (MO_SS_Conv W32 W64) [CmmLoad mem _ _]) = do - -- lwa is DS-form. See Note [Power instruction format] - Amode addr addr_code <- getAmode DS mem - return (Any II64 (\dst -> addr_code `snocOL` LA II32 dst addr)) +getRegister' _ _ (CmmMachOp (MO_UU_Conv src tgt) [CmmLoad mem pk _]) + | src < tgt + , cmmTypeFormat pk == intFormat src = loadZeroExpand mem pk tgt + +getRegister' _ _ (CmmMachOp (MO_XX_Conv src tgt) [CmmLoad mem pk _]) + | src < tgt + , cmmTypeFormat pk == intFormat src = loadZeroExpand mem pk tgt + + -- XXX: This is ugly, refactor +getRegister' _ _ (CmmMachOp (MO_SS_Conv src tgt) [CmmLoad mem pk _]) + -- Note: there is no Load Byte Arithmetic instruction + | cmmTypeFormat pk /= II8 + , src < tgt = do + let format = cmmTypeFormat pk + -- lwa is DS-form. See Note [Power instruction format] + let form = if format >= II32 then DS else D + Amode addr addr_code <- getAmode form mem + let code dst = assert (format == intFormat src) + $ addr_code `snocOL` LA format dst addr + return (Any (intFormat tgt) code) getRegister' config platform (CmmMachOp (MO_RelaxedRead w) [e]) = getRegister' config platform (CmmLoad e (cmmBits w) NaturallyAligned) @@ -791,6 +769,12 @@ extendSExpr from to x = CmmMachOp (MO_SS_Conv from to) [x] extendUExpr :: Width -> Width -> CmmExpr -> CmmExpr extendUExpr from to x = CmmMachOp (MO_UU_Conv from to) [x] +loadZeroExpand :: CmmExpr -> CmmType -> Width -> NatM Register +loadZeroExpand mem pk tgt = do + Amode addr addr_code <- getAmode D mem + let code dst = addr_code `snocOL` LD (cmmTypeFormat pk) dst addr + return (Any (intFormat tgt) code) + -- ----------------------------------------------------------------------------- -- The 'Amode' type: Memory addressing modes passed up the tree. @@ -2450,8 +2434,8 @@ srCode width sgn instr x y = do let op_len = max W32 width extend = if sgn then extendSExpr else extendUExpr (src1, code1) <- getSomeReg (extend width op_len x) - (src2, code2) <- getSomeReg (extendUExpr width op_len y) - -- Note: Shift amount `y` is unsigned + (src2, code2) <- getSomeReg y + let code dst = code1 `appOL` code2 `snocOL` instr (intFormat op_len) dst src1 (RIReg src2) return (Any (intFormat width) code) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a9ee3c55a78ba84dfbc975a548e3dd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a9ee3c55a78ba84dfbc975a548e3dd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] docs: fix StandaloneKindSignatures in DataKinds docs
by Marge Bot (＠marge-bot) 02 Dec '25

02 Dec '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: fc1d7f79 by Jade Lovelace at 2025-12-02T11:04:09-05:00 docs: fix StandaloneKindSignatures in DataKinds docs These should be `type` as otherwise GHC reports a duplicate definition error. - - - - - 1 changed file: - docs/users_guide/exts/data_kinds.rst Changes: ===================================== docs/users_guide/exts/data_kinds.rst ===================================== @@ -283,17 +283,17 @@ following ways: -- REJECTED: The kind mentions Symbol, which requires DataKinds to use in -- a kind position - data D2 :: Symbol -> Type + type D2 :: Symbol -> Type data D2 a -- ACCEPTED: The kind mentions a type synonym MyType that expands to -- Type, which doesn't require DataKinds - data D3 :: MyType -> Type + type D3 :: MyType -> Type data D3 a -- REJECTED: The kind mentions a type synonym MySymbol that expands to -- Symbol, which requires DataKinds to use in a kind position - data D4 :: MySymbol -> Type + type D4 :: MySymbol -> Type data D4 a Unique syntax for type-level lists and tuples View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fc1d7f7966f56bbe5efaf2796c430db… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fc1d7f7966f56bbe5efaf2796c430db… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Re CLC issue 292 Warn GHC.Internal.List.{init,last} are partial
by Marge Bot (＠marge-bot) 02 Dec '25

02 Dec '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: ab20eb54 by Mike Pilgrem at 2025-12-01T22:46:55+00:00 Re CLC issue 292 Warn GHC.Internal.List.{init,last} are partial Also corrects the warning for `tail` to refer to `Data.List.uncons` (like the existing warning for `head`). In module `Settings.Warnings`, applies `-Wno-x-partial` to the `filepath`, and `parsec` packages (outside GHC's repository). Also bumps submodules. - - - - - 25 changed files: - compiler/GHC/Core/Utils.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Prelude/Basic.hs - ghc/GHCi/UI.hs - ghc/Main.hs - hadrian/src/Settings/Warnings.hs - libraries/base/changelog.md - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/List.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - libraries/template-haskell/vendored-filepath/System/FilePath/Posix.hs - libraries/template-haskell/vendored-filepath/System/FilePath/Windows.hs - testsuite/tests/driver/j-space/jspace.hs - testsuite/tests/rts/KeepCafsBase.hs - utils/check-exact/Main.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs - utils/ghc-pkg/Main.hs - utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/hpc - utils/hsc2hs Changes: ===================================== compiler/GHC/Core/Utils.hs ===================================== @@ -115,7 +115,6 @@ import GHC.Utils.Misc import Data.ByteString ( ByteString ) import Data.Function ( on ) import Data.List ( sort, sortBy, partition, zipWith4, mapAccumL ) -import qualified Data.List as Partial ( init, last ) import Data.Ord ( comparing ) import Control.Monad ( guard ) import qualified Data.Set as Set @@ -1896,10 +1895,10 @@ app_ok fun_ok primop_ok fun args PrimOpId op _ | primOpIsDiv op - , Lit divisor <- Partial.last args + , Lit divisor <- last 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) (Partial.init args) + -> not (isZeroLit divisor) && all (expr_ok fun_ok primop_ok) (init 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 ===================================== compiler/GHC/Driver/Session/Units.hs ===================================== @@ -39,7 +39,7 @@ import System.FilePath import Control.Monad import Data.List ( partition, (\\) ) import qualified Data.Set as Set -import Prelude +import GHC.Prelude import GHC.ResponseFile (expandResponse) import Data.Bifunctor import GHC.Data.Graph.Directed ===================================== compiler/GHC/Prelude/Basic.hs ===================================== @@ -2,8 +2,8 @@ {-# OPTIONS_HADDOCK not-home #-} {-# OPTIONS_GHC -O2 #-} -- See Note [-O2 Prelude] --- See Note [Proxies for head and tail] -{-# OPTIONS_GHC -Wno-unrecognised-warning-flags -Wno-x-partial #-} +-- See Note [Proxies for partial list functions] +{-# OPTIONS_GHC -Wno-x-partial #-} -- | Custom minimal GHC "Prelude" -- @@ -24,7 +24,7 @@ module GHC.Prelude.Basic , bit , shiftL, shiftR , setBit, clearBit - , head, tail, unzip + , head, tail, init, last, unzip , strictGenericLength ) where @@ -59,7 +59,7 @@ NoImplicitPrelude. There are two motivations for this: -} import qualified Prelude -import Prelude as X hiding ((<>), Applicative(..), Foldable(..), head, tail, unzip) +import Prelude as X hiding ((<>), Applicative(..), Foldable(..), head, tail, init, last, unzip) import Control.Applicative (Applicative(..)) import Data.Foldable as X (Foldable (elem, foldMap, foldl, foldl', foldr, length, null, product, sum)) import Data.Foldable1 as X hiding (head, last) @@ -118,24 +118,35 @@ setBit = \ x i -> x Bits..|. bit i clearBit :: (Num a, Bits.Bits a) => a -> Int -> a clearBit = \ x i -> x Bits..&. Bits.complement (bit i) -{- Note [Proxies for head and tail] +{- Note [Proxies for partial list functions] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Prelude.head and Prelude.tail have recently acquired {-# WARNING in "x-partial" #-}, +Prelude.head, Prelude.tail, Prelude.init and Prelude.last +have recently acquired {-# WARNING in "x-partial" #-}, but the GHC codebase uses them fairly extensively and insists on building warning-free. Thus, instead of adding {-# OPTIONS_GHC -Wno-x-partial #-} to every module which employs them, we define warning-less proxies and export them from GHC.Prelude. -} --- See Note [Proxies for head and tail] +-- See Note [Proxies for partial list functions] head :: HasCallStack => [a] -> a head = Prelude.head {-# INLINE head #-} --- See Note [Proxies for head and tail] +-- See Note [Proxies for partial list functions] tail :: HasCallStack => [a] -> [a] tail = Prelude.tail {-# INLINE tail #-} +-- See Note [Proxies for partial list functions] +init :: HasCallStack => [a] -> [a] +init = Prelude.init +{-# INLINE init #-} + +-- See Note [Proxies for partial list functions] +last :: HasCallStack => [a] -> a +last = Prelude.last +{-# INLINE last #-} + {- | The 'genericLength' function defined in base can't be specialised due to the NOINLINE pragma. ===================================== ghc/GHCi/UI.hs ===================================== @@ -145,7 +145,7 @@ import Data.Time.LocalTime ( getZonedTime ) import Data.Time.Format ( formatTime, defaultTimeLocale ) import Data.Version ( showVersion ) import qualified Data.Semigroup as S -import Prelude hiding ((<>)) +import GHC.Prelude import GHC.Utils.Exception as Exception hiding (catch, mask, handle) import Foreign hiding (void) ===================================== ghc/Main.hs ===================================== @@ -2,7 +2,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE TupleSections #-} -{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} +{-# OPTIONS_GHC -Wno-x-partial -Wno-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} ----------------------------------------------------------------------------- -- ===================================== hadrian/src/Settings/Warnings.hs ===================================== @@ -72,7 +72,11 @@ ghcWarningsArgs = do , package terminfo ? pure [ "-Wno-unused-imports", "-Wno-deriving-typeable" ] , package stm ? pure [ "-Wno-deriving-typeable" ] , package osString ? pure [ "-Wno-deriving-typeable", "-Wno-unused-imports" ] - , package parsec ? pure [ "-Wno-deriving-typeable" ] + , package parsec ? pure [ "-Wno-deriving-typeable" + , "-Wno-x-partial" + ] + + , package filepath ? pure [ "-Wno-x-partial" ] , package cabal ? pure [ "-Wno-deriving-typeable", "-Wno-incomplete-record-selectors" ] -- The -Wno-incomplete-record-selectors is due to ===================================== libraries/base/changelog.md ===================================== @@ -1,6 +1,9 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) ## 4.23.0.0 *TBA* + * Add `{-# WARNING in "x-partial" #-}` to `Data.List.{init,last}`. + Use `{-# OPTIONS_GHC -Wno-x-partial #-}` to disable it. + ([CLC proposal #87](https://github.com/haskell/core-libraries-committee/issues/292)) * Remove deprecated, unstable heap representation details from `GHC.Exts` ([CLC proposal #212](https://github.com/haskell/core-libraries-committee/issues/212)) * Add `Data.List.NonEmpty.mapMaybe`. ([CLC proposal #337](https://github.com/haskell/core-libraries-committee/issues/337)) * Fix issues with toRational for types capable to represent infinite and not-a-number values ([CLC proposal #338](https://github.com/haskell/core-libraries-committee/issues/338)) ===================================== libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs ===================================== @@ -1,5 +1,6 @@ {-# LANGUAGE Trustworthy #-} {-# LANGUAGE LambdaCase #-} +{-# OPTIONS_GHC -Wno-x-partial #-} -- | contains a prettyprinter for the -- Template Haskell datatypes ===================================== libraries/ghc-internal/src/GHC/Internal/Float.hs ===================================== @@ -13,6 +13,9 @@ {-# OPTIONS_HADDOCK not-home #-} {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} +-- For init in formatRealFloatAlt +{-# OPTIONS_GHC -Wno-x-partial #-} + ----------------------------------------------------------------------------- -- | -- Module : GHC.Internal.Float ===================================== libraries/ghc-internal/src/GHC/Internal/List.hs ===================================== @@ -190,12 +190,18 @@ tail :: HasCallStack => [a] -> [a] tail (_:xs) = xs tail [] = errorEmptyList "tail" -{-# WARNING in "x-partial" tail "This is a partial function, it throws an error on empty lists. Replace it with 'drop' 1, or use pattern matching or 'GHC.Internal.Data.List.uncons' instead. Consider refactoring to use \"Data.List.NonEmpty\"." #-} +{-# WARNING in "x-partial" tail "This is a partial function, it throws an error on empty lists. Replace it with 'drop' 1, or use pattern matching or 'Data.List.uncons' instead. Consider refactoring to use \"Data.List.NonEmpty\"." #-} -- | $\mathcal{O}(n)$. Extract the last element of a list, which must be -- finite and non-empty. -- --- WARNING: This function is partial. Consider using 'unsnoc' instead. +-- To disable the warning about partiality put +-- @{-# OPTIONS_GHC -Wno-x-partial -Wno-unrecognised-warning-flags #-}@ +-- at the top of the file. To disable it throughout a package put the same +-- options into @ghc-options@ section of Cabal file. To disable it in GHCi +-- put @:set -Wno-x-partial -Wno-unrecognised-warning-flags@ into @~/.ghci@ +-- config file. See also the +-- [migration guide](https://github.com/haskell/core-libraries-committee/blob/main/guides…. -- -- ==== __Examples__ -- @@ -218,10 +224,18 @@ last xs = foldl (\_ x -> x) lastError xs lastError :: HasCallStack => a lastError = errorEmptyList "last" +{-# WARNING in "x-partial" last "This is a partial function, it throws an error on empty lists. Use 'Data.List.unsnoc' instead. Consider refactoring to use \"Data.List.NonEmpty\"." #-} + -- | $\mathcal{O}(n)$. Return all the elements of a list except the last one. -- The list must be non-empty. -- --- WARNING: This function is partial. Consider using 'unsnoc' instead. +-- To disable the warning about partiality put +-- @{-# OPTIONS_GHC -Wno-x-partial -Wno-unrecognised-warning-flags #-}@ +-- at the top of the file. To disable it throughout a package put the same +-- options into @ghc-options@ section of Cabal file. To disable it in GHCi +-- put @:set -Wno-x-partial -Wno-unrecognised-warning-flags@ into @~/.ghci@ +-- config file. See also the +-- [migration guide](https://github.com/haskell/core-libraries-committee/blob/main/guides…. -- -- ==== __Examples__ -- @@ -240,6 +254,8 @@ init (x:xs) = init' x xs where init' _ [] = [] init' y (z:zs) = y : init' z zs +{-# WARNING in "x-partial" init "This is a partial function, it throws an error on empty lists. Use 'Data.List.unsnoc' instead. Consider refactoring to use \"Data.List.NonEmpty\"." #-} + -- | $\mathcal{O}(1)$. Test whether a list is empty. -- -- >>> null [] ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO.hs ===================================== @@ -1,5 +1,6 @@ {-# LANGUAGE Trustworthy #-} {-# LANGUAGE CPP, NoImplicitPrelude, CApiFFI #-} +{-# OPTIONS_GHC -Wno-x-partial #-} ----------------------------------------------------------------------------- -- | ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs ===================================== @@ -1,4 +1,5 @@ {-# OPTIONS_HADDOCK not-home #-} -- we want users to import Language.Haskell.TH.Syntax instead +{-# OPTIONS_GHC -Wno-x-partial #-} {-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} ===================================== libraries/template-haskell/vendored-filepath/System/FilePath/Posix.hs ===================================== @@ -1,6 +1,7 @@ -- Vendored from filepath v1.4.2.2 {-# LANGUAGE PatternGuards #-} +{-# OPTIONS_GHC -Wno-x-partial #-} -- This template expects CPP definitions for: -- MODULE_NAME = Posix | Windows ===================================== libraries/template-haskell/vendored-filepath/System/FilePath/Windows.hs ===================================== @@ -1,6 +1,7 @@ -- Vendored from filepath v1.4.2.2 {-# LANGUAGE PatternGuards #-} +{-# OPTIONS_GHC -Wno-x-partial #-} -- This template expects CPP definitions for: -- MODULE_NAME = Posix | Windows ===================================== testsuite/tests/driver/j-space/jspace.hs ===================================== @@ -7,7 +7,7 @@ import System.Environment import GHC.Driver.Env.Types import GHC.Profiling import System.Mem -import Data.List (isPrefixOf) +import Data.List (isPrefixOf, unsnoc) import Control.Monad import System.Exit import GHC.Platform @@ -41,7 +41,9 @@ initGhcM xs = do requestHeapCensus performGC [ys] <- filter (isPrefixOf (ghcUnitId <> ":GHC.Unit.Module.ModDetails.ModDetails")) . lines <$> readFile "jspace.hp" - let (n :: Int) = read (last (words ys)) + let (n :: Int) = case unsnoc (words ys) of + Nothing -> error "input is unexpectedly empty" + Just (_, lst) -> read lst -- The output should be 50 * 8 * word_size (i.e. 3600, or 1600 on 32-bit architectures): -- the test contains DEPTH + WIDTH + 2 = 50 modules J, H_0, .., H_DEPTH, W_1, .., W_WIDTH, -- and each ModDetails contains 1 (info table) + 8 word-sized fields. ===================================== testsuite/tests/rts/KeepCafsBase.hs ===================================== @@ -1,3 +1,5 @@ +{-# OPTIONS_GHC -Wno-x-partial #-} + module KeepCafsBase (x) where x :: Int ===================================== utils/check-exact/Main.hs ===================================== @@ -6,6 +6,7 @@ {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} {-# OPTIONS_GHC -Wno-incomplete-patterns #-} {-# OPTIONS_GHC -Wno-orphans #-} +{-# OPTIONS_GHC -Wno-x-partial #-} import Data.Data import Data.List (intercalate) ===================================== utils/check-exact/Transform.hs ===================================== @@ -96,6 +96,7 @@ import GHC.Data.FastString import GHC.Types.SrcLoc import Data.Data +import Data.List (unsnoc) import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE import Data.Maybe @@ -212,8 +213,9 @@ captureTypeSigSpacing (L l (SigD x (TypeSig (AnnSig (EpUniTok dca u) mp md) ns ( where -- we want DPs for the distance from the end of the ns to the -- AnnDColon, and to the start of the ty - rd = case last ns of - L (EpAnn anc' _ _) _ -> epaLocationRealSrcSpan anc' + rd = case unsnoc ns of + Nothing -> error "unexpected empty list in 'ns' variable" + Just (_, L (EpAnn anc' _ _) _) -> epaLocationRealSrcSpan anc' dca' = case dca of EpaSpan ss@(RealSrcSpan r _) -> (EpaDelta ss (ss2delta (ss2posEnd rd) r) []) _ -> dca @@ -294,7 +296,7 @@ setEntryDP (L (EpAnn (EpaSpan ss@(RealSrcSpan r _)) an cs) a) dp where cs'' = setPriorComments cs [] csd = L (EpaDelta ss dp NoComments) c:commentOrigDeltas cs' - lc = last $ (L ca c:cs') + lc = NE.last (L ca c :| cs') delta = case getLoc lc of EpaSpan (RealSrcSpan rr _) -> ss2delta (ss2pos rr) r EpaSpan _ -> (SameLine 0) ===================================== utils/check-exact/Utils.hs ===================================== @@ -37,7 +37,7 @@ import GHC.Base (NonEmpty(..)) import GHC.Parser.Lexer (allocateComments) import Data.Data hiding ( Fixity ) -import Data.List (sortBy, partition) +import Data.List (sortBy, partition, unsnoc) import qualified Data.Map.Strict as Map import Debug.Trace @@ -734,8 +734,9 @@ ghead info [] = error $ "ghead "++info++" []" ghead _info (h:_) = h glast :: String -> [a] -> a -glast info [] = error $ "glast " ++ info ++ " []" -glast _info h = last h +glast info xs = case unsnoc xs of + Nothing -> error $ "glast " ++ info ++ " []" + Just (_, lst) -> lst gtail :: String -> [a] -> [a] gtail info [] = error $ "gtail " ++ info ++ " []" ===================================== utils/ghc-pkg/Main.hs ===================================== @@ -8,7 +8,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans -Wno-x-partial #-} -- Fine if this comes from make/Hadrian or the pre-built base. #include <ghcplatform.h> ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs ===================================== @@ -14,6 +14,7 @@ module GHC.Toolchain.Utils import Control.Exception import Control.Monad import Control.Monad.IO.Class +import Data.List (unsnoc) import System.Directory import System.FilePath import System.IO.Error @@ -67,5 +68,4 @@ isSuccess = \case ExitFailure _ -> False lastLine :: String -> String -lastLine "" = "" -lastLine s = last $ lines s +lastLine = maybe "" snd . unsnoc . lines ===================================== utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs ===================================== @@ -755,11 +755,15 @@ ppHtmlIndex divAlphabet << unordList ( map (\str -> anchor ! [href (subIndexHtmlFile str)] << str) $ - [ [c] | c <- initialChars, any ((== c) . toUpper . head . fst) index + [ [c] | c <- initialChars, any (indexStartsWith c) index ] ++ [merged_name] ) + indexStartsWith :: Char -> (String, t) -> Bool + indexStartsWith c (indexChar1 : _, _) = toUpper indexChar1 == c + indexStartsWith _ _ = False + -- todo: what about names/operators that start with Unicode -- characters? -- Exports beginning with '_' can be listed near the end, @@ -772,7 +776,7 @@ ppHtmlIndex writeUtf8File (joinPath [odir, subIndexHtmlFile [c]]) (renderToString debug html) where html = indexPage True (Just c) index_part - index_part = [(n, stuff) | (n, stuff) <- this_ix, toUpper (head n) == c] + index_part = [(n, stuff) | (n@(headN : _), stuff) <- this_ix, toUpper headN == c] index :: [(String, Map GHC.Name [(Module, Bool)])] index = sortBy cmp (Map.toAscList full_index) ===================================== utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs ===================================== @@ -30,7 +30,7 @@ import Control.Arrow (first) import Control.Monad import Data.Char (chr, isAlpha, isSpace, isUpper) import Data.Functor (($>)) -import Data.List (elemIndex, intercalate, intersperse, unfoldr) +import Data.List (elemIndex, intercalate, intersperse, unfoldr, unsnoc) import Data.Maybe (fromMaybe, mapMaybe) import Data.Monoid import qualified Data.Set as Set @@ -870,10 +870,10 @@ codeblock = DocCodeBlock . parseParagraph . dropSpaces <$> ("@" *> skipHorizontalSpace *> "\n" *> block' <* "@") where - dropSpaces xs = - case splitByNl xs of - [] -> xs - ys -> case T.uncons (last ys) of + dropSpaces xs = let ys = splitByNl xs in + case unsnoc ys of + Nothing -> xs + Just (_, lastYs) -> case T.uncons lastYs of Just (' ', _) -> case mapM dropSpace ys of Nothing -> xs Just zs -> T.intercalate "\n" zs ===================================== utils/hpc ===================================== @@ -1 +1 @@ -Subproject commit 5923da3fe77993b7afc15b5163cffcaa7da6ecf5 +Subproject commit dd43f7e139d7a4f4908d1e8af35a75939f763ef1 ===================================== utils/hsc2hs ===================================== @@ -1 +1 @@ -Subproject commit fe3990b9f35000427b016a79330d9f195587cad8 +Subproject commit 2059c961fc28bbfd0cafdbef96d5d21f1d911b53 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab20eb5474df69dd56352a4b3e3bdaa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab20eb5474df69dd56352a4b3e3bdaa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-part2] Wibbles to depth bound
by Simon Peyton Jones (＠simonpj) 02 Dec '25

02 Dec '25

Simon Peyton Jones pushed to branch wip/T23162-part2 at Glasgow Haskell Compiler / GHC Commits: b261357e by Simon Peyton Jones at 2025-12-02T15:46:07+00:00 Wibbles to depth bound - - - - - 6 changed files: - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/FunDeps.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Rewrite.hs - compiler/GHC/Tc/Types/CtLoc.hs Changes: ===================================== compiler/GHC/Tc/Errors/Ppr.hs ===================================== @@ -167,9 +167,11 @@ instance Diagnostic TcRnMessage where -> mkSimpleDecorated $ pprSolverReportWithCtxt msg TcRnSolverDepthError ty depth -> mkSimpleDecorated msg where + pp_type_or_constraint | isConstraintLikeKind (typeKind ty) = text "constraint" + | otherwise = text "type" msg = vcat [ text "Reduction stack overflow; size =" <+> ppr depth - , hang (text "When simplifying the following type:") + , hang (text "When simplifying the following" <+> pp_type_or_constraint <> colon) 2 (ppr ty) ] TcRnRedundantConstraints redundants (info, show_info) -> mkSimpleDecorated $ ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -349,11 +349,11 @@ can_eq_nc True _rdr_env _envs ev ReprEq ty1 _ ty2 _ can_eq_nc _rewritten rdr_env envs ev eq_rel ty1 ps_ty1 ty2 ps_ty2 | ReprEq <- eq_rel , Just stuff1 <- tcTopNormaliseNewTypeTF_maybe envs rdr_env ty1 - = can_eq_newtype_nc rdr_env envs ev NotSwapped ty1 stuff1 ty2 ps_ty2 + = can_eq_newtype_nc rdr_env envs ev NotSwapped stuff1 ty2 ps_ty2 | ReprEq <- eq_rel , Just stuff2 <- tcTopNormaliseNewTypeTF_maybe envs rdr_env ty2 - = can_eq_newtype_nc rdr_env envs ev IsSwapped ty2 stuff2 ty1 ps_ty1 + = can_eq_newtype_nc rdr_env envs ev IsSwapped stuff2 ty1 ps_ty1 -- Then, get rid of casts can_eq_nc rewritten rdr_env envs ev eq_rel (CastTy ty1 co1) _ ty2 ps_ty2 @@ -777,18 +777,17 @@ though, because we check our depth in `can_eq_newtype_nc`. can_eq_newtype_nc :: GlobalRdrEnv -> FamInstEnvs -> CtEvidence -- ^ :: ty1 ~ ty2 -> SwapFlag - -> TcType -- ^ ty1 -> ((Bag GlobalRdrElt, TcCoercion), TcType) -- ^ :: ty1 ~ ty1' -> TcType -- ^ ty2 -> TcType -- ^ ty2, with type synonyms -> TcS (StopOrContinue (Either IrredCt EqCt)) -can_eq_newtype_nc rdr_env envs ev swapped ty1 ((gres, co1), ty1') ty2 ps_ty2 +can_eq_newtype_nc rdr_env envs ev swapped ((gres, co1), ty1') ty2 ps_ty2 = do { traceTcS "can_eq_newtype_nc" $ vcat [ ppr ev, ppr swapped, ppr co1, ppr gres, ppr ty1', ppr ty2 ] -- Check for blowing our stack, and increase the depth -- See Note [Newtypes can blow the stack] - ; loc' <- bumpReductionDepth (ctEvLoc ev) ty1 + ; loc' <- bumpReductionDepth (ctEvLoc ev) (ctEvPred ev) ; let ev' = ev `setCtEvLoc` loc' -- Next, we record uses of newtype constructors, since coercing ===================================== compiler/GHC/Tc/Solver/FunDeps.hs ===================================== @@ -38,6 +38,7 @@ import GHC.Utils.Panic import GHC.Data.Pair import Data.Maybe( isNothing, isJust, mapMaybe ) +import Control.Monad( void ) {- Note [Overview of functional dependencies in type inference] @@ -303,17 +304,20 @@ tryDictFunDeps :: DictCt -> SolverStage () tryDictFunDeps dict_ct = do { -- Note [Do local fundeps before top-level instances] - tryDictFunDepsLocal dict_ct - ; tryDictFunDepsTop dict_ct } + insoluble <- tryDictFunDepsLocal dict_ct + ; if insoluble + then nopStage () + else tryDictFunDepsTop dict_ct } -tryDictFunDepsLocal :: DictCt -> SolverStage () +tryDictFunDepsLocal :: DictCt -> SolverStage Bool -- Using functional dependencies, interact the DictCt with the -- inert Givens and Wanteds, to produce new equalities +-- Returns True if the fundeps are insoluble tryDictFunDepsLocal dict_ct@(DictCt { di_cls = cls, di_ev = work_ev }) | isGiven work_ev = -- If work_ev is Given, there could in principle be some inert Wanteds -- but in practice there never are because we solve Givens first - nopStage () + nopStage False | otherwise = Stage $ @@ -324,14 +328,15 @@ tryDictFunDepsLocal dict_ct@(DictCt { di_cls = cls, di_ev = work_ev }) ; let eqns :: [FunDepEqns] eqns = foldr ((++) . do_interaction) [] $ findDictsByClass (inert_dicts inerts) cls - ; imp <- solveFunDeps work_ev eqns + ; (insoluble, unif_happened) <- solveFunDeps work_ev eqns ; traceTcS "tryDictFunDepsLocal }" $ - text "imp =" <+> ppr imp $$ text "eqns = " <+> ppr eqns + text "unif =" <+> ppr unif_happened $$ text "eqns = " <+> ppr eqns - ; if imp then startAgainWith (CDictCan dict_ct) - -- See (DFL1) of Note [Do fundeps last] - else continueWith () } + -- See (DFL1) of Note [Do fundeps last] + ; if insoluble then continueWith True + else if unif_happened then startAgainWith (CDictCan dict_ct) + else continueWith False } where work_pred = ctEvPred work_ev work_is_given = isGiven work_ev @@ -356,11 +361,12 @@ tryDictFunDepsTop dict_ct@(DictCt { di_ev = ev, di_cls = cls, di_tys = xis }) ; traceTcS "tryDictFunDepsTop {" (ppr dict_ct) ; let eqns :: [FunDepEqns] eqns = improveFromInstEnv inst_envs cls xis - ; imp <- solveFunDeps ev eqns - ; traceTcS "tryDictFunDepsTop }" (text "imp =" <+> ppr imp) + ; (insoluble, unif_happened) <- solveFunDeps ev eqns + ; traceTcS "tryDictFunDepsTop }" (text "unif =" <+> ppr unif_happened) - ; if imp then startAgainWith (CDictCan dict_ct) - else continueWith () } + ; if not insoluble && unif_happened + then startAgainWith (CDictCan dict_ct) + else continueWith () } {- Note [No Given/Given fundeps] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -481,12 +487,12 @@ tryFamEqFunDeps eqs_for_me fam_tc work_args = if isGiven ev then tryGivenBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_item else do { -- Note [Do local fundeps before top-level instances] - tryFDEqns fam_tc work_args work_item $ - mkLocalBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_rhs + insoluble <- tryFDEqns fam_tc work_args work_item $ + mkLocalBuiltinFamEqFDs eqs_for_me fam_tc ops work_args work_rhs - ; if hasRelevantGiven eqs_for_me work_args work_item + ; if insoluble || hasRelevantGiven eqs_for_me work_args work_item ; then nopStage () - else tryFDEqns fam_tc work_args work_item $ + else void $ tryFDEqns fam_tc work_args work_item $ mkTopBuiltinFamEqFDs fam_tc ops work_args work_rhs } | isGiven ev -- See (INJFAM:Given) @@ -496,15 +502,16 @@ tryFamEqFunDeps eqs_for_me fam_tc work_args | otherwise -- Wanted, user-defined type families = do { -- Note [Do local fundeps before top-level instances] - case tyConInjectivityInfo fam_tc of - NotInjective -> nopStage() + insoluble <- case tyConInjectivityInfo fam_tc of + NotInjective -> nopStage False Injective inj -> tryFDEqns fam_tc work_args work_item $ mkLocalFamEqFDs eqs_for_me fam_tc inj work_args work_rhs - ; if hasRelevantGiven eqs_for_me work_args work_item + ; if insoluble || hasRelevantGiven eqs_for_me work_args work_item then nopStage () - else tryFDEqns fam_tc work_args work_item $ - mkTopFamEqFDs fam_tc work_args work_rhs } + else void $ tryFDEqns fam_tc work_args work_item $ + mkTopFamEqFDs fam_tc work_args work_rhs + ; nopStage () } mkTopFamEqFDs :: TyCon -> [TcType] -> Xi -> TcS [FunDepEqns] mkTopFamEqFDs fam_tc work_args work_rhs @@ -526,17 +533,19 @@ mkTopFamEqFDs fam_tc work_args work_rhs -- closed type families with no equations (isClosedFamilyTyCon_maybe returns Nothing) return [] -tryFDEqns :: TyCon -> [TcType] -> EqCt -> TcS [FunDepEqns] -> SolverStage () +tryFDEqns :: TyCon -> [TcType] -> EqCt -> TcS [FunDepEqns] -> SolverStage Bool +-- Returns True <=> some of the fundep eqns were insoluble tryFDEqns fam_tc work_args work_item@(EqCt { eq_ev = ev, eq_rhs= rhs }) mk_fd_eqns = Stage $ do { fd_eqns <- mk_fd_eqns ; traceTcS "tryFDEqns" (vcat [ text "lhs:" <+> ppr fam_tc <+> ppr work_args , text "rhs:" <+> ppr rhs , text "eqns:" <+> ppr fd_eqns ]) - ; imp <- solveFunDeps ev fd_eqns + ; (insoluble, unif_happened) <- solveFunDeps ev fd_eqns - ; if imp then startAgainWith (CEqCan work_item) - else continueWith () } + ; if insoluble then continueWith True + else if unif_happened then startAgainWith (CEqCan work_item) + else continueWith False } ----------------------------------------- -- User-defined type families @@ -878,7 +887,8 @@ solving. solveFunDeps :: CtEvidence -- The work item -> [FunDepEqns] - -> TcS Bool + -> TcS ( Bool -- True <=> some insoluble fundeps + , Bool ) -- True <=> unifications happened -- Solve a bunch of type-equality equations, generated by functional dependencies -- By "solve" we mean: (only) do unifications. We do not generate evidence, and -- other than unifications there should be no effects whatsoever @@ -888,12 +898,13 @@ solveFunDeps :: CtEvidence -- The work item -- See (SOLVE-FD) in Note [Overview of functional dependencies in type inference] solveFunDeps work_ev fd_eqns | null fd_eqns - = return False -- Common case no-op + = return (False, False) -- Common case no-op | otherwise - = do { loc' <- bumpReductionDepth (ctEvLoc work_ev) (ctEvPred work_ev) + = do { traceTcS "bumping" (ppr work_ev) + ; loc' <- bumpReductionDepth (ctEvLoc work_ev) (ctEvPred work_ev) - ; (unifs, _res) + ; (unifs, residual) <- reportFineGrainUnifications $ nestFunDepsTcS $ TcS.pushTcLevelM_ $ @@ -911,7 +922,7 @@ solveFunDeps work_ev fd_eqns -- that were unified by the fundep ; kickOutAfterUnification unifs - ; return (not (isEmptyVarSet unifs)) } + ; return (insolubleWC residual, not (isEmptyVarSet unifs)) } where do_fundeps :: UnifyEnv -> TcM () do_fundeps env = mapM_ (do_one env) fd_eqns ===================================== compiler/GHC/Tc/Solver/Monad.hs ===================================== @@ -2182,7 +2182,8 @@ newWantedNC loc rewriters pty -- | Checks if the depth of the given location is too much. Fails if -- it's too big, with an appropriate error message. -bumpReductionDepth :: CtLoc -> TcType -- ^ type being reduced +bumpReductionDepth :: CtLoc + -> TcType -- ^ type or constraint being reduced -> TcS CtLoc bumpReductionDepth loc ty = do { dflags <- getDynFlags ===================================== compiler/GHC/Tc/Solver/Rewrite.hs ===================================== @@ -11,7 +11,7 @@ import GHC.Tc.Types ( TcGblEnv(tcg_tc_plugin_rewriters), RewriteEnv(..), runTcPluginM ) import GHC.Tc.Types.Constraint -import GHC.Tc.Types.CtLoc( CtLoc ) +import GHC.Tc.Types.CtLoc( CtLoc, resetCtLocDepth ) import GHC.Core.Predicate import GHC.Tc.Utils.TcType import GHC.Core.Type @@ -90,7 +90,8 @@ runRewriteCtEv ev runRewrite :: CtLoc -> CtFlavour -> EqRel -> RewriteM a -> TcS (a, CoHoleSet) runRewrite loc flav eq_rel thing_inside = do { rewriters_ref <- newTcRef emptyCoHoleSet - ; let fmode = RE { re_loc = loc + ; let fmode = RE { re_loc = resetCtLocDepth loc + -- Start reducing from zero , re_flavour = flav , re_eq_rel = eq_rel , re_rewriters = rewriters_ref } @@ -792,8 +793,7 @@ rewrite_fam_app tc tys -- Can be over-saturated -- See Note [How to normalise a family application] rewrite_exact_fam_app :: TyCon -> [TcType] -> RewriteM Reduction rewrite_exact_fam_app tc tys - = bumpReductionDepthRM (mkTyConApp tc tys) $ - do { -- Query the typechecking plugins for all their rewriting functions + = do { -- Query the typechecking plugins for all their rewriting functions -- which apply to a type family application headed by the TyCon 'tc'. ; tc_rewriters <- getTcPluginRewritersForTyCon tc @@ -876,7 +876,8 @@ rewrite_exact_fam_app tc tys -> Reduction -> RewriteM Reduction finish use_cache redn = do { -- rewrite the result: FINISH 1 - final_redn <- rewrite_reduction redn + final_redn <- bumpReductionDepthRM (mkTyConApp tc tys) $ + rewrite_reduction redn ; eq_rel <- getEqRel -- extend the cache: FINISH 2 ===================================== compiler/GHC/Tc/Types/CtLoc.hs ===================================== @@ -3,7 +3,8 @@ module GHC.Tc.Types.CtLoc ( -- * CtLoc CtLoc(..), ctLocSpan, ctLocEnv, ctLocLevel, ctLocOrigin, ctLocTypeOrKind_maybe, toInvisibleLoc, - ctLocDepth, bumpCtLocDepth, isGivenLoc, mkGivenLoc, mkKindEqLoc, + ctLocDepth, bumpCtLocDepth, resetCtLocDepth, + isGivenLoc, mkGivenLoc, mkKindEqLoc, setCtLocOrigin, updateCtLocOrigin, setCtLocEnv, setCtLocSpan, pprCtLoc, adjustCtLoc, adjustCtLocTyConBinder, @@ -196,6 +197,9 @@ setCtLocSpan ctl@(CtLoc { ctl_env = lcl }) loc = setCtLocEnv ctl (setCtLocRealLo bumpCtLocDepth :: CtLoc -> CtLoc bumpCtLocDepth loc@(CtLoc { ctl_depth = d }) = loc { ctl_depth = bumpSubGoalDepth d } +resetCtLocDepth :: CtLoc -> CtLoc +resetCtLocDepth loc = loc { ctl_depth = initialSubGoalDepth } + setCtLocOrigin :: CtLoc -> CtOrigin -> CtLoc setCtLocOrigin ctl orig = ctl { ctl_origin = orig } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b261357e6067ca0717371d8ebdeeb30… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b261357e6067ca0717371d8ebdeeb30… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new tag ghc-9.14.1-rc3
by Zubin (＠wz1000) 02 Dec '25

02 Dec '25

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

1 0

[Git][ghc/ghc][ghc-9.14] 2 commits: rts: fix eager black holes: record mutated closure and fix assertion
by Zubin (＠wz1000) 02 Dec '25

02 Dec '25

Zubin pushed to branch ghc-9.14 at Glasgow Haskell Compiler / GHC Commits: bcc68c56 by Luite Stegeman at 2025-11-25T18:23:46+05:30 rts: fix eager black holes: record mutated closure and fix assertion This fixes two problems with handling eager black holes, introduced by a1de535f762bc23d4cf23a5b1853591dda12cdc9. - the closure mutation must be recorded even for eager black holes, since the mutator has mutated it before calling threadPaused - The assertion that an unmarked eager black hole must be owned by the TSO calling threadPaused is incorrect, since multiple threads can race to claim the black hole. fixes #26495 (cherry picked from commit 3ba3d9f9db784c903ebe8fd617447ce62d30b7d3) - - - - - 85e8147d by Zubin Duggal at 2025-11-28T14:00:24+05:30 rts/linker/PEi386: Copy strings before they are inserted into LoadedDllCache. The original strings are temporary and might be freed at an arbitrary point. Fixes #26613 (cherry picked from commit 5072da477b8ec883aea4b9ea27763fcc1971af1a) - - - - - 2 changed files: - rts/ThreadPaused.c - rts/linker/PEi386.c Changes: ===================================== rts/ThreadPaused.c ===================================== @@ -321,11 +321,12 @@ threadPaused(Capability *cap, StgTSO *tso) if(frame_info == &stg_bh_upd_frame_info) { // eager black hole: we do nothing - // it should be a black hole that we own + // it should be a black hole (but we may not own it, as another + // thread could have raced us to claim it) ASSERT(bh_info == &stg_BLACKHOLE_info || bh_info == &__stg_EAGER_BLACKHOLE_info || bh_info == &stg_CAF_BLACKHOLE_info); - ASSERT(blackHoleOwner(bh) == tso || blackHoleOwner(bh) == NULL); + } else { // lazy black hole @@ -368,13 +369,15 @@ threadPaused(Capability *cap, StgTSO *tso) // The payload of the BLACKHOLE points to the TSO RELEASE_STORE(&((StgInd *)bh)->indirectee, (StgClosure *)tso); SET_INFO_RELEASE(bh,&stg_BLACKHOLE_info); + } - // .. and we need a write barrier, since we just mutated the closure: - recordClosureMutated(cap,bh); + // We need a write barrier, since the closure was mutated (by + // threadPaused for lazy black holes, or the mutator for eager + // black holes). + recordClosureMutated(cap,bh); - // We pretend that bh has just been created. - LDV_RECORD_CREATE(bh); - } + // We pretend that bh has just been created. + LDV_RECORD_CREATE(bh); frame = (StgClosure *) ((StgUpdateFrame *)frame + 1); if (prev_was_update_frame) { ===================================== rts/linker/PEi386.c ===================================== @@ -552,7 +552,12 @@ static int compare_path(StgWord key1, StgWord key2) static void addLoadedDll(LoadedDllCache *cache, const pathchar *dll_name, HINSTANCE instance) { - insertHashTable_(cache->hash, (StgWord) dll_name, instance, hash_path); + // dll_name might be deallocated, we need to copy it to have a stable reference to the contents + // See #26613 + size_t size = wcslen(dll_name) + 1; + pathchar* dll_name_copy = stgMallocBytes(size * sizeof(pathchar), "addLoadedDll"); + wcsncpy(dll_name_copy, dll_name, size); + insertHashTable_(cache->hash, (StgWord) dll_name_copy, instance, hash_path); } static HINSTANCE isDllLoaded(const LoadedDllCache *cache, const pathchar *dll_name) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0e08b9aee6ce58fe7099f14ac1d7de… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0e08b9aee6ce58fe7099f14ac1d7de… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: hadrian: Place user options after package arguments
by Marge Bot (＠marge-bot) 02 Dec '25

02 Dec '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 0d7c05ec by Ben Gamari at 2025-12-01T03:13:46-05:00 hadrian: Place user options after package arguments This makes it easier for the user to override the default package arguments with `UserSettings.hs`. Fixes #25821. ------------------------- Metric Decrease: T14697 ------------------------- - - - - - 3b2c4598 by Vladislav Zavialov at 2025-12-01T03:14:29-05:00 Namespace-specified wildcards in import/export lists (#25901) This change adds support for top-level namespace-specified wildcards `type ..` and `data ..` to import and export lists. Examples: import M (type ..) -- imports all type and class constructors from M import M (data ..) -- imports all data constructors and terms from M module M (type .., f) where -- exports all type and class constructors defined in M, -- plus the function 'f' The primary intended usage of this feature is in combination with module aliases, allowing namespace disambiguation: import Data.Proxy as T (type ..) -- T.Proxy is unambiguously the type constructor import Data.Proxy as D (data ..) -- D.Proxy is unambiguously the data constructor The patch accounts for the interactions of wildcards with: * Imports with `hiding` clauses * Import warnings -Wunused-imports, -Wdodgy-imports * Export warnings -Wduplicate-exports, -Wdodgy-exports Summary of the changes: 1. Move the NamespaceSpecifier type from GHC.Hs.Binds to GHC.Hs.Basic, making it possible to use it in more places in the AST. 2. Extend the AST (type: IE) with a representation of `..`, `type ..`, and `data ..` (constructor: IEWholeNamespace). Per the proposal, the plain `..` is always rejected with a dedicated error message. 3. Extend the grammar in Parser.y with productions for `..`, `type ..`, and `data ..` in both import and export lists. 4. Implement wildcard imports by updating the `filterImports` function in GHC.Rename.Names; the logic for IEWholeNamespace is roughly modeled after the Nothing (no explicit import list) case. 5. Implement wildcard exports by updating the `exports_from_avail` function in GHC.Tc.Gen.Export; the logic for IEWholeNamespace is closely modeled after the IEModuleContents case. 6. Refactor and extend diagnostics to report the new warnings and errors. See PsErrPlainWildcardImport, DodgyImportsWildcard, PsErrPlainWildcardExport, DodgyExportsWildcard, TcRnDupeWildcardExport. Note that this patch is specifically about top-level import/export items. Subordinate import/export items are left unchanged. - - - - - c71faa76 by Luite Stegeman at 2025-12-01T03:16:05-05:00 rts: Handle overflow of ELF section header string table If the section header string table is stored in a section greater than or equal to SHN_LORESERVE (0xff00), the 16-bit field e_shstrndx in the ELF header does not contain the section number, but rather an overflow value SHN_XINDEX (0xffff) indicating that we need to look elsewhere. This fixes the linker by not using e_shstrndx directly but calling elf_shstrndx, which correctly handles the SHN_XINDEX value. Fixes #26603 - - - - - ab20eb54 by Mike Pilgrem at 2025-12-01T22:46:55+00:00 Re CLC issue 292 Warn GHC.Internal.List.{init,last} are partial Also corrects the warning for `tail` to refer to `Data.List.uncons` (like the existing warning for `head`). In module `Settings.Warnings`, applies `-Wno-x-partial` to the `filepath`, and `parsec` packages (outside GHC's repository). Also bumps submodules. - - - - - 3b8b4331 by Jade Lovelace at 2025-12-02T04:22:55-05:00 docs: fix StandaloneKindSignatures in DataKinds docs These should be `type` as otherwise GHC reports a duplicate definition error. - - - - - 109 changed files: - compiler/GHC/Core/Utils.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs/Basic.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Prelude/Basic.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Hint.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - docs/users_guide/9.16.1-notes.rst - docs/users_guide/exts/data_kinds.rst - docs/users_guide/exts/explicit_namespaces.rst - ghc/GHCi/UI.hs - ghc/Main.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Warnings.hs - libraries/base/changelog.md - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/List.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - libraries/template-haskell/vendored-filepath/System/FilePath/Posix.hs - libraries/template-haskell/vendored-filepath/System/FilePath/Windows.hs - rts/linker/Elf.c - testsuite/tests/driver/j-space/jspace.hs - + testsuite/tests/module/T25901_exp_plain_wc.hs - + testsuite/tests/module/T25901_exp_plain_wc.stderr - + testsuite/tests/module/T25901_imp_plain_wc.hs - + testsuite/tests/module/T25901_imp_plain_wc.stderr - testsuite/tests/module/all.T - + testsuite/tests/rename/should_compile/T25901_exp_1.hs - + testsuite/tests/rename/should_compile/T25901_exp_1_helper.hs - + testsuite/tests/rename/should_compile/T25901_exp_2.hs - + testsuite/tests/rename/should_compile/T25901_exp_2_helper.hs - + testsuite/tests/rename/should_compile/T25901_imp_hq.hs - + testsuite/tests/rename/should_compile/T25901_imp_hu.hs - + testsuite/tests/rename/should_compile/T25901_imp_sq.hs - + testsuite/tests/rename/should_compile/T25901_imp_su.hs - testsuite/tests/rename/should_compile/all.T - + testsuite/tests/rename/should_fail/T25901_exp_fail_1.hs - + testsuite/tests/rename/should_fail/T25901_exp_fail_1.stderr - + testsuite/tests/rename/should_fail/T25901_exp_fail_1_helper.hs - + testsuite/tests/rename/should_fail/T25901_exp_fail_2.hs - + testsuite/tests/rename/should_fail/T25901_exp_fail_2.stderr - + testsuite/tests/rename/should_fail/T25901_exp_fail_2_helper.hs - + testsuite/tests/rename/should_fail/T25901_imp_hq_fail_5.hs - + testsuite/tests/rename/should_fail/T25901_imp_hq_fail_5.stderr - + testsuite/tests/rename/should_fail/T25901_imp_hq_fail_6.hs - + testsuite/tests/rename/should_fail/T25901_imp_hq_fail_6.stderr - + testsuite/tests/rename/should_fail/T25901_imp_hu_fail_4.hs - + testsuite/tests/rename/should_fail/T25901_imp_hu_fail_4.stderr - + testsuite/tests/rename/should_fail/T25901_imp_sq_fail_2.hs - + testsuite/tests/rename/should_fail/T25901_imp_sq_fail_2.stderr - + testsuite/tests/rename/should_fail/T25901_imp_sq_fail_3.hs - + testsuite/tests/rename/should_fail/T25901_imp_sq_fail_3.stderr - + testsuite/tests/rename/should_fail/T25901_imp_su_fail_1.hs - + testsuite/tests/rename/should_fail/T25901_imp_su_fail_1.stderr - testsuite/tests/rename/should_fail/all.T - testsuite/tests/rts/KeepCafsBase.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dodgy.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dodgy.stderr - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_1.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_1.stderr - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_2.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_2.stderr - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_3.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_3.stderr - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_4.hs - + testsuite/tests/warnings/should_compile/T25901_exp_dup_wc_4.stderr - + testsuite/tests/warnings/should_compile/T25901_helper_1.hs - + testsuite/tests/warnings/should_compile/T25901_helper_2.hs - + testsuite/tests/warnings/should_compile/T25901_helper_3.hs - + testsuite/tests/warnings/should_compile/T25901_imp_dodgy_1.hs - + testsuite/tests/warnings/should_compile/T25901_imp_dodgy_1.stderr - + testsuite/tests/warnings/should_compile/T25901_imp_dodgy_2.hs - + testsuite/tests/warnings/should_compile/T25901_imp_dodgy_2.stderr - + testsuite/tests/warnings/should_compile/T25901_imp_unused_1.hs - + testsuite/tests/warnings/should_compile/T25901_imp_unused_1.stderr - + testsuite/tests/warnings/should_compile/T25901_imp_unused_2.hs - + testsuite/tests/warnings/should_compile/T25901_imp_unused_2.stderr - + testsuite/tests/warnings/should_compile/T25901_imp_unused_3.hs - + testsuite/tests/warnings/should_compile/T25901_imp_unused_3.stderr - + testsuite/tests/warnings/should_compile/T25901_imp_unused_4.hs - + testsuite/tests/warnings/should_compile/T25901_imp_unused_4.stderr - testsuite/tests/warnings/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs - utils/ghc-pkg/Main.hs - utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/hpc - utils/hsc2hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fc6b1e980030bdc3a32996cd1bd7fc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fc6b1e980030bdc3a32996cd1bd7fc… You're receiving this email because of your account on gitlab.haskell.org.

1 0