Vectorise type declarations

diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs
index 29b6843..dd77c12 100644 (file)
--- a/compiler/vectorise/VectType.hs
+++ b/compiler/vectorise/VectType.hs
@@ -1,4 +1,4 @@
-module VectType ( vectTyCon, vectType )
+module VectType ( vectTyCon, vectType, vectTypeEnv )
 where
 
 #include "HsVersions.h"
@@ -6,6 +6,7 @@ where
 import VectMonad
 import VectUtils
 
+import HscTypes          ( TypeEnv, extendTypeEnvList, typeEnvTyCons )
 import DataCon
 import TyCon
 import Type
@@ -13,7 +14,9 @@ import TypeRep
 import OccName
 import MkId
 import BasicTypes        ( StrictnessMark(..), boolToRecFlag )
+import NameEnv
 
+import Unique
 import UniqFM
 import UniqSet
 import Digraph           ( SCC(..), stronglyConnComp )
@@ -60,6 +63,29 @@ vectType ty = pprPanic "vectType:" (ppr ty)
 
 type TyConGroup = ([TyCon], UniqSet TyCon)
 
+vectTypeEnv :: TypeEnv -> VM TypeEnv
+vectTypeEnv env
+  = do
+      cs <- readGEnv $ mk_map . global_tycons
+      let (conv_tcs, keep_tcs) = classifyTyCons cs groups
+          keep_dcs             = concatMap tyConDataCons keep_tcs
+      zipWithM_ defTyCon   keep_tcs keep_tcs
+      zipWithM_ defDataCon keep_dcs keep_dcs
+      new_tcs <- vectTyConDecls conv_tcs
+      return $ extendTypeEnvList env
+                 (map ATyCon new_tcs ++ [ADataCon dc | tc <- new_tcs
+                                                     , dc <- tyConDataCons tc])
+  where
+    tycons = typeEnvTyCons env
+    groups = tyConGroups tycons
+
+    mk_map env = listToUFM_Directly [(u, getUnique n /= u) | (u,n) <- nameEnvUniqueElts env]
+
+    keep_tc tc = let dcs = tyConDataCons tc
+                 in
+                 defTyCon tc tc >> zipWithM_ defDataCon dcs dcs
+
+
 vectTyConDecls :: [TyCon] -> VM [TyCon]
 vectTyConDecls tcs = fixV $ \tcs' ->
   do

diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index 5f24741..286680f 100644 (file)
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -56,8 +56,10 @@ vectorise hsc_env _ _ guts
 vectModule :: ModGuts -> VM ModGuts
 vectModule guts
   = do
+      types' <- vectTypeEnv (mg_types guts)
       binds' <- mapM vectTopBind (mg_binds guts)
-      return $ guts { mg_binds = binds' }
+      return $ guts { mg_types = types'
+                    , mg_binds = binds' }
 
 vectTopBind :: CoreBind -> VM CoreBind
 vectTopBind b@(NonRec var expr)