Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: d39a5f3f by Rodrigo Mesquita at 2026-05-13T18:21:40+01:00 my mistakes - - - - - 8a4236f2 by Rodrigo Mesquita at 2026-05-13T18:43:02+01:00 keep fixing. 40% left going through all KnownKey names in GHC.Builtin.KnownKey - - - - - 2 changed files: - compiler/GHC/Builtin.hs - compiler/GHC/Builtin/KnownKeys.hs Changes: ===================================== compiler/GHC/Builtin.hs ===================================== @@ -453,8 +453,7 @@ standardClassKeys = derivableClassKeys ++ numericClassKeys ++ checkKnownKeys - [ randomClassKey, randomGenClassKey - , functorClassKey + [ functorClassKey , monadClassKey, monadPlusClassKey, monadFailClassKey , semigroupClassKey, monoidClassKey , isStringClassKey ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -143,6 +143,8 @@ knownKeyTable , (mkTcOcc "Typeable", typeableClassKey) , (mkTcOcc "Functor", functorClassKey) , (mkTcOcc "Lift", liftClassKey) + , (mkTcOcc "MonadPlus", monadPlusClassKey) + , (mkTcOcc "MonadFail", monadPlusClassKey) -- Numeric classes , (mkTcOcc "Num", numClassKey) @@ -159,13 +161,23 @@ knownKeyTable , (mkVarOcc "toRational", toRationalClassOpKey) , (mkVarOcc "realToFrac", realToFracIdKey) + -- Int and Word + , (mkTcOcc "Int8", int8TyConKey) + , (mkTcOcc "Int16", int16TyConKey) + , (mkTcOcc "Int32", int32TyConKey) + , (mkTcOcc "Int64", int64TyConKey) + , (mkTcOcc "Word16", word16TyConKey) + , (mkTcOcc "Word32", word32TyConKey) + , (mkTcOcc "Word64", word64TyConKey) + -- FFI things , (mkTcOcc "ConstPtr", constPtrTyConKey) + , (mkTcOcc "Ptr", ptrTyConKey) + , (mkTcOcc "FunPtr", funPtrTyConKey) -- Class Monad, MonadFix, MonadZip , (mkTcOcc "Monad", monadClassKey) , (thenMClassOpOcc, thenMClassOpKey) - , (bindMClassOpOcc, bindMClassOpKey) , (returnMClassOpOcc, returnMClassOpKey) -- Class Applicative @@ -200,7 +212,9 @@ knownKeyTable , (mkTcOcc "Generic1", gen1ClassKey) -- Static pointers - , (mkVarOcc "makeStatic", makeStaticKey) + , (mkVarOcc "makeStatic", makeStaticKey) + , (mkDataOcc "StaticPtr", staticPtrDataConKey) + , (mkDataOcc "StaticPtrInfo", staticPtrDataConKey) -- Stable pointers , (mkTcOcc "StablePtr", stablePtrTyConKey) @@ -228,6 +242,11 @@ knownKeyTable , (mkDataOcc ":$$:", typeErrorVAppendDataConKey) , (mkDataOcc "ShowType", typeErrorShowTypeDataConKey) + -- Known lits + , (mkTcOcc "KnownNat", knownNatClassKey) + , (mkTcOcc "KnownSymbol", knownSymbolClassKey) + , (mkTcOcc "KnownChar", knownCharClassKey) + -- Unsafe coercion proofs , (mkVarOcc "unsafeCoerce#", unsafeCoercePrimIdKey) @@ -241,6 +260,10 @@ knownKeyTable -- JS primitives , (mkVarOcc "unsafeUnpackJSStringUtf8##", unsafeUnpackJSStringUtf8ShShKey) + , (mkTcOcc "JSVal", jsvalTyConKey) + + -- Type rep + , (mkTcOcc "TyCon", trTyConTyConKey) -- Known-key names that have BuiltinRules in ConstantFold , (mkVarOcc "unpackFoldrCString#", unpackCStringFoldrIdKey) @@ -432,14 +455,11 @@ withDictClassKey = mkPreludeClassUnique 21 dataToTagClassKey :: KnownKey dataToTagClassKey = mkPreludeClassUnique 23 - monadFailClassKey :: KnownKey monadFailClassKey = mkPreludeClassUnique 29 -monadPlusClassKey, randomClassKey, randomGenClassKey :: KnownKey -monadPlusClassKey = mkPreludeClassUnique 30 -randomClassKey = mkPreludeClassUnique 31 -randomGenClassKey = mkPreludeClassUnique 32 +monadPlusClassKey :: KnownKey +monadPlusClassKey = mkPreludeClassUnique 30 isStringClassKey :: KnownKey isStringClassKey = mkPreludeClassUnique 33 @@ -790,9 +810,6 @@ vecCountDataConKeys = map mkPreludeDataConUnique [90..95] vecElemDataConKeys :: [KnownKey] vecElemDataConKeys = map mkPreludeDataConUnique [96..105] --- Typeable things - - -- Unsafe equality unsafeReflDataConKey :: KnownKey unsafeReflDataConKey = mkPreludeDataConUnique 116 @@ -887,7 +904,6 @@ lazyIdKey = mkPreludeMiscIdUnique 104 oneShotKey = mkPreludeMiscIdUnique 106 runRWKey = mkPreludeMiscIdUnique 107 - nospecIdKey :: KnownKey nospecIdKey = mkPreludeMiscIdUnique 109 @@ -916,19 +932,12 @@ coerceKey = mkPreludeMiscIdUnique 135 -- Just a placeholder for unbound variables produced by the renamer: unboundKey :: KnownKey -unboundKey = mkPreludeMiscIdUnique 136 - - +unboundKey = mkPreludeMiscIdUnique 136 -bindMClassOpKey, thenMClassOpKey, returnMClassOpKey :: KnownKey -bindMClassOpKey = mkPreludeMiscIdUnique 154 +thenMClassOpKey, returnMClassOpKey :: KnownKey thenMClassOpKey = mkPreludeMiscIdUnique 155 -- (>>) returnMClassOpKey = mkPreludeMiscIdUnique 157 --- MonadFail operations -failMClassOpKey :: KnownKey -failMClassOpKey = mkPreludeMiscIdUnique 159 - -- Conversion functions fromIntegralIdKey, realToFracIdKey, toIntegerClassOpKey, toRationalClassOpKey :: KnownKey fromIntegralIdKey = mkPreludeMiscIdUnique 190 @@ -958,7 +967,6 @@ sappendClassOpKey = mkPreludeMiscIdUnique 554 mappendClassOpKey :: KnownKey mappendClassOpKey = mkPreludeMiscIdUnique 556 - makeStaticKey :: KnownKey makeStaticKey = mkPreludeMiscIdUnique 561 @@ -968,9 +976,8 @@ unsafeEqualityProofIdKey = mkPreludeMiscIdUnique 570 unsafeCoercePrimIdKey = mkPreludeMiscIdUnique 571 -- HasField class ops -getFieldClassOpKey, setFieldClassOpKey :: KnownKey +getFieldClassOpKey :: KnownKey getFieldClassOpKey = mkPreludeMiscIdUnique 572 -setFieldClassOpKey = mkPreludeMiscIdUnique 573 -- "Unsatisfiable" constraints unsatisfiableIdKey :: KnownKey View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/baf37fe7c53b2b0e1b08495d065933a... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/baf37fe7c53b2b0e1b08495d065933a... You're receiving this email because of your account on gitlab.haskell.org.