From e5d1ed9c8910839e109da59820ca793642961284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Mon, 2 Jan 2017 19:42:20 -0300 Subject: 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 --- compiler/simplCore/SetLevels.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/simplCore/SetLevels.hs') diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs index ff780153a0..284bc4a925 100644 --- a/compiler/simplCore/SetLevels.hs +++ b/compiler/simplCore/SetLevels.hs @@ -66,7 +66,7 @@ import CoreSyn import CoreMonad ( FloatOutSwitches(..) ) import CoreUtils ( exprType , exprOkForSpeculation - , collectStaticPtrSatArgs + , collectMakeStaticArgs ) import CoreArity ( exprBotStrictness_maybe ) import CoreFVs -- all of it @@ -1187,7 +1187,7 @@ newLvlVar lvld_rhs mk_id uniq rhs_ty -- See Note [Grand plan for static forms] in SimplCore. - | isJust $ collectStaticPtrSatArgs $ snd $ + | isJust $ collectMakeStaticArgs $ snd $ collectTyBinders de_tagged_rhs = mkExportedVanillaId (mkSystemVarName uniq (mkFastString "static_ptr")) rhs_ty -- cgit v1.2.1