Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC
Commits:
-
99f77e23
by Rodrigo Mesquita at 2026-05-12T17:11:01+01:00
4 changed files:
- compiler/GHC/HsToCore.hs
- compiler/GHC/HsToCore/Monad.hs
- compiler/GHC/Tc/Deriv/Utils.hs
- libraries/ghc-internal/src/GHC/Internal/Err.hs
Changes:
| ... | ... | @@ -64,7 +64,7 @@ import GHC.Builtin.WiredIn.Prim |
| 64 | 64 | import GHC.Builtin.WiredIn.Types
|
| 65 | 65 | import GHC.Builtin.WiredIn.Ids ( mkRepPolyIdConcreteTyVars )
|
| 66 | 66 | |
| 67 | -import GHC.Data.Maybe ( expectJust, isJust, MaybeErr (..) )
|
|
| 67 | +import GHC.Data.Maybe ( expectJust, MaybeErr (..) )
|
|
| 68 | 68 | import GHC.Data.OrdList
|
| 69 | 69 | import GHC.Data.SizedSeq ( sizeSS )
|
| 70 | 70 | |
| ... | ... | @@ -101,7 +101,6 @@ import GHC.Runtime.Interpreter (interpreterProfiled) |
| 101 | 101 | import GHC.Types.Unique.FM
|
| 102 | 102 | import GHC.Iface.Load (KnownEntitySource(..), lookupKnownKeyName)
|
| 103 | 103 | import GHC.HsToCore.Types (DsGblEnv(..))
|
| 104 | -import GHC.Types.Name.Env (emptyNameEnv)
|
|
| 105 | 104 | |
| 106 | 105 | {-
|
| 107 | 106 | ************************************************************************
|
| ... | ... | @@ -26,7 +26,7 @@ module GHC.HsToCore.Monad ( |
| 26 | 26 | dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon,
|
| 27 | 27 | dsLookupDataCon, dsLookupConLike,
|
| 28 | 28 | dsLookupKnownKeyTyCon, dsLookupKnownKeyDataCon, dsLookupKnownKeyId,
|
| 29 | - dsLookupKnownKeyName, dsLookupKnownOccName,
|
|
| 29 | + dsLookupKnownKeyName, dsLookupKnownOccName, dsGetKnownKeySource,
|
|
| 30 | 30 | dsLookupKnownOccId, dsLookupKnownOccTyCon, dsLookupKnownOccDataCon,
|
| 31 | 31 | |
| 32 | 32 | DsMetaEnv, DsMetaVal(..), dsGetMetaEnv, dsLookupMetaEnv, dsExtendMetaEnv,
|
| ... | ... | @@ -66,7 +66,6 @@ import GHC.Types.SrcLoc |
| 66 | 66 | import GHC.Types.Var.Set
|
| 67 | 67 | |
| 68 | 68 | import GHC.Builtin.KnownKeys
|
| 69 | -import GHC.Builtin.TH (liftClassKey)
|
|
| 70 | 69 | |
| 71 | 70 | import GHC.Utils.Misc
|
| 72 | 71 | import GHC.Utils.Outputable
|
| ... | ... | @@ -29,6 +29,7 @@ import GHC.Internal.Types |
| 29 | 29 | import GHC.Internal.Stack.Types
|
| 30 | 30 | import GHC.Internal.Magic
|
| 31 | 31 | import GHC.Internal.Prim
|
| 32 | +import GHC.Internal.Classes.IP as Rebindable
|
|
| 32 | 33 | |
| 33 | 34 | import {-# SOURCE #-} GHC.Internal.Exception
|
| 34 | 35 | ( errorCallWithCallStackException
|