diff options
| author | Facundo DomÃnguez <facundo.dominguez@tweag.io> | 2017-01-02 19:42:20 -0300 |
|---|---|---|
| committer | Facundo DomÃnguez <facundo.dominguez@tweag.io> | 2017-01-06 14:15:27 -0300 |
| commit | e5d1ed9c8910839e109da59820ca793642961284 (patch) | |
| tree | c155bdae247d53c73ca1007e69d2da0d9a3655e7 /compiler/prelude | |
| parent | f3c7cf9b89cad7f326682b23d9f3908ebf0f8f9d (diff) | |
| download | haskell-e5d1ed9c8910839e109da59820ca793642961284.tar.gz | |
Have addModFinalizer expose the local type environment.
Summary:
Kind inference in ghci was interfered when renaming of type splices
introduced the HsSpliced data constructor. This patch has kind
inference skip over it.
Test Plan: ./validate
Reviewers: simonpj, rrnewton, austin, goldfire, bgamari
Reviewed By: goldfire, bgamari
Subscribers: thomie, mboes
Differential Revision: https://phabricator.haskell.org/D2886
GHC Trac Issues: #12985
Diffstat (limited to 'compiler/prelude')
| -rw-r--r-- | compiler/prelude/PrelNames.hs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs index 41c9e36304..e7ad536ca9 100644 --- a/compiler/prelude/PrelNames.hs +++ b/compiler/prelude/PrelNames.hs @@ -383,6 +383,7 @@ basicKnownKeyNames , ghciIoClassName, ghciStepIoMName -- StaticPtr + , makeStaticName , staticPtrTyConName , staticPtrDataConName, staticPtrInfoDataConName , fromStaticPtrName @@ -521,6 +522,9 @@ gHC_STACK_TYPES = mkBaseModule (fsLit "GHC.Stack.Types") gHC_STATICPTR :: Module gHC_STATICPTR = mkBaseModule (fsLit "GHC.StaticPtr") +gHC_STATICPTR_INTERNAL :: Module +gHC_STATICPTR_INTERNAL = mkBaseModule (fsLit "GHC.StaticPtr.Internal") + gHC_FINGERPRINT_TYPE :: Module gHC_FINGERPRINT_TYPE = mkBaseModule (fsLit "GHC.Fingerprint.Type") @@ -1386,6 +1390,10 @@ frontendPluginTyConName :: Name frontendPluginTyConName = tcQual pLUGINS (fsLit "FrontendPlugin") frontendPluginTyConKey -- Static pointers +makeStaticName :: Name +makeStaticName = + varQual gHC_STATICPTR_INTERNAL (fsLit "makeStatic") makeStaticKey + staticPtrInfoTyConName :: Name staticPtrInfoTyConName = tcQual gHC_STATICPTR (fsLit "StaticPtrInfo") staticPtrInfoTyConKey @@ -2220,6 +2228,9 @@ pushCallStackKey = mkPreludeMiscIdUnique 518 fromStaticPtrClassOpKey :: Unique fromStaticPtrClassOpKey = mkPreludeMiscIdUnique 519 +makeStaticKey :: Unique +makeStaticKey = mkPreludeMiscIdUnique 520 + {- ************************************************************************ * * |