X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectType.hs;h=972aca1b7b9cc4842bfed33a1025d80242bd9fa0;hb=727fae32ea0b6ca6ebdf1b3137649813e4d7ac3d;hp=a9db43c06f51513290559923a9f065224e5c699c;hpb=6bd4bdcbb35bb49728a025cf3b4b2a87793dbe8e;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index a9db43c..972aca1 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -39,7 +39,7 @@ import TysWiredIn import TysPrim ( intPrimTy ) import Unique -import UniqFM +import LazyUniqFM import UniqSet import Util ( singleton ) import Digraph ( SCC(..), stronglyConnComp ) @@ -366,8 +366,8 @@ arrShapeTys (EnumRepr {}) = sumShapeTys sumShapeTys :: VM [Type] sumShapeTys = do - int_arr <- builtin parrayIntPrimTyCon - return [intPrimTy, mkTyConApp int_arr [], mkTyConApp int_arr []] + int_arr <- builtin intPrimArrayTy + return [intPrimTy, int_arr, int_arr] arrShapeVars :: Repr -> VM [Var] @@ -431,7 +431,7 @@ arrReprVars repr mkRepr :: TyCon -> VM Repr mkRepr vect_tc | [tys] <- rep_tys = boxedProductRepr tys - | all null rep_tys = enumRepr + -- | all null rep_tys = enumRepr | otherwise = sumRepr =<< mapM unboxedProductRepr rep_tys where rep_tys = map dataConRepArgTys $ tyConDataCons vect_tc