X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=06fc5422127ba890967692f2898b6996064a0eef;hb=8e71d5082f618e97db1c82dede313367c386891b;hp=41164464c51844d897175ad4602518893db20731;hpb=f26b161bf682863353f188c2a8d52b7492bebcfa;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 4116446..06fc542 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -54,7 +54,8 @@ mkNDPVarFS fs = mkRdrQual nDP_BUILTIN (mkVarOccFS fs) builtin_PAs :: [(Name, RdrName)] builtin_PAs = [ - mk intTyConName FSLIT("dPA_Int") + mk closureTyConName FSLIT("dPA_Clo") + , mk intTyConName FSLIT("dPA_Int") ] ++ tups where @@ -80,7 +81,7 @@ vectModule :: ModGuts -> VM ModGuts vectModule guts = do defTyConRdrPAs builtin_PAs - (types', fam_insts) <- vectTypeEnv (mg_types guts) + (types', fam_insts, tc_binds) <- vectTypeEnv (mg_types guts) let fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts updGEnv (setFamInstEnv fam_inst_env') @@ -89,8 +90,7 @@ vectModule guts -- workers <- mapM vectDataConWorkers pa_insts binds' <- mapM vectTopBind (mg_binds guts) return $ guts { mg_types = types' - , mg_binds = -- Rec (concat workers ++ concat dicts) : - binds' + , mg_binds = Rec tc_binds : binds' , mg_fam_inst_env = fam_inst_env' , mg_fam_insts = mg_fam_insts guts ++ fam_insts }