projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21d9b43
)
Read the package state after pulling in all built-ins during vectorisation
author
Roman Leshchinskiy
<rl@cse.unsw.edu.au>
Thu, 23 Aug 2007 01:34:58 +0000
(
01:34
+0000)
committer
Roman Leshchinskiy
<rl@cse.unsw.edu.au>
Thu, 23 Aug 2007 01:34:58 +0000
(
01:34
+0000)
compiler/vectorise/VectMonad.hs
patch
|
blob
|
history
diff --git
a/compiler/vectorise/VectMonad.hs
b/compiler/vectorise/VectMonad.hs
index
6cb1679
..
0a14b6c
100644
(file)
--- a/
compiler/vectorise/VectMonad.hs
+++ b/
compiler/vectorise/VectMonad.hs
@@
-47,6
+47,7
@@
import NameEnv
import TysPrim ( intPrimTy )
import Module
import IfaceEnv
import TysPrim ( intPrimTy )
import Module
import IfaceEnv
+import IOEnv ( ioToIOEnv )
import DsMonad
import PrelNames
import DsMonad
import PrelNames
@@
-429,23
+430,23
@@
lookupFamInst tycon tys
initV :: HscEnv -> ModGuts -> VectInfo -> VM a -> IO (Maybe (VectInfo, a))
initV hsc_env guts info p
= do
initV :: HscEnv -> ModGuts -> VectInfo -> VM a -> IO (Maybe (VectInfo, a))
initV hsc_env guts info p
= do
- eps <- hscEPS hsc_env
- let famInstEnvs = (eps_fam_inst_env eps, mg_fam_inst_env guts)
- let instEnvs = (eps_inst_env eps, mg_inst_env guts)
-
Just r <- initDs hsc_env (mg_module guts)
(mg_rdr_env guts)
(mg_types guts)
Just r <- initDs hsc_env (mg_module guts)
(mg_rdr_env guts)
(mg_types guts)
- (go instEnvs famInstEnvs)
+ go
return r
where
return r
where
- go instEnvs famInstEnvs =
+ go =
do
do
- builtins <- initBuiltins
+ builtins <- initBuiltins
builtin_tycons <- initBuiltinTyCons
builtin_pas <- initBuiltinPAs
builtin_tycons <- initBuiltinTyCons
builtin_pas <- initBuiltinPAs
+ eps <- ioToIOEnv $ hscEPS hsc_env
+ let famInstEnvs = (eps_fam_inst_env eps, mg_fam_inst_env guts)
+ instEnvs = (eps_inst_env eps, mg_inst_env guts)
+
let genv = extendTyConsEnv builtin_tycons
. extendPAFunsEnv builtin_pas
$ initGlobalEnv info instEnvs famInstEnvs
let genv = extendTyConsEnv builtin_tycons
. extendPAFunsEnv builtin_pas
$ initGlobalEnv info instEnvs famInstEnvs