Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC
Commits:
-
76f5f329
by Rodrigo Mesquita at 2026-05-19T12:06:58+01:00
-
6346d73d
by Rodrigo Mesquita at 2026-05-19T13:40:39+01:00
-
cda7e91c
by Rodrigo Mesquita at 2026-05-19T13:47:38+01:00
-
70633b45
by Rodrigo Mesquita at 2026-05-19T13:48:24+01:00
-
ab374c8e
by Rodrigo Mesquita at 2026-05-19T13:50:36+01:00
9 changed files:
- compiler/GHC/Builtin/KnownKeys.hs
- compiler/GHC/Builtin/KnownOccs.hs
- libraries/base/src/GHC/Essentials.hs
- libraries/ghc-internal/include/RtsIfaceSymbols.h
- libraries/ghc-internal/src/GHC/Internal/Control/Arrow.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Category.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs
- libraries/ghc-internal/src/GHC/Internal/OverloadedLabels.hs
Changes:
| ... | ... | @@ -173,7 +173,7 @@ knownKeyTable |
| 173 | 173 | , (mkTcOcc "Ptr", ptrTyConKey)
|
| 174 | 174 | , (mkTcOcc "FunPtr", funPtrTyConKey)
|
| 175 | 175 | |
| 176 | - -- Class Monad, MonadFix, MonadZip
|
|
| 176 | + -- Class Monad
|
|
| 177 | 177 | , (mkTcOcc "Monad", monadClassKey)
|
| 178 | 178 | , (thenMClassOpOcc, thenMClassOpKey)
|
| 179 | 179 | , (returnMClassOpOcc, returnMClassOpKey)
|
| ... | ... | @@ -194,8 +194,8 @@ returnIOIdOcc = mkVarOcc "returnIO" |
| 194 | 194 | bindIOIdOcc = mkVarOcc "bindIO"
|
| 195 | 195 | thenIOIdOcc = mkVarOcc "thenIO"
|
| 196 | 196 | printIdOcc = mkVarOcc "print"
|
| 197 | -ioTyConOcc = mkTcOcc "IO"
|
|
| 198 | -ioDataConOcc = mkTcOcc "IO"
|
|
| 197 | +ioTyConOcc = mkTcOcc "IO"
|
|
| 198 | +ioDataConOcc = mkDataOcc "IO"
|
|
| 199 | 199 | |
| 200 | 200 | -- Enumerations
|
| 201 | 201 | enumFromClassOpOcc, enumFromThenClassOpOcc,
|
| ... | ... | @@ -62,6 +62,7 @@ module GHC.Essentials |
| 62 | 62 | , U1(..), Par1(..), Rec0, Rec1(..), K1(..), M1(..), S1, C1, D1
|
| 63 | 63 | , V1, (:+:)(L1, R1), (:*:)((:*:)), (:.:)(Comp1, unComp1)
|
| 64 | 64 | , UAddr, UChar, UDouble, UFloat, UInt, UWord, Meta(..)
|
| 65 | + , uAddr#, uChar#, uDouble#, uFloat#, uInt#, uWord#
|
|
| 65 | 66 | , FixityI(..), Associativity(..), SourceUnpackedness(..), SourceStrictness(..)
|
| 66 | 67 | , DecidedStrictness(..)
|
| 67 | 68 | |
| ... | ... | @@ -75,6 +76,7 @@ module GHC.Essentials |
| 75 | 76 | -- Other data types
|
| 76 | 77 | , Either(..)
|
| 77 | 78 | , Void
|
| 79 | + , NonEmpty
|
|
| 78 | 80 | |
| 79 | 81 | -- FFI
|
| 80 | 82 | , Ptr, FunPtr
|
| ... | ... | @@ -273,6 +275,9 @@ module GHC.Essentials |
| 273 | 275 | |
| 274 | 276 | , toAnnotationWrapper
|
| 275 | 277 | |
| 278 | + -- Debug
|
|
| 279 | + , trace
|
|
| 280 | + |
|
| 276 | 281 | #if defined(javascript_HOST_ARCH)
|
| 277 | 282 | -- JS primitives
|
| 278 | 283 | , unsafeUnpackJSStringUtf8##
|
| ... | ... | @@ -280,6 +285,7 @@ module GHC.Essentials |
| 280 | 285 | ) where
|
| 281 | 286 | |
| 282 | 287 | import GHC.Internal.Base hiding( foldr )
|
| 288 | +import GHC.Internal.Debug.Trace( trace )
|
|
| 283 | 289 | import GHC.Internal.Show
|
| 284 | 290 | import GHC.Internal.Read
|
| 285 | 291 | import GHC.Internal.Num
|
| ... | ... | @@ -57,8 +57,8 @@ CLOSURE(GHCziInternalziStackziCloneStack, StackSnapshot_closure) |
| 57 | 57 | CLOSURE(GHCziInternalziExceptionziType, divZZeroException_closure)
|
| 58 | 58 | CLOSURE(GHCziInternalziExceptionziType, underflowException_closure)
|
| 59 | 59 | CLOSURE(GHCziInternalziExceptionziType, overflowException_closure)
|
| 60 | -INFO_TBL(GHCziInternalziCString, unpackCStringzh_info)
|
|
| 61 | -INFO_TBL(GHCziInternalziCString, unpackCStringUtf8zh_info)
|
|
| 60 | +INFO_TBL(GHCziInternalziTypes, unpackCStringzh_info)
|
|
| 61 | +INFO_TBL(GHCziInternalziTypes, unpackCStringUtf8zh_info)
|
|
| 62 | 62 | #if defined(wasm32_HOST_ARCH) && defined(__PIC__)
|
| 63 | 63 | CLOSURE(GHCziInternalziWasmziPrimziImports, raiseJSException_closure)
|
| 64 | 64 | INFO_TBL(GHCziInternalziWasmziPrimziTypes, JSVal_con_info)
|
| ... | ... | @@ -4,9 +4,6 @@ |
| 4 | 4 | {-# LANGUAGE DeriveGeneric #-}
|
| 5 | 5 | {-# LANGUAGE StandaloneDeriving #-}
|
| 6 | 6 | |
| 7 | -{-# OPTIONS_GHC -fdefines-known-key-names #-}
|
|
| 8 | - -- Defines Arrow and its methods
|
|
| 9 | - |
|
| 10 | 7 | {-# OPTIONS_GHC -Wno-inline-rule-shadowing #-}
|
| 11 | 8 | -- The RULES for the methods of class Arrow may never fire
|
| 12 | 9 | -- e.g. compose/arr; see #10528
|
| ... | ... | @@ -3,12 +3,6 @@ |
| 3 | 3 | {-# LANGUAGE NoImplicitPrelude #-}
|
| 4 | 4 | {-# LANGUAGE PolyKinds #-}
|
| 5 | 5 | |
| 6 | -{-# OPTIONS_GHC -fdefines-known-key-names #-}
|
|
| 7 | - -- Defines (>>>)
|
|
| 8 | -{-# OPTIONS_GHC -fexclude-known-key-define=. #-}
|
|
| 9 | - -- Careful! The (.) method in the Category class is not
|
|
| 10 | - -- the known-key name; that is in GHC.Internal.Base
|
|
| 11 | - |
|
| 12 | 6 | {-# OPTIONS_GHC -Wno-inline-rule-shadowing #-}
|
| 13 | 7 | -- The RULES for the methods of class Category may never fire
|
| 14 | 8 | -- e.g. identity/left, identity/right, association; see #10528
|
| 1 | 1 | {-# LANGUAGE Trustworthy #-}
|
| 2 | 2 | {-# LANGUAGE NoImplicitPrelude #-}
|
| 3 | 3 | |
| 4 | -{-# OPTIONS_GHC -fdefines-known-key-names #-}
|
|
| 5 | - -- Defines guard
|
|
| 6 | - |
|
| 7 | 4 | -----------------------------------------------------------------------------
|
| 8 | 5 | -- |
|
| 9 | 6 | -- Module : GHC.Internal.Control.Monad
|
| ... | ... | @@ -2,9 +2,6 @@ |
| 2 | 2 | {-# LANGUAGE NoImplicitPrelude #-}
|
| 3 | 3 | {-# LANGUAGE TypeOperators #-}
|
| 4 | 4 | |
| 5 | -{-# OPTIONS_GHC -fdefines-known-key-names #-}
|
|
| 6 | - -- Defines loop, mfix
|
|
| 7 | - |
|
| 8 | 5 | -- For head in instance MonadFix []
|
| 9 | 6 | {-# OPTIONS_GHC -Wno-x-partial #-}
|
| 10 | 7 |
| ... | ... | @@ -5,9 +5,6 @@ |
| 5 | 5 | {-# LANGUAGE MultiParamTypeClasses #-}
|
| 6 | 6 | {-# LANGUAGE ScopedTypeVariables #-}
|
| 7 | 7 | |
| 8 | -{-# OPTIONS_GHC -fdefines-known-key-names #-}
|
|
| 9 | - -- Defines fromLabel
|
|
| 10 | - |
|
| 11 | 8 | -----------------------------------------------------------------------------
|
| 12 | 9 | -- |
|
| 13 | 10 | -- Module : GHC.Internal.OverloadedLabels
|