From: Roman Leshchinskiy Date: Fri, 3 Aug 2007 03:00:31 +0000 (+0000) Subject: Make sure PA dfuns are keyed on the vectorised tycon in VectInfo X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2b6729b13977b9fdc4a2120a0bbb7c0865b93198;p=ghc-hetmet.git Make sure PA dfuns are keyed on the vectorised tycon in VectInfo --- diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs index aee3132..e116da7 100644 --- a/compiler/iface/TcIface.lhs +++ b/compiler/iface/TcIface.lhs @@ -628,7 +628,7 @@ tcIfaceVectInfo mod typeEnv (IfaceVectInfo ; vDataCons <- mapM vectDataConMapping (tyConDataCons tycon) ; return ((name, (tycon, vTycon)), -- (T, T_v) vDataCons, -- list of (Ci, Ci_v) - (name, (tycon, paTycon)), -- (T, paT) + (vName, (vTycon, paTycon)), -- (T_v, paT) (name, (tycon, isoTycon))) -- (T, isoT) } vectTyConReuseMapping name diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs index a7b9f97..c05acb7 100644 --- a/compiler/main/HscTypes.lhs +++ b/compiler/main/HscTypes.lhs @@ -1302,7 +1302,7 @@ data VectInfo vectInfoVar :: VarEnv (Var , Var ), -- (f, f_v) keyed on f vectInfoTyCon :: NameEnv (TyCon , TyCon), -- (T, T_v) keyed on T vectInfoDataCon :: NameEnv (DataCon, DataCon), -- (C, C_v) keyed on C - vectInfoPADFun :: NameEnv (TyCon , Var), -- (C, paT) keyed on T + vectInfoPADFun :: NameEnv (TyCon , Var), -- (T_v, paT) keyed on T_v vectInfoIso :: NameEnv (TyCon , Var) -- (T, isoT) keyed on T } -- all of this is always tidy, even in ModGuts