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 Drop unnecessary -fdefines-known-key-names - - - - - 6346d73d by Rodrigo Mesquita at 2026-05-19T13:40:39+01:00 💀 - - - - - cda7e91c by Rodrigo Mesquita at 2026-05-19T13:47:38+01:00 missing KnownOcc from Essentials - - - - - 70633b45 by Rodrigo Mesquita at 2026-05-19T13:48:24+01:00 GHCziInternalziCString -> GHCziInternalziTypes - - - - - ab374c8e by Rodrigo Mesquita at 2026-05-19T13:50:36+01:00 URec data instance fields - - - - - 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: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -173,7 +173,7 @@ knownKeyTable , (mkTcOcc "Ptr", ptrTyConKey) , (mkTcOcc "FunPtr", funPtrTyConKey) - -- Class Monad, MonadFix, MonadZip + -- Class Monad , (mkTcOcc "Monad", monadClassKey) , (thenMClassOpOcc, thenMClassOpKey) , (returnMClassOpOcc, returnMClassOpKey) ===================================== compiler/GHC/Builtin/KnownOccs.hs ===================================== @@ -194,8 +194,8 @@ returnIOIdOcc = mkVarOcc "returnIO" bindIOIdOcc = mkVarOcc "bindIO" thenIOIdOcc = mkVarOcc "thenIO" printIdOcc = mkVarOcc "print" -ioTyConOcc = mkTcOcc "IO" -ioDataConOcc = mkTcOcc "IO" +ioTyConOcc = mkTcOcc "IO" +ioDataConOcc = mkDataOcc "IO" -- Enumerations enumFromClassOpOcc, enumFromThenClassOpOcc, ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -62,6 +62,7 @@ module GHC.Essentials , U1(..), Par1(..), Rec0, Rec1(..), K1(..), M1(..), S1, C1, D1 , V1, (:+:)(L1, R1), (:*:)((:*:)), (:.:)(Comp1, unComp1) , UAddr, UChar, UDouble, UFloat, UInt, UWord, Meta(..) + , uAddr#, uChar#, uDouble#, uFloat#, uInt#, uWord# , FixityI(..), Associativity(..), SourceUnpackedness(..), SourceStrictness(..) , DecidedStrictness(..) @@ -75,6 +76,7 @@ module GHC.Essentials -- Other data types , Either(..) , Void + , NonEmpty -- FFI , Ptr, FunPtr @@ -273,6 +275,9 @@ module GHC.Essentials , toAnnotationWrapper + -- Debug + , trace + #if defined(javascript_HOST_ARCH) -- JS primitives , unsafeUnpackJSStringUtf8## @@ -280,6 +285,7 @@ module GHC.Essentials ) where import GHC.Internal.Base hiding( foldr ) +import GHC.Internal.Debug.Trace( trace ) import GHC.Internal.Show import GHC.Internal.Read import GHC.Internal.Num ===================================== libraries/ghc-internal/include/RtsIfaceSymbols.h ===================================== @@ -57,8 +57,8 @@ CLOSURE(GHCziInternalziStackziCloneStack, StackSnapshot_closure) CLOSURE(GHCziInternalziExceptionziType, divZZeroException_closure) CLOSURE(GHCziInternalziExceptionziType, underflowException_closure) CLOSURE(GHCziInternalziExceptionziType, overflowException_closure) -INFO_TBL(GHCziInternalziCString, unpackCStringzh_info) -INFO_TBL(GHCziInternalziCString, unpackCStringUtf8zh_info) +INFO_TBL(GHCziInternalziTypes, unpackCStringzh_info) +INFO_TBL(GHCziInternalziTypes, unpackCStringUtf8zh_info) #if defined(wasm32_HOST_ARCH) && defined(__PIC__) CLOSURE(GHCziInternalziWasmziPrimziImports, raiseJSException_closure) INFO_TBL(GHCziInternalziWasmziPrimziTypes, JSVal_con_info) ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Arrow.hs ===================================== @@ -4,9 +4,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fdefines-known-key-names #-} - -- Defines Arrow and its methods - {-# OPTIONS_GHC -Wno-inline-rule-shadowing #-} -- The RULES for the methods of class Arrow may never fire -- e.g. compose/arr; see #10528 ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Category.hs ===================================== @@ -3,12 +3,6 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE PolyKinds #-} -{-# OPTIONS_GHC -fdefines-known-key-names #-} - -- Defines (>>>) -{-# OPTIONS_GHC -fexclude-known-key-define=. #-} - -- Careful! The (.) method in the Category class is not - -- the known-key name; that is in GHC.Internal.Base - {-# OPTIONS_GHC -Wno-inline-rule-shadowing #-} -- The RULES for the methods of class Category may never fire -- e.g. identity/left, identity/right, association; see #10528 ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs ===================================== @@ -1,9 +1,6 @@ {-# LANGUAGE Trustworthy #-} {-# LANGUAGE NoImplicitPrelude #-} -{-# OPTIONS_GHC -fdefines-known-key-names #-} - -- Defines guard - ----------------------------------------------------------------------------- -- | -- Module : GHC.Internal.Control.Monad ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs ===================================== @@ -2,9 +2,6 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE TypeOperators #-} -{-# OPTIONS_GHC -fdefines-known-key-names #-} - -- Defines loop, mfix - -- For head in instance MonadFix [] {-# OPTIONS_GHC -Wno-x-partial #-} ===================================== libraries/ghc-internal/src/GHC/Internal/OverloadedLabels.hs ===================================== @@ -5,9 +5,6 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# OPTIONS_GHC -fdefines-known-key-names #-} - -- Defines fromLabel - ----------------------------------------------------------------------------- -- | -- Module : GHC.Internal.OverloadedLabels View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5197d507465c531cd1cd12cca45c8bb... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5197d507465c531cd1cd12cca45c8bb... You're receiving this email because of your account on gitlab.haskell.org.