Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 978ae62b by Rodrigo Mesquita at 2026-05-19T14:22:22+01:00 text submodule - - - - - ea593a29 by Rodrigo Mesquita at 2026-05-19T15:11:40+01:00 Fix assertion: missing exports from GHC Essentials Missing: Plugin/FrontendPlugin - - - - - 4 changed files: - compiler/GHC/Builtin/KnownKeys.hs - libraries/base/src/GHC/Essentials.hs - libraries/base/src/GHC/Exts.hs - libraries/text Changes: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -257,8 +257,10 @@ knownKeyTable , (mkVarOcc "unpackCStringUtf8#", unpackCStringUtf8IdKey) -- JS primitives +#if defined(javascript_HOST_ARCH) , (mkVarOcc "unsafeUnpackJSStringUtf8##", unsafeUnpackJSStringUtf8ShShKey) , (mkTcOcc "JSVal", jsvalTyConKey) +#endif -- Type rep , (mkTcOcc "TyCon", trTyConTyConKey) @@ -425,7 +427,7 @@ monadFailClassKey :: KnownKey monadFailClassKey = mkPreludeClassUnique 29 monadPlusClassKey :: KnownKey -monadPlusClassKey = mkPreludeClassUnique 30 +monadPlusClassKey = mkPreludeClassUnique 30 isStringClassKey :: KnownKey isStringClassKey = mkPreludeClassUnique 33 ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -21,6 +21,7 @@ module GHC.Essentials , Functor, fmap, (<$) , Monad, (>>), (>>=), return, fail, guard, mfix, join , Alternative + , MonadFail, MonadPlus -- Misc , (.), (&&), not, foldrList, build, map @@ -145,7 +146,7 @@ module GHC.Essentials -- Static pointers , IsStatic( fromStaticPtr ), makeStatic - , StaticPtr, StaticPtrInfo( StaticPtrInfo ) + , StaticPtr( StaticPtr ), StaticPtrInfo( StaticPtrInfo ) -- Stable pointers , StablePtr, newStablePtr @@ -349,5 +350,5 @@ import GHC.Internal.Exception.Context import GHC.Internal.Ptr import GHC.Internal.Foreign.C.ConstPtr #if defined(javascript_HOST_ARCH) -import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##) +import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##, JSVal) #endif ===================================== libraries/base/src/GHC/Exts.hs ===================================== @@ -73,12 +73,12 @@ module GHC.Exts -- ** Overloaded string literals IsString(..), -- ** CString - unpackCString#, - unpackAppendCString#, - unpackFoldrCString#, - unpackCStringUtf8#, - unpackNBytes#, - cstringLength#, + CS.unpackCString#, + CS.unpackAppendCString#, + CS.unpackFoldrCString#, + CS.unpackCStringUtf8#, + CS.unpackNBytes#, + CS.cstringLength#, -- * Debugging -- ** Breakpoints breakpoint, @@ -366,7 +366,20 @@ import GHC.Prim hiding import GHC.Prim.Ext +import qualified GHC.Types as CS ( + unpackCString#, + unpackAppendCString#, + unpackFoldrCString#, + unpackCStringUtf8#, + unpackNBytes#, + cstringLength# ) import GHC.Types hiding ( + unpackCString#, + unpackAppendCString#, + unpackFoldrCString#, + unpackCStringUtf8#, + unpackNBytes#, + cstringLength#, IO, -- Exported from "GHC.IO" Type, -- Exported from "Data.Kind" -- GHC's internal representation of 'TyCon's, for 'Typeable' ===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit f77f28ce19bdcb7e5de1f9a23fc3f13ffc4bb9b1 +Subproject commit bfb985cdba77e5852e0eaf3ff77c1b4e8e9884d0 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/395134b66b8aa71bcd602777bce6031... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/395134b66b8aa71bcd602777bce6031... You're receiving this email because of your account on gitlab.haskell.org.