summaryrefslogtreecommitdiff
path: root/compiler/simplCore/SimplEnv.hs
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/simplCore/SimplEnv.hs')
-rw-r--r--compiler/simplCore/SimplEnv.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/simplCore/SimplEnv.hs b/compiler/simplCore/SimplEnv.hs
index 020607abe6..9e91d2ea5a 100644
--- a/compiler/simplCore/SimplEnv.hs
+++ b/compiler/simplCore/SimplEnv.hs
@@ -49,15 +49,15 @@ import GhcPrelude
import SimplMonad
import CoreMonad ( SimplMode(..) )
-import CoreSyn
-import CoreUtils
+import GHC.Core
+import GHC.Core.Utils
import Var
import VarEnv
import VarSet
import OrdList
import Id
-import MkCore ( mkWildValBinder )
-import GHC.Driver.Session ( DynFlags )
+import GHC.Core.Make ( mkWildValBinder )
+import GHC.Driver.Session ( DynFlags )
import TysWiredIn
import qualified Type
import Type hiding ( substTy, substTyVar, substTyVarBndr )
@@ -149,7 +149,7 @@ pprSimplEnv env
| otherwise = ppr v
type SimplIdSubst = IdEnv SimplSR -- IdId |--> OutExpr
- -- See Note [Extending the Subst] in CoreSubst
+ -- See Note [Extending the Subst] in GHC.Core.Subst
-- | A substitution result.
data SimplSR
@@ -290,7 +290,7 @@ way to do that is to start of with a representative
Id in the in-scope set
There can be *occurrences* of wild-id. For example,
-MkCore.mkCoreApp transforms
+GHC.Core.Make.mkCoreApp transforms
e (a /# b) --> case (a /# b) of wild { DEFAULT -> e wild }
This is ok provided 'wild' isn't free in 'e', and that's the delicate
thing. Generally, you want to run the simplifier to get rid of the
@@ -498,7 +498,7 @@ unitLetFloat bind = ASSERT(all (not . isJoinId) (bindersOf bind))
| not (isStrictId bndr) = FltLifted
| exprIsTickedString rhs = FltLifted
-- String literals can be floated freely.
- -- See Note [CoreSyn top-level string literals] in CoreSyn.
+ -- See Note [Core top-level string literals] in GHC.Core.
| exprOkForSpeculation rhs = FltOkSpec -- Unlifted, and lifted but ok-for-spec (eg HNF)
| otherwise = ASSERT2( not (isUnliftedType (idType bndr)), ppr bndr )
FltCareful
@@ -805,7 +805,7 @@ substNonCoVarIdBndr
-- Augment the substitution if the unique changed
-- Extend the in-scope set with the new Id
--
--- Similar to CoreSubst.substIdBndr, except that
+-- Similar to GHC.Core.Subst.substIdBndr, except that
-- the type of id_subst differs
-- all fragile info is zapped
substNonCoVarIdBndr new_res_ty