Simon Peyton Jones pushed to branch wip/spj-reinstallable-base at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • compiler/GHC/Tc/Utils/Env.hs
    ... ... @@ -505,7 +505,7 @@ to bring the data constructor A into scope. We thus emit the following message:
    505 505
     ************************************************************************
    
    506 506
     -}
    
    507 507
     
    
    508
    -tcLookupKnownKeyGlobal :: Unique -> TcM TyThing
    
    508
    +tcLookupKnownKeyGlobal :: HasDebugCallStack => Unique -> TcM TyThing
    
    509 509
     tcLookupKnownKeyGlobal uniq
    
    510 510
       = do { rebindable_path <- goptM Opt_RebindableKnownKeyNames
    
    511 511
            ; mb_rdr_env <- if rebindable_path
    
    ... ... @@ -517,7 +517,7 @@ tcLookupKnownKeyGlobal uniq
    517 517
                Succeeded thing -> return thing
    
    518 518
                Failed msg      -> failWithTc (TcRnInterfaceError msg) }
    
    519 519
     
    
    520
    -tcLookupKnownKeyClass :: Unique -> TcM Class
    
    520
    +tcLookupKnownKeyClass :: HasDebugCallStack => Unique -> TcM Class
    
    521 521
     tcLookupKnownKeyClass uniq
    
    522 522
       = do { thing <- tcLookupKnownKeyGlobal uniq
    
    523 523
            ; case thing of
    
    ... ... @@ -525,7 +525,7 @@ tcLookupKnownKeyClass uniq
    525 525
                          -> return cls
    
    526 526
                _  -> wrongThingErr WrongThingClass (AGlobal thing) (getName thing) }
    
    527 527
     
    
    528
    -tcLookupKnownKeyTyCon :: Unique -> TcM TyCon
    
    528
    +tcLookupKnownKeyTyCon :: HasDebugCallStack => Unique -> TcM TyCon
    
    529 529
     tcLookupKnownKeyTyCon uniq
    
    530 530
       = do { thing <- tcLookupKnownKeyGlobal uniq
    
    531 531
            ; case thing of
    

  • libraries/base/src/Data/Enum.hs
    ... ... @@ -25,6 +25,7 @@ module Data.Enum
    25 25
         ) where
    
    26 26
     
    
    27 27
     import GHC.Internal.Enum
    
    28
    +import GHC.Internal.Num( Num ) -- For -frebindable-known-key-names
    
    28 29
     
    
    29 30
     -- | Returns a list of all values of an enum type
    
    30 31
     --
    
    ... ... @@ -51,4 +52,4 @@ import GHC.Internal.Enum
    51 52
     --
    
    52 53
     -- @since base-4.22.0.0
    
    53 54
     enumerate :: (Enum a, Bounded a) => [a]
    
    54
    -enumerate = [minBound .. maxBound]
    \ No newline at end of file
    55
    +enumerate = [minBound .. maxBound]

  • libraries/base/src/System/IO/Unsafe.hs
    ... ... @@ -28,6 +28,7 @@ import GHC.Internal.IO
    28 28
     import GHC.Internal.IORef
    
    29 29
     import GHC.Internal.Exception
    
    30 30
     import GHC.Internal.Control.Exception
    
    31
    +import GHC.Internal.Num( Num ) -- For -frebindable-known-key-names
    
    31 32
     
    
    32 33
     -- | A slightly faster version of `GHC.Internal.System.IO.fixIO` that may not be
    
    33 34
     -- safe to use with multiple threads.  The unsafety arises when used