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
-
ea593a29
by Rodrigo Mesquita at 2026-05-19T15:11:40+01:00
4 changed files:
- compiler/GHC/Builtin/KnownKeys.hs
- libraries/base/src/GHC/Essentials.hs
- libraries/base/src/GHC/Exts.hs
- libraries/text
Changes:
| ... | ... | @@ -257,8 +257,10 @@ knownKeyTable |
| 257 | 257 | , (mkVarOcc "unpackCStringUtf8#", unpackCStringUtf8IdKey)
|
| 258 | 258 | |
| 259 | 259 | -- JS primitives
|
| 260 | +#if defined(javascript_HOST_ARCH)
|
|
| 260 | 261 | , (mkVarOcc "unsafeUnpackJSStringUtf8##", unsafeUnpackJSStringUtf8ShShKey)
|
| 261 | 262 | , (mkTcOcc "JSVal", jsvalTyConKey)
|
| 263 | +#endif
|
|
| 262 | 264 | |
| 263 | 265 | -- Type rep
|
| 264 | 266 | , (mkTcOcc "TyCon", trTyConTyConKey)
|
| ... | ... | @@ -425,7 +427,7 @@ monadFailClassKey :: KnownKey |
| 425 | 427 | monadFailClassKey = mkPreludeClassUnique 29
|
| 426 | 428 | |
| 427 | 429 | monadPlusClassKey :: KnownKey
|
| 428 | -monadPlusClassKey = mkPreludeClassUnique 30
|
|
| 430 | +monadPlusClassKey = mkPreludeClassUnique 30
|
|
| 429 | 431 | |
| 430 | 432 | isStringClassKey :: KnownKey
|
| 431 | 433 | isStringClassKey = mkPreludeClassUnique 33
|
| ... | ... | @@ -21,6 +21,7 @@ module GHC.Essentials |
| 21 | 21 | , Functor, fmap, (<$)
|
| 22 | 22 | , Monad, (>>), (>>=), return, fail, guard, mfix, join
|
| 23 | 23 | , Alternative
|
| 24 | + , MonadFail, MonadPlus
|
|
| 24 | 25 | |
| 25 | 26 | -- Misc
|
| 26 | 27 | , (.), (&&), not, foldrList, build, map
|
| ... | ... | @@ -145,7 +146,7 @@ module GHC.Essentials |
| 145 | 146 | |
| 146 | 147 | -- Static pointers
|
| 147 | 148 | , IsStatic( fromStaticPtr ), makeStatic
|
| 148 | - , StaticPtr, StaticPtrInfo( StaticPtrInfo )
|
|
| 149 | + , StaticPtr( StaticPtr ), StaticPtrInfo( StaticPtrInfo )
|
|
| 149 | 150 | |
| 150 | 151 | -- Stable pointers
|
| 151 | 152 | , StablePtr, newStablePtr
|
| ... | ... | @@ -349,5 +350,5 @@ import GHC.Internal.Exception.Context |
| 349 | 350 | import GHC.Internal.Ptr
|
| 350 | 351 | import GHC.Internal.Foreign.C.ConstPtr
|
| 351 | 352 | #if defined(javascript_HOST_ARCH)
|
| 352 | -import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##)
|
|
| 353 | +import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##, JSVal)
|
|
| 353 | 354 | #endif |
| ... | ... | @@ -73,12 +73,12 @@ module GHC.Exts |
| 73 | 73 | -- ** Overloaded string literals
|
| 74 | 74 | IsString(..),
|
| 75 | 75 | -- ** CString
|
| 76 | - unpackCString#,
|
|
| 77 | - unpackAppendCString#,
|
|
| 78 | - unpackFoldrCString#,
|
|
| 79 | - unpackCStringUtf8#,
|
|
| 80 | - unpackNBytes#,
|
|
| 81 | - cstringLength#,
|
|
| 76 | + CS.unpackCString#,
|
|
| 77 | + CS.unpackAppendCString#,
|
|
| 78 | + CS.unpackFoldrCString#,
|
|
| 79 | + CS.unpackCStringUtf8#,
|
|
| 80 | + CS.unpackNBytes#,
|
|
| 81 | + CS.cstringLength#,
|
|
| 82 | 82 | -- * Debugging
|
| 83 | 83 | -- ** Breakpoints
|
| 84 | 84 | breakpoint,
|
| ... | ... | @@ -366,7 +366,20 @@ import GHC.Prim hiding |
| 366 | 366 | |
| 367 | 367 | import GHC.Prim.Ext
|
| 368 | 368 | |
| 369 | +import qualified GHC.Types as CS (
|
|
| 370 | + unpackCString#,
|
|
| 371 | + unpackAppendCString#,
|
|
| 372 | + unpackFoldrCString#,
|
|
| 373 | + unpackCStringUtf8#,
|
|
| 374 | + unpackNBytes#,
|
|
| 375 | + cstringLength# )
|
|
| 369 | 376 | import GHC.Types hiding (
|
| 377 | + unpackCString#,
|
|
| 378 | + unpackAppendCString#,
|
|
| 379 | + unpackFoldrCString#,
|
|
| 380 | + unpackCStringUtf8#,
|
|
| 381 | + unpackNBytes#,
|
|
| 382 | + cstringLength#,
|
|
| 370 | 383 | IO, -- Exported from "GHC.IO"
|
| 371 | 384 | Type, -- Exported from "Data.Kind"
|
| 372 | 385 | -- GHC's internal representation of 'TyCon's, for 'Typeable'
|
| 1 | -Subproject commit f77f28ce19bdcb7e5de1f9a23fc3f13ffc4bb9b1 |
|
| 1 | +Subproject commit bfb985cdba77e5852e0eaf3ff77c1b4e8e9884d0 |