diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-06-20 17:06:13 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-06-20 17:06:13 +0100 |
| commit | 2e2651da55f577db59f274b99a71d8a50bc7a961 (patch) | |
| tree | 645932fa4f21733b1837d508b104a06de2782d6e /compiler/vectorise/Vectorise/Monad.hs | |
| parent | 3b545c4edfd4cf61ff6dc7af18fde26faf4d7c4b (diff) | |
| parent | 089cc2928c8c0e8107448e62b29b6392a1abe30f (diff) | |
| download | haskell-2e2651da55f577db59f274b99a71d8a50bc7a961.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'compiler/vectorise/Vectorise/Monad.hs')
| -rw-r--r-- | compiler/vectorise/Vectorise/Monad.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/vectorise/Vectorise/Monad.hs b/compiler/vectorise/Vectorise/Monad.hs index 73cba88a3b..e690077192 100644 --- a/compiler/vectorise/Vectorise/Monad.hs +++ b/compiler/vectorise/Vectorise/Monad.hs @@ -65,13 +65,11 @@ initV hsc_env guts info thing_inside Just pkg -> do { -- set up tables of builtin entities - ; let compilingDPH = dphBackend dflags == DPHThis -- FIXME: temporary kludge support ; builtins <- initBuiltins pkg - ; builtin_vars <- initBuiltinVars compilingDPH builtins + ; builtin_vars <- initBuiltinVars builtins ; builtin_tycons <- initBuiltinTyCons builtins ; let builtin_datacons = initBuiltinDataCons builtins ; builtin_boxed <- initBuiltinBoxedTyCons builtins - ; builtin_scalars <- initBuiltinScalars compilingDPH builtins -- set up class and type family envrionments ; eps <- liftIO $ hscEPS hsc_env @@ -83,7 +81,6 @@ initV hsc_env guts info thing_inside -- construct the initial global environment ; let thing_inside' = traceVt "VectDecls" (ppr (mg_vect_decls guts)) >> thing_inside ; let genv = extendImportedVarsEnv builtin_vars - . extendScalars builtin_scalars . extendTyConsEnv builtin_tycons . extendDataConsEnv builtin_datacons . extendPAFunsEnv builtin_pas |