- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/jeltsch/known-key-removals/fail-io
by Wolfgang Jeltsch (＠jeltsch) 20 Dec '25

20 Dec '25

Wolfgang Jeltsch pushed new branch wip/jeltsch/known-key-removals/fail-io at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/known-key-removals/fa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/known-key-removals/fingerprints] Remove the unused known key and name for `Fingerprint`
by Wolfgang Jeltsch (＠jeltsch) 20 Dec '25

20 Dec '25

Wolfgang Jeltsch pushed to branch wip/jeltsch/known-key-removals/fingerprints at Glasgow Haskell Compiler / GHC Commits: 54082c5d by Wolfgang Jeltsch at 2025-12-19T23:59:24+02:00 Remove the unused known key and name for `Fingerprint` This removes the variables for the known key and the name of the `Fingerprint` data constructor, as they are apparently nowhere used in GHC’s source code. - - - - - 1 changed file: - compiler/GHC/Builtin/Names.hs Changes: ===================================== compiler/GHC/Builtin/Names.hs ===================================== @@ -491,9 +491,6 @@ basicKnownKeyNames , staticPtrDataConName, staticPtrInfoDataConName , fromStaticPtrName - -- Fingerprint - , fingerprintDataConName - -- Custom type errors , errorMessageTypeErrorFamName , typeErrorTextDataConName @@ -1634,10 +1631,6 @@ fromStaticPtrName :: Name fromStaticPtrName = varQual gHC_INTERNAL_STATICPTR (fsLit "fromStaticPtr") fromStaticPtrClassOpKey -fingerprintDataConName :: Name -fingerprintDataConName = - dcQual gHC_INTERNAL_FINGERPRINT_TYPE (fsLit "Fingerprint") fingerprintDataConKey - constPtrConName :: Name constPtrConName = tcQual gHC_INTERNAL_FOREIGN_C_CONSTPTR (fsLit "ConstPtr") constPtrTyConKey @@ -2123,9 +2116,6 @@ staticPtrDataConKey = mkPreludeDataConUnique 33 staticPtrInfoDataConKey :: Unique staticPtrInfoDataConKey = mkPreludeDataConUnique 34 -fingerprintDataConKey :: Unique -fingerprintDataConKey = mkPreludeDataConUnique 35 - srcLocDataConKey :: Unique srcLocDataConKey = mkPreludeDataConUnique 37 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54082c5d7d27b0568be9667b95d55f9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54082c5d7d27b0568be9667b95d55f9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/jeltsch/known-key-removals/fingerprints
by Wolfgang Jeltsch (＠jeltsch) 20 Dec '25

20 Dec '25

Wolfgang Jeltsch pushed new branch wip/jeltsch/known-key-removals/fingerprints at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/known-key-removals/fi… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/cleanup-makefile
by Cheng Shao (＠TerrorJack) 20 Dec '25

20 Dec '25

Cheng Shao pushed new branch wip/cleanup-makefile at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/cleanup-makefile You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/jeltsch/known-key-removals/lists
by Wolfgang Jeltsch (＠jeltsch) 20 Dec '25

20 Dec '25

Wolfgang Jeltsch pushed new branch wip/jeltsch/known-key-removals/lists at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/known-key-removals/li… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/ghc-fix-bootstrap-9.14
by Cheng Shao (＠TerrorJack) 20 Dec '25

20 Dec '25

Cheng Shao pushed new branch wip/ghc-fix-bootstrap-9.14 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/ghc-fix-bootstrap-9.14 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/25636] Almost there. Finally, we get a runtime loop
by Rodrigo Mesquita (＠alt-romes) 20 Dec '25

20 Dec '25

Rodrigo Mesquita pushed to branch wip/romes/25636 at Glasgow Haskell Compiler / GHC Commits: c20b043b by Rodrigo Mesquita at 2025-12-19T20:30:44+00:00 Almost there. Finally, we get a runtime loop That's something better to investigate. No longer messing up the names and addr# - - - - - 3 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/StgToByteCode.hs Changes: ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -25,6 +25,7 @@ module GHC.ByteCode.Asm ( import GHC.Prelude hiding ( any, words ) +import Data.Maybe import GHC.ByteCode.Instr import GHC.ByteCode.InfoTable import GHC.ByteCode.Types @@ -41,6 +42,8 @@ import GHC.Unit.Types import GHC.Utils.Outputable ( Outputable(..), text, (<+>), vcat ) import GHC.Utils.Panic +import GHC.Builtin.Types.Prim ( addrPrimTy ) +import GHC.Core.TyCo.Compare ( eqType ) import GHC.Core.TyCon import GHC.Data.SizedSeq import GHC.Data.SmallArray @@ -67,7 +70,6 @@ import Data.Array.Base ( unsafeWrite ) import Foreign hiding (shiftL, shiftR) import Data.ByteString (ByteString) import Data.Char (ord) -import Data.Maybe (fromMaybe) import GHC.Float (castFloatToWord32, castDoubleToWord64) import qualified Data.List as List ( any ) @@ -211,12 +213,10 @@ assembleBCO :: Platform -> ProtoBCO -> IO UnlinkedBCO assembleBCO platform (ProtoStaticCon { protoStaticConName , protoStaticCon = dc - , protoStaticConLits = lits - , protoStaticConIds = ids + , protoStaticConData = args }) = do - pprTraceM "assembleBCO: static con" (ppr dc <+> ppr lits <+> ppr ids) - let ptrs = foldr mappendFlatBag emptyFlatBag (map idBCOArg ids) - let nonptrs = foldr mappendFlatBag emptyFlatBag (map litBCOArg lits) + let ptrs = foldr mappendFlatBag emptyFlatBag (mapMaybe idBCOArg args) + let nonptrs = foldr mappendFlatBag emptyFlatBag (mapMaybe litBCOArg args) pure UnlinkedStaticCon { unlinkedStaticConName = protoStaticConName , unlinkedStaticConDataConName = dataConName dc @@ -224,14 +224,24 @@ assembleBCO platform , unlinkedStaticConPtrs = ptrs } where - litBCOArg l = case literal platform l of + litBCOArg (Left l) = Just $ case literal platform l of OnlyOne np -> unitFlatBag np OnlyTwo np1 np2 -> TupleFlatBag np1 np2 - idBCOArg i - | Just prim <- isPrimOpId_maybe i - = unitFlatBag (BCOPtrPrimOp prim) + litBCOArg (Right var) + -- Addr# literals are non-pointers + | idType var `eqType` addrPrimTy + = Just $ unitFlatBag (BCONPtrAddr (getName var)) | otherwise - = unitFlatBag (BCOPtrName (getName i)) + = Nothing + + idBCOArg (Left _) = Nothing + idBCOArg (Right var) + | idType var `eqType` addrPrimTy + = Nothing + | Just prim <- isPrimOpId_maybe var + = Just $ unitFlatBag (BCOPtrPrimOp prim) + | otherwise + = Just $ unitFlatBag (BCOPtrName (getName var)) assembleBCO platform (ProtoBCO { protoBCOName = nm ===================================== compiler/GHC/ByteCode/Instr.hs ===================================== @@ -56,10 +56,14 @@ data ProtoBCO -- ^ The name to which this static constructor is bound, -- not to be confused with the DataCon itself. protoStaticCon :: DataCon, - protoStaticConLits :: [Literal], - protoStaticConIds :: [Id], - -- | What the static con came from, for debugging only + -- ^ The DataCon being constructed. + -- We use this to construct the right info table. + protoStaticConData :: [Either Literal Id], + -- ^ The static constructor pointer and non-pointer arguments, sorted + -- in the order they should appear at runtime (see 'mkVirtConstrOffsets'). + -- The pointers always come first, followed by the non-pointers. protoStaticConExpr :: CgStgRhs + -- ^ What the static con came from, for debugging only } -- | A local block label (e.g. identifying a case alternative). @@ -293,11 +297,10 @@ data BCInstr -- Printing bytecode instructions instance Outputable ProtoBCO where - ppr (ProtoStaticCon nm con lits ids origin) + ppr (ProtoStaticCon nm con args origin) = text "ProtoStaticCon" <+> ppr nm <+> text "for constructor" <+> ppr con <> colon $$ nest 3 (pprStgRhsShort shortStgPprOpts origin) - $$ nest 3 (text "lits: " <+> ppr lits) - $$ nest 3 (text "ids: " <+> ppr ids) + $$ nest 3 (text "sorted args: " <+> ppr args) ppr (ProtoBCO { protoBCOName = name , protoBCOInstrs = instrs , protoBCOBitmap = bitmap ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -316,8 +316,9 @@ schemeTopBind (id, rhs@(StgRhsCon _ dc _ _ args _)) return ProtoStaticCon { protoStaticConName = getName id , protoStaticCon = dc - , protoStaticConLits = [ lit | (NonVoid (StgLitArg lit), _) <- args_offsets ] - , protoStaticConIds = [ i | (NonVoid (StgVarArg i), _) <- args_offsets {-, assert is never a local var -} ] + , protoStaticConData = [ case a of StgLitArg l -> Left l + StgVarArg i -> Right i + | (NonVoid a, _) <- args_offsets ] , protoStaticConExpr = rhs } schemeTopBind (id, rhs) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c20b043b6a006361c1744c6886ad0c9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c20b043b6a006361c1744c6886ad0c9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/25636] Where we're at:
by Rodrigo Mesquita (＠alt-romes) 20 Dec '25

20 Dec '25

Rodrigo Mesquita pushed to branch wip/romes/25636 at Glasgow Haskell Compiler / GHC Commits: 9fa2c2c2 by Rodrigo Mesquita at 2025-12-19T20:14:41+00:00 Where we're at: We're almost there, but just bumped into a sort of wall. For bytecode objects, we allocate string literals which are never freed, and when compiling the ByteCode which references theses string literals, we PUSH_ADDR a NON-POINTER reference to the Addr# in the string literals environment kept by the ghci linker. I believe that these Addr are put in the non-pointers list of data of a BCO (Rather than on the ptrs list of data) because we don't want them to be GC-d. They are allocated by the linker and should not be touched by the RTS. The problem is that when constructing a static data con application, we will find addresses and put them as part of the POINTERS fields of the data application. Now, I expect that the info table NPTRS/PTRS directives will expect the Addr# to be in the PTRS because it may be collected by the GC as far as the data con is concerned. this didn't come up before because we only ever constructed BCOs in bytecode, never the constructors the directly. Soooooooo I don't think I should be changing the order of Ids vs Lits after they come in the proto static con ids. But perhaps it's fine? Perhaps I'm writing them as Ids but really they should be moved to the literals once I find them? Yes, that could make sense.... So, check the actual info table to figure out where things go And try an example with lits and ptrs and see what comes first. Yup. Turns out it's all fine. The Addr#s are non-pointers everywhere. .data .balign 8 .globl _X.x_closure _X.x_closure: .quad _X.K_con_info .quad _stg_INTLIKE_closure+289 .quad _stg_CHARLIKE_closure+1953 .quad _stg_INTLIKE_closure+321 .quad 1 .quad _Lx2_ryD_bytes .quad 3 That makes sense. They're top-level DATA. The collecting is only an issue when we allocate them dynamically (GHCi). But we're already doing that anyway. - - - - - 7 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/StgToByteCode.hs Changes: ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -95,13 +95,15 @@ bcoFreeNames bco mkUniqDSet [ n | BCONPtrItbl n <- elemsFlatBag unlinkedBCOLits ] : map bco_refs [ bco | BCOPtrBCO bco <- elemsFlatBag unlinkedBCOPtrs ] ) `uniqDSetMinusUniqSet` mkNameSet [unlinkedBCOName] - bco_refs UnlinkedStaticCon{unlinkedStaticConName, unlinkedStaticConLits, unlinkedStaticConPtrs} + bco_refs UnlinkedStaticCon{ unlinkedStaticConName, unlinkedStaticConDataConName + , unlinkedStaticConLits, unlinkedStaticConPtrs } = unionManyUniqDSets ( + mkUniqDSet [ unlinkedStaticConDataConName ] : mkUniqDSet [ n | BCOPtrName n <- elemsFlatBag unlinkedStaticConPtrs ] : mkUniqDSet [ n | BCONPtrItbl n <- elemsFlatBag unlinkedStaticConLits ] : map bco_refs [ bco | BCOPtrBCO bco <- elemsFlatBag unlinkedStaticConPtrs ] ) - `uniqDSetMinusUniqSet` mkNameSet [unlinkedStaticConName] + `uniqDSetMinusUniqSet` mkNameSet [ unlinkedStaticConName ] -- ----------------------------------------------------------------------------- -- The bytecode assembler @@ -207,14 +209,17 @@ assembleInspectAsm p i = assembleI @InspectAsm p i assembleBCO :: Platform -> ProtoBCO -> IO UnlinkedBCO assembleBCO platform - (ProtoStaticCon { protoStaticCon = dc + (ProtoStaticCon { protoStaticConName + , protoStaticCon = dc , protoStaticConLits = lits , protoStaticConIds = ids }) = do + pprTraceM "assembleBCO: static con" (ppr dc <+> ppr lits <+> ppr ids) let ptrs = foldr mappendFlatBag emptyFlatBag (map idBCOArg ids) let nonptrs = foldr mappendFlatBag emptyFlatBag (map litBCOArg lits) pure UnlinkedStaticCon - { unlinkedStaticConName = dataConName dc + { unlinkedStaticConName = protoStaticConName + , unlinkedStaticConDataConName = dataConName dc , unlinkedStaticConLits = nonptrs , unlinkedStaticConPtrs = ptrs } ===================================== compiler/GHC/ByteCode/Instr.hs ===================================== @@ -52,6 +52,9 @@ data ProtoBCO -- | A top-level static constructor application object -- See Note [Static constructors in Bytecode] | ProtoStaticCon { + protoStaticConName :: Name, + -- ^ The name to which this static constructor is bound, + -- not to be confused with the DataCon itself. protoStaticCon :: DataCon, protoStaticConLits :: [Literal], protoStaticConIds :: [Id], @@ -290,8 +293,8 @@ data BCInstr -- Printing bytecode instructions instance Outputable ProtoBCO where - ppr (ProtoStaticCon con lits ids origin) - = text "ProtoStaticCon" <+> ppr con <> colon + ppr (ProtoStaticCon nm con lits ids origin) + = text "ProtoStaticCon" <+> ppr nm <+> text "for constructor" <+> ppr con <> colon $$ nest 3 (pprStgRhsShort shortStgPprOpts origin) $$ nest 3 (text "lits: " <+> ppr lits) $$ nest 3 (text "ids: " <+> ppr ids) @@ -486,7 +489,8 @@ instance Outputable BCInstr where -- stack high water mark, but it doesn't seem worth the hassle. protoBCOStackUse :: ProtoBCO -> Word -protoBCOStackUse bco = sum (map bciStackUse (protoBCOInstrs bco)) +protoBCOStackUse ProtoBCO{protoBCOInstrs} = sum (map bciStackUse protoBCOInstrs) +protoBCOStackUse ProtoStaticCon{} = 0 bciStackUse :: BCInstr -> Word bciStackUse STKCHECK{} = 0 ===================================== compiler/GHC/ByteCode/Linker.hs ===================================== @@ -80,9 +80,13 @@ linkBCO interp pkgs_loaded bytecode_state bco_ix unl_bco = do { unlinkedStaticConLits = lits0 , unlinkedStaticConPtrs = ptrs0 } -> do - Ptr itbl_ptr# <- lookupIE interp pkgs_loaded bytecode_state (unlinkedStaticConName unl_bco) + pprTraceM "linkBCO: linking static constructor" (ppr unl_bco) + Ptr itbl_ptr# <- lookupIE interp pkgs_loaded bytecode_state (unlinkedStaticConDataConName unl_bco) + pprTraceM "linkBCO: itbl_ptr#" (ppr (unlinkedStaticConDataConName unl_bco) <+> text (show (Ptr itbl_ptr#))) lits <- doLits lits0 + pprTraceM "linkBCO: lits done" (empty) ptrs <- doPtrs ptrs0 + pprTraceM "linkBCO: ptrs done" (empty) return ResolvedStaticCon { resolvedBCOIsLE = isLittleEndian , resolvedStaticConInfoPtr = W# (int2Word# (addr2Int# itbl_ptr#)) @@ -99,7 +103,7 @@ linkBCO interp pkgs_loaded bytecode_state bco_ix unl_bco = do mapM (resolvePtr interp pkgs_loaded bytecode_state bco_ix) (elemsFlatBag ptrs0) lookupLiteral :: Interp -> PkgsLoaded -> BytecodeLoaderState -> BCONPtr -> IO Word -lookupLiteral interp pkgs_loaded bytecode_state ptr = case ptr of +lookupLiteral interp pkgs_loaded bytecode_state ptr = pprTrace "lookupLiteral" (ppr ptr) $ case ptr of BCONPtrWord lit -> return lit BCONPtrLbl sym -> do Ptr a# <- lookupStaticPtr interp sym @@ -183,20 +187,24 @@ resolvePtr -> NameEnv (Int, Bool) -> BCOPtr -> IO ResolvedBCOPtr -resolvePtr interp pkgs_loaded bco_loader_state bco_ix ptr = case ptr of +resolvePtr interp pkgs_loaded bco_loader_state bco_ix ptr = pprTrace "resolvePtr" (ppr ptr) $ case ptr of BCOPtrName nm | Just (ix, b) <- lookupNameEnv bco_ix nm - -> if b then + -> if b then do + pprTraceM "resolvePtr: ResolvedBCORef" (ppr nm <+> ppr ix) return (ResolvedBCORef ix) -- ref to another BCO in this group - else + else do + pprTraceM "resolvePtr: StaticConRef" (ppr nm <+> ppr ix) return (ResolvedStaticConRef ix) -- ref to another StaticCon in this group | Just (_, rhv) <- lookupNameBytecodeState bco_loader_state nm - -> return (ResolvedBCOPtr (unsafeForeignRefToRemoteRef rhv)) + -> do + pprTraceM "resolvePtr: BCOPtr" (ppr nm) + return (ResolvedBCOPtr (unsafeForeignRefToRemoteRef rhv)) | otherwise -> assertPpr (isExternalName nm) (ppr nm) $ - do + pprTrace "resolvePtr: OTHERWISE? ASSERTION FIALURE?" (ppr nm) $ do let sym_to_find = IClosureSymbol nm m <- lookupHsSymbol interp pkgs_loaded sym_to_find case m of ===================================== compiler/GHC/ByteCode/Serialize.hs ===================================== @@ -327,6 +327,7 @@ instance Binary UnlinkedBCO where <*> get bh 1 -> UnlinkedStaticCon <$> getViaBinName bh + <*> getViaBinName bh <*> get bh <*> get bh _ -> panic "Binary UnlinkedBCO: invalid byte" @@ -342,6 +343,7 @@ instance Binary UnlinkedBCO where put_ bh UnlinkedStaticCon {..} = do putByte bh 1 putViaBinName bh unlinkedStaticConName + putViaBinName bh unlinkedStaticConDataConName put_ bh unlinkedStaticConLits put_ bh unlinkedStaticConPtrs ===================================== compiler/GHC/ByteCode/Types.hs ===================================== @@ -31,6 +31,7 @@ module GHC.ByteCode.Types ) where import GHC.Prelude +import qualified Data.ByteString.Char8 as BS8 import GHC.Data.FastString import GHC.Data.FlatBag @@ -259,6 +260,10 @@ data UnlinkedBCO -- See Note [Static constructors in Bytecode] | UnlinkedStaticCon { unlinkedStaticConName :: !Name, + -- ^ The name to which this static constructor is bound, not to be + -- confused with the name of the static constructor itself + -- ('unlinkedStaticConDataConName') + unlinkedStaticConDataConName :: !Name, unlinkedStaticConLits :: !(FlatBag BCONPtr), -- non-ptrs unlinkedStaticConPtrs :: !(FlatBag BCOPtr) -- ptrs } @@ -282,6 +287,12 @@ instance NFData BCOPtr where rnf (BCOPtrBCO bco) = rnf bco rnf x = x `seq` () +instance Outputable BCOPtr where + ppr (BCOPtrName nm) = text "BCOPtrName" <+> ppr nm + ppr (BCOPtrPrimOp op) = text "BCOPtrPrimOp" <+> ppr op + ppr (BCOPtrBCO bco) = text "BCOPtrBCO" <+> ppr bco + ppr (BCOPtrBreakArray mod) = text "<break array for" <+> ppr mod <> char '>' + data BCONPtr = BCONPtrWord {-# UNPACK #-} !Word | BCONPtrLbl !FastString @@ -299,6 +310,16 @@ data BCONPtr -- | A 'CostCentre' remote pointer array's respective 'BreakpointId' | BCONPtrCostCentre !InternalBreakpointId +instance Outputable BCONPtr where + ppr (BCONPtrWord w) = integer (fromIntegral w) + ppr (BCONPtrLbl lbl) = text "<label:" <> ftext lbl <> char '>' + ppr (BCONPtrItbl nm) = text "<itbl:" <+> ppr nm <> char '>' + ppr (BCONPtrAddr nm) = text "<addr:" <+> ppr nm <> char '>' + ppr (BCONPtrStr bs) = text "<string literal: " <+> text (BS8.unpack bs) <> char '>' + ppr (BCONPtrFS fs) = text "<fast string literal:" <+> ftext fs <> char '>' + ppr (BCONPtrFFIInfo ffi) = text "<FFIInfo>" + ppr (BCONPtrCostCentre bid) = text "<CostCentre for BreakpointId:" <+> ppr bid <> char '>' + instance NFData BCONPtr where rnf x = x `seq` () @@ -307,8 +328,9 @@ instance Outputable UnlinkedBCO where = sep [text "BCO", ppr nm, text "with", ppr (sizeFlatBag lits), text "lits", ppr (sizeFlatBag ptrs), text "ptrs" ] - ppr (UnlinkedStaticCon nm lits ptrs) - = sep [text "StaticCon", ppr nm, text "with", + ppr (UnlinkedStaticCon nm dc_nm lits ptrs) + = sep [text "StaticCon", ppr nm, text "for", + ppr dc_nm, text "with", ppr (sizeFlatBag lits), text "lits", ppr (sizeFlatBag ptrs), text "ptrs" ] ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -1048,6 +1048,13 @@ linkSomeBCOs interp pkgs_loaded bytecode_state mods = foldr fun do_link mods [] UnlinkedStaticCon{unlinkedStaticConName} -> (unlinkedStaticConName, False) ) flat bco_ix = mkNameEnv (zipWith (\(n,isBCO) ix -> (n,(ix, isBCO))) names [0..]) + pprTraceM "linkSomeBCOs what" $ (ppr mods <+> ppr flat) + pprTraceM "linkSomeBCOs" $ + vcat [ text "Linking BCOs:" + , nest 2 (vcat (map (ppr . fst) names)) + , text "BCO index:" + , nest 2 (ppr bco_ix) + ] resolved <- sequence [ linkBCO interp pkgs_loaded bytecode_state bco_ix bco | bco <- flat ] hvrefs <- createBCOs interp resolved return (zipWith (\(n,_) hvr -> (n, hvr)) names hvrefs) ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -305,15 +305,17 @@ argBits platform (rep : args) -- Compile code for the right-hand side of a top-level binding schemeTopBind :: (Id, CgStgRhs) -> BcM ProtoBCO -schemeTopBind (_, rhs@(StgRhsCon _ dc _ _ args _)) +schemeTopBind (id, rhs@(StgRhsCon _ dc _ _ args _)) = do + pprTraceM "schemeTopBind: static con" (ppr id <+> ppr dc <+> ppr args) profile <- getProfile let non_voids = addArgReps (assertNonVoidStgArgs args) (_, _, args_offsets) -- Compute the expected runtime ordering for the datacon fields = mkVirtConstrOffsets profile non_voids return ProtoStaticCon - { protoStaticCon = dc + { protoStaticConName = getName id + , protoStaticCon = dc , protoStaticConLits = [ lit | (NonVoid (StgLitArg lit), _) <- args_offsets ] , protoStaticConIds = [ i | (NonVoid (StgVarArg i), _) <- args_offsets {-, assert is never a local var -} ] , protoStaticConExpr = rhs View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fa2c2c2a4ea3a0102dd6edcc4d9041… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fa2c2c2a4ea3a0102dd6edcc4d9041… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/25636] Where we're at:
by Rodrigo Mesquita (＠alt-romes) 20 Dec '25

20 Dec '25

Rodrigo Mesquita pushed to branch wip/romes/25636 at Glasgow Haskell Compiler / GHC Commits: 696e1f80 by Rodrigo Mesquita at 2025-12-19T20:05:07+00:00 Where we're at: We're almost there, but just bumped into a sort of wall. For bytecode objects, we allocate string literals which are never freed, and when compiling the ByteCode which references theses string literals, we PUSH_ADDR a NON-POINTER reference to the Addr# in the string literals environment kept by the ghci linker. I believe that these Addr are put in the non-pointers list of data of a BCO (Rather than on the ptrs list of data) because we don't want them to be GC-d. They are allocated by the linker and should not be touched by the RTS. The problem is that when constructing a static data con application, we will find addresses and put them as part of the POINTERS fields of the data application. Now, I expect that the info table NPTRS/PTRS directives will expect the Addr# to be in the PTRS because it may be collected by the GC as far as the data con is concerned. this didn't come up before because we only ever constructed BCOs in bytecode, never the constructors the directly. Soooooooo I don't think I should be changing the order of Ids vs Lits after they come in the proto static con ids. But perhaps it's fine? Perhaps I'm writing them as Ids but really they should be moved to the literals once I find them? Yes, that could make sense.... So, check the actual info table to figure out where things go And try an example with lits and ptrs and see what comes first. - - - - - 7 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/StgToByteCode.hs Changes: ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -95,13 +95,15 @@ bcoFreeNames bco mkUniqDSet [ n | BCONPtrItbl n <- elemsFlatBag unlinkedBCOLits ] : map bco_refs [ bco | BCOPtrBCO bco <- elemsFlatBag unlinkedBCOPtrs ] ) `uniqDSetMinusUniqSet` mkNameSet [unlinkedBCOName] - bco_refs UnlinkedStaticCon{unlinkedStaticConName, unlinkedStaticConLits, unlinkedStaticConPtrs} + bco_refs UnlinkedStaticCon{ unlinkedStaticConName, unlinkedStaticConDataConName + , unlinkedStaticConLits, unlinkedStaticConPtrs } = unionManyUniqDSets ( + mkUniqDSet [ unlinkedStaticConDataConName ] : mkUniqDSet [ n | BCOPtrName n <- elemsFlatBag unlinkedStaticConPtrs ] : mkUniqDSet [ n | BCONPtrItbl n <- elemsFlatBag unlinkedStaticConLits ] : map bco_refs [ bco | BCOPtrBCO bco <- elemsFlatBag unlinkedStaticConPtrs ] ) - `uniqDSetMinusUniqSet` mkNameSet [unlinkedStaticConName] + `uniqDSetMinusUniqSet` mkNameSet [ unlinkedStaticConName ] -- ----------------------------------------------------------------------------- -- The bytecode assembler @@ -207,14 +209,17 @@ assembleInspectAsm p i = assembleI @InspectAsm p i assembleBCO :: Platform -> ProtoBCO -> IO UnlinkedBCO assembleBCO platform - (ProtoStaticCon { protoStaticCon = dc + (ProtoStaticCon { protoStaticConName + , protoStaticCon = dc , protoStaticConLits = lits , protoStaticConIds = ids }) = do + pprTraceM "assembleBCO: static con" (ppr dc <+> ppr lits <+> ppr ids) let ptrs = foldr mappendFlatBag emptyFlatBag (map idBCOArg ids) let nonptrs = foldr mappendFlatBag emptyFlatBag (map litBCOArg lits) pure UnlinkedStaticCon - { unlinkedStaticConName = dataConName dc + { unlinkedStaticConName = protoStaticConName + , unlinkedStaticConDataConName = dataConName dc , unlinkedStaticConLits = nonptrs , unlinkedStaticConPtrs = ptrs } ===================================== compiler/GHC/ByteCode/Instr.hs ===================================== @@ -52,6 +52,9 @@ data ProtoBCO -- | A top-level static constructor application object -- See Note [Static constructors in Bytecode] | ProtoStaticCon { + protoStaticConName :: Name, + -- ^ The name to which this static constructor is bound, + -- not to be confused with the DataCon itself. protoStaticCon :: DataCon, protoStaticConLits :: [Literal], protoStaticConIds :: [Id], @@ -290,8 +293,8 @@ data BCInstr -- Printing bytecode instructions instance Outputable ProtoBCO where - ppr (ProtoStaticCon con lits ids origin) - = text "ProtoStaticCon" <+> ppr con <> colon + ppr (ProtoStaticCon nm con lits ids origin) + = text "ProtoStaticCon" <+> ppr nm <+> text "for constructor" <+> ppr con <> colon $$ nest 3 (pprStgRhsShort shortStgPprOpts origin) $$ nest 3 (text "lits: " <+> ppr lits) $$ nest 3 (text "ids: " <+> ppr ids) @@ -486,7 +489,8 @@ instance Outputable BCInstr where -- stack high water mark, but it doesn't seem worth the hassle. protoBCOStackUse :: ProtoBCO -> Word -protoBCOStackUse bco = sum (map bciStackUse (protoBCOInstrs bco)) +protoBCOStackUse ProtoBCO{protoBCOInstrs} = sum (map bciStackUse protoBCOInstrs) +protoBCOStackUse ProtoStaticCon{} = 0 bciStackUse :: BCInstr -> Word bciStackUse STKCHECK{} = 0 ===================================== compiler/GHC/ByteCode/Linker.hs ===================================== @@ -80,9 +80,13 @@ linkBCO interp pkgs_loaded bytecode_state bco_ix unl_bco = do { unlinkedStaticConLits = lits0 , unlinkedStaticConPtrs = ptrs0 } -> do - Ptr itbl_ptr# <- lookupIE interp pkgs_loaded bytecode_state (unlinkedStaticConName unl_bco) + pprTraceM "linkBCO: linking static constructor" (ppr unl_bco) + Ptr itbl_ptr# <- lookupIE interp pkgs_loaded bytecode_state (unlinkedStaticConDataConName unl_bco) + pprTraceM "linkBCO: itbl_ptr#" (ppr (unlinkedStaticConDataConName unl_bco) <+> text (show (Ptr itbl_ptr#))) lits <- doLits lits0 + pprTraceM "linkBCO: lits done" (empty) ptrs <- doPtrs ptrs0 + pprTraceM "linkBCO: ptrs done" (empty) return ResolvedStaticCon { resolvedBCOIsLE = isLittleEndian , resolvedStaticConInfoPtr = W# (int2Word# (addr2Int# itbl_ptr#)) @@ -99,7 +103,7 @@ linkBCO interp pkgs_loaded bytecode_state bco_ix unl_bco = do mapM (resolvePtr interp pkgs_loaded bytecode_state bco_ix) (elemsFlatBag ptrs0) lookupLiteral :: Interp -> PkgsLoaded -> BytecodeLoaderState -> BCONPtr -> IO Word -lookupLiteral interp pkgs_loaded bytecode_state ptr = case ptr of +lookupLiteral interp pkgs_loaded bytecode_state ptr = pprTrace "lookupLiteral" (ppr ptr) $ case ptr of BCONPtrWord lit -> return lit BCONPtrLbl sym -> do Ptr a# <- lookupStaticPtr interp sym @@ -183,20 +187,24 @@ resolvePtr -> NameEnv (Int, Bool) -> BCOPtr -> IO ResolvedBCOPtr -resolvePtr interp pkgs_loaded bco_loader_state bco_ix ptr = case ptr of +resolvePtr interp pkgs_loaded bco_loader_state bco_ix ptr = pprTrace "resolvePtr" (ppr ptr) $ case ptr of BCOPtrName nm | Just (ix, b) <- lookupNameEnv bco_ix nm - -> if b then + -> if b then do + pprTraceM "resolvePtr: ResolvedBCORef" (ppr nm <+> ppr ix) return (ResolvedBCORef ix) -- ref to another BCO in this group - else + else do + pprTraceM "resolvePtr: StaticConRef" (ppr nm <+> ppr ix) return (ResolvedStaticConRef ix) -- ref to another StaticCon in this group | Just (_, rhv) <- lookupNameBytecodeState bco_loader_state nm - -> return (ResolvedBCOPtr (unsafeForeignRefToRemoteRef rhv)) + -> do + pprTraceM "resolvePtr: BCOPtr" (ppr nm) + return (ResolvedBCOPtr (unsafeForeignRefToRemoteRef rhv)) | otherwise -> assertPpr (isExternalName nm) (ppr nm) $ - do + pprTrace "resolvePtr: OTHERWISE? ASSERTION FIALURE?" (ppr nm) $ do let sym_to_find = IClosureSymbol nm m <- lookupHsSymbol interp pkgs_loaded sym_to_find case m of ===================================== compiler/GHC/ByteCode/Serialize.hs ===================================== @@ -327,6 +327,7 @@ instance Binary UnlinkedBCO where <*> get bh 1 -> UnlinkedStaticCon <$> getViaBinName bh + <*> getViaBinName bh <*> get bh <*> get bh _ -> panic "Binary UnlinkedBCO: invalid byte" @@ -342,6 +343,7 @@ instance Binary UnlinkedBCO where put_ bh UnlinkedStaticCon {..} = do putByte bh 1 putViaBinName bh unlinkedStaticConName + putViaBinName bh unlinkedStaticConDataConName put_ bh unlinkedStaticConLits put_ bh unlinkedStaticConPtrs ===================================== compiler/GHC/ByteCode/Types.hs ===================================== @@ -31,6 +31,7 @@ module GHC.ByteCode.Types ) where import GHC.Prelude +import qualified Data.ByteString.Char8 as BS8 import GHC.Data.FastString import GHC.Data.FlatBag @@ -259,6 +260,10 @@ data UnlinkedBCO -- See Note [Static constructors in Bytecode] | UnlinkedStaticCon { unlinkedStaticConName :: !Name, + -- ^ The name to which this static constructor is bound, not to be + -- confused with the name of the static constructor itself + -- ('unlinkedStaticConDataConName') + unlinkedStaticConDataConName :: !Name, unlinkedStaticConLits :: !(FlatBag BCONPtr), -- non-ptrs unlinkedStaticConPtrs :: !(FlatBag BCOPtr) -- ptrs } @@ -282,6 +287,12 @@ instance NFData BCOPtr where rnf (BCOPtrBCO bco) = rnf bco rnf x = x `seq` () +instance Outputable BCOPtr where + ppr (BCOPtrName nm) = text "BCOPtrName" <+> ppr nm + ppr (BCOPtrPrimOp op) = text "BCOPtrPrimOp" <+> ppr op + ppr (BCOPtrBCO bco) = text "BCOPtrBCO" <+> ppr bco + ppr (BCOPtrBreakArray mod) = text "<break array for" <+> ppr mod <> char '>' + data BCONPtr = BCONPtrWord {-# UNPACK #-} !Word | BCONPtrLbl !FastString @@ -299,6 +310,16 @@ data BCONPtr -- | A 'CostCentre' remote pointer array's respective 'BreakpointId' | BCONPtrCostCentre !InternalBreakpointId +instance Outputable BCONPtr where + ppr (BCONPtrWord w) = integer (fromIntegral w) + ppr (BCONPtrLbl lbl) = text "<label:" <> ftext lbl <> char '>' + ppr (BCONPtrItbl nm) = text "<itbl:" <+> ppr nm <> char '>' + ppr (BCONPtrAddr nm) = text "<addr:" <+> ppr nm <> char '>' + ppr (BCONPtrStr bs) = text "<string literal: " <+> text (BS8.unpack bs) <> char '>' + ppr (BCONPtrFS fs) = text "<fast string literal:" <+> ftext fs <> char '>' + ppr (BCONPtrFFIInfo ffi) = text "<FFIInfo>" + ppr (BCONPtrCostCentre bid) = text "<CostCentre for BreakpointId:" <+> ppr bid <> char '>' + instance NFData BCONPtr where rnf x = x `seq` () @@ -307,8 +328,9 @@ instance Outputable UnlinkedBCO where = sep [text "BCO", ppr nm, text "with", ppr (sizeFlatBag lits), text "lits", ppr (sizeFlatBag ptrs), text "ptrs" ] - ppr (UnlinkedStaticCon nm lits ptrs) - = sep [text "StaticCon", ppr nm, text "with", + ppr (UnlinkedStaticCon nm dc_nm lits ptrs) + = sep [text "StaticCon", ppr nm, text "for", + ppr dc_nm, text "with", ppr (sizeFlatBag lits), text "lits", ppr (sizeFlatBag ptrs), text "ptrs" ] ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -1048,6 +1048,13 @@ linkSomeBCOs interp pkgs_loaded bytecode_state mods = foldr fun do_link mods [] UnlinkedStaticCon{unlinkedStaticConName} -> (unlinkedStaticConName, False) ) flat bco_ix = mkNameEnv (zipWith (\(n,isBCO) ix -> (n,(ix, isBCO))) names [0..]) + pprTraceM "linkSomeBCOs what" $ (ppr mods <+> ppr flat) + pprTraceM "linkSomeBCOs" $ + vcat [ text "Linking BCOs:" + , nest 2 (vcat (map (ppr . fst) names)) + , text "BCO index:" + , nest 2 (ppr bco_ix) + ] resolved <- sequence [ linkBCO interp pkgs_loaded bytecode_state bco_ix bco | bco <- flat ] hvrefs <- createBCOs interp resolved return (zipWith (\(n,_) hvr -> (n, hvr)) names hvrefs) ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -305,15 +305,17 @@ argBits platform (rep : args) -- Compile code for the right-hand side of a top-level binding schemeTopBind :: (Id, CgStgRhs) -> BcM ProtoBCO -schemeTopBind (_, rhs@(StgRhsCon _ dc _ _ args _)) +schemeTopBind (id, rhs@(StgRhsCon _ dc _ _ args _)) = do + pprTraceM "schemeTopBind: static con" (ppr id <+> ppr dc <+> ppr args) profile <- getProfile let non_voids = addArgReps (assertNonVoidStgArgs args) (_, _, args_offsets) -- Compute the expected runtime ordering for the datacon fields = mkVirtConstrOffsets profile non_voids return ProtoStaticCon - { protoStaticCon = dc + { protoStaticConName = getName id + , protoStaticCon = dc , protoStaticConLits = [ lit | (NonVoid (StgLitArg lit), _) <- args_offsets ] , protoStaticConIds = [ i | (NonVoid (StgVarArg i), _) <- args_offsets {-, assert is never a local var -} ] , protoStaticConExpr = rhs View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/696e1f80937517e3076899c25b2b945… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/696e1f80937517e3076899c25b2b945… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/known-key-removals/type-representations] Remove unused known keys and names for type representations
by Wolfgang Jeltsch (＠jeltsch) 20 Dec '25

20 Dec '25

Wolfgang Jeltsch pushed to branch wip/jeltsch/known-key-removals/type-representations at Glasgow Haskell Compiler / GHC Commits: 20fa04e2 by Wolfgang Jeltsch at 2025-12-19T21:19:06+02:00 Remove unused known keys and names for type representations This removes the known-key and corresponding name variables for `TrName`, `TrNameD`, `TypeRep`, `KindRepTypeLitD`, `TypeLitSort`, and `mkTrType`, as they are apparently nowhere used in GHC’s source code. - - - - - 1 changed file: - compiler/GHC/Builtin/Names.hs Changes: ===================================== compiler/GHC/Builtin/Names.hs ===================================== @@ -222,12 +222,11 @@ basicKnownKeyNames -- Type representation types trModuleTyConName, trModuleDataConName, - trNameTyConName, trNameSDataConName, trNameDDataConName, + trNameSDataConName, trTyConTyConName, trTyConDataConName, -- Typeable typeableClassName, - typeRepTyConName, someTypeRepTyConName, someTypeRepDataConName, kindRepTyConName, @@ -237,13 +236,10 @@ basicKnownKeyNames kindRepFunDataConName, kindRepTYPEDataConName, kindRepTypeLitSDataConName, - kindRepTypeLitDDataConName, - typeLitSortTyConName, typeLitSymbolDataConName, typeLitNatDataConName, typeLitCharDataConName, typeRepIdName, - mkTrTypeName, mkTrConName, mkTrAppCheckedName, mkTrFunName, @@ -1307,17 +1303,13 @@ ixClassName = clsQual gHC_INTERNAL_IX (fsLit "Ix") ixClassKey -- Typeable representation types trModuleTyConName , trModuleDataConName - , trNameTyConName , trNameSDataConName - , trNameDDataConName , trTyConTyConName , trTyConDataConName :: Name trModuleTyConName = tcQual gHC_TYPES (fsLit "Module") trModuleTyConKey trModuleDataConName = dcQual gHC_TYPES (fsLit "Module") trModuleDataConKey -trNameTyConName = tcQual gHC_TYPES (fsLit "TrName") trNameTyConKey trNameSDataConName = dcQual gHC_TYPES (fsLit "TrNameS") trNameSDataConKey -trNameDDataConName = dcQual gHC_TYPES (fsLit "TrNameD") trNameDDataConKey trTyConTyConName = tcQual gHC_TYPES (fsLit "TyCon") trTyConTyConKey trTyConDataConName = dcQual gHC_TYPES (fsLit "TyCon") trTyConDataConKey @@ -1328,7 +1320,6 @@ kindRepTyConName , kindRepFunDataConName , kindRepTYPEDataConName , kindRepTypeLitSDataConName - , kindRepTypeLitDDataConName :: Name kindRepTyConName = tcQual gHC_TYPES (fsLit "KindRep") kindRepTyConKey kindRepTyConAppDataConName = dcQual gHC_TYPES (fsLit "KindRepTyConApp") kindRepTyConAppDataConKey @@ -1337,24 +1328,19 @@ kindRepAppDataConName = dcQual gHC_TYPES (fsLit "KindRepApp") kindR kindRepFunDataConName = dcQual gHC_TYPES (fsLit "KindRepFun") kindRepFunDataConKey kindRepTYPEDataConName = dcQual gHC_TYPES (fsLit "KindRepTYPE") kindRepTYPEDataConKey kindRepTypeLitSDataConName = dcQual gHC_TYPES (fsLit "KindRepTypeLitS") kindRepTypeLitSDataConKey -kindRepTypeLitDDataConName = dcQual gHC_TYPES (fsLit "KindRepTypeLitD") kindRepTypeLitDDataConKey -typeLitSortTyConName - , typeLitSymbolDataConName +typeLitSymbolDataConName , typeLitNatDataConName , typeLitCharDataConName :: Name -typeLitSortTyConName = tcQual gHC_TYPES (fsLit "TypeLitSort") typeLitSortTyConKey typeLitSymbolDataConName = dcQual gHC_TYPES (fsLit "TypeLitSymbol") typeLitSymbolDataConKey typeLitNatDataConName = dcQual gHC_TYPES (fsLit "TypeLitNat") typeLitNatDataConKey typeLitCharDataConName = dcQual gHC_TYPES (fsLit "TypeLitChar") typeLitCharDataConKey -- Class Typeable, and functions for constructing `Typeable` dictionaries typeableClassName - , typeRepTyConName , someTypeRepTyConName , someTypeRepDataConName - , mkTrTypeName , mkTrConName , mkTrAppCheckedName , mkTrFunName @@ -1365,11 +1351,9 @@ typeableClassName , trGhcPrimModuleName :: Name typeableClassName = clsQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "Typeable") typeableClassKey -typeRepTyConName = tcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "TypeRep") typeRepTyConKey someTypeRepTyConName = tcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep") someTypeRepTyConKey someTypeRepDataConName = dcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep") someTypeRepDataConKey typeRepIdName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeRep#") typeRepIdKey -mkTrTypeName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrType") mkTrTypeKey mkTrConName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrCon") mkTrConKey mkTrAppCheckedName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrAppChecked") mkTrAppCheckedKey mkTrFunName = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrFun") mkTrFunKey @@ -1940,13 +1924,11 @@ pluginTyConKey, frontendPluginTyConKey :: Unique pluginTyConKey = mkPreludeTyConUnique 102 frontendPluginTyConKey = mkPreludeTyConUnique 103 -trTyConTyConKey, trModuleTyConKey, trNameTyConKey, - kindRepTyConKey, typeLitSortTyConKey :: Unique +trTyConTyConKey, trModuleTyConKey, + kindRepTyConKey :: Unique trTyConTyConKey = mkPreludeTyConUnique 104 trModuleTyConKey = mkPreludeTyConUnique 105 -trNameTyConKey = mkPreludeTyConUnique 106 kindRepTyConKey = mkPreludeTyConUnique 107 -typeLitSortTyConKey = mkPreludeTyConUnique 108 -- Generics (Unique keys) v1TyConKey, u1TyConKey, par1TyConKey, rec1TyConKey, @@ -2026,8 +2008,7 @@ callStackTyConKey :: Unique callStackTyConKey = mkPreludeTyConUnique 191 -- Typeables -typeRepTyConKey, someTypeRepTyConKey, someTypeRepDataConKey :: Unique -typeRepTyConKey = mkPreludeTyConUnique 192 +someTypeRepTyConKey, someTypeRepDataConKey :: Unique someTypeRepTyConKey = mkPreludeTyConUnique 193 someTypeRepDataConKey = mkPreludeTyConUnique 194 @@ -2166,12 +2147,11 @@ srcLocDataConKey :: Unique srcLocDataConKey = mkPreludeDataConUnique 37 trTyConDataConKey, trModuleDataConKey, - trNameSDataConKey, trNameDDataConKey, + trNameSDataConKey, trGhcPrimModuleKey :: Unique trTyConDataConKey = mkPreludeDataConUnique 41 trModuleDataConKey = mkPreludeDataConUnique 43 trNameSDataConKey = mkPreludeDataConUnique 45 -trNameDDataConKey = mkPreludeDataConUnique 46 trGhcPrimModuleKey = mkPreludeDataConUnique 47 typeErrorTextDataConKey, @@ -2246,7 +2226,7 @@ vecElemDataConKeys = map mkPreludeDataConUnique [96..105] -- Typeable things kindRepTyConAppDataConKey, kindRepVarDataConKey, kindRepAppDataConKey, kindRepFunDataConKey, kindRepTYPEDataConKey, - kindRepTypeLitSDataConKey, kindRepTypeLitDDataConKey + kindRepTypeLitSDataConKey :: Unique kindRepTyConAppDataConKey = mkPreludeDataConUnique 106 kindRepVarDataConKey = mkPreludeDataConUnique 107 @@ -2254,7 +2234,6 @@ kindRepAppDataConKey = mkPreludeDataConUnique 108 kindRepFunDataConKey = mkPreludeDataConUnique 109 kindRepTYPEDataConKey = mkPreludeDataConUnique 110 kindRepTypeLitSDataConKey = mkPreludeDataConUnique 111 -kindRepTypeLitDDataConKey = mkPreludeDataConUnique 112 typeLitSymbolDataConKey, typeLitNatDataConKey, typeLitCharDataConKey :: Unique typeLitSymbolDataConKey = mkPreludeDataConUnique 113 @@ -2497,7 +2476,6 @@ proxyHashKey = mkPreludeMiscIdUnique 502 -- Used to make `Typeable` dictionaries mkTyConKey - , mkTrTypeKey , mkTrConKey , mkTrAppCheckedKey , mkTrFunKey @@ -2507,7 +2485,6 @@ mkTyConKey , typeRepIdKey :: Unique mkTyConKey = mkPreludeMiscIdUnique 503 -mkTrTypeKey = mkPreludeMiscIdUnique 504 mkTrConKey = mkPreludeMiscIdUnique 505 mkTrAppCheckedKey = mkPreludeMiscIdUnique 506 typeNatTypeRepKey = mkPreludeMiscIdUnique 507 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/20fa04e27c8f1e468341e0866d9d925… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/20fa04e27c8f1e468341e0866d9d925… You're receiving this email because of your account on gitlab.haskell.org.

1 0