projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[ghc-hetmet.git]
/
compiler
/
vectorise
/
Vectorise
/
Type
/
PRepr.hs
diff --git
a/compiler/vectorise/Vectorise/Type/PRepr.hs
b/compiler/vectorise/Vectorise/Type/PRepr.hs
index
086969b
..
c30bfed
100644
(file)
--- a/
compiler/vectorise/Vectorise/Type/PRepr.hs
+++ b/
compiler/vectorise/Vectorise/Type/PRepr.hs
@@
-6,7
+6,7
@@
module Vectorise.Type.PRepr
, buildToArrPRepr
, buildFromArrPRepr)
where
, buildToArrPRepr
, buildFromArrPRepr)
where
-import VectUtils
+import Vectorise.Utils
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Type.Repr
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Type.Repr
@@
-15,6
+15,7
@@
import CoreUtils
import MkCore ( mkWildCase )
import TyCon
import Type
import MkCore ( mkWildCase )
import TyCon
import Type
+import Kind
import BuildTyCl
import OccName
import Coercion
import BuildTyCl
import OccName
import Coercion
@@
-41,6
+42,7
@@
buildPReprTyCon orig_tc vect_tc repr
tyvars
(SynonymTyCon rhs_ty)
(typeKind rhs_ty)
tyvars
(SynonymTyCon rhs_ty)
(typeKind rhs_ty)
+ NoParentTyCon
(Just $ mk_fam_inst prepr_tc vect_tc)
where
tyvars = tyConTyVars vect_tc
(Just $ mk_fam_inst prepr_tc vect_tc)
where
tyvars = tyConTyVars vect_tc
@@
-179,9
+181,9
@@
buildToArrPRepr vect_tc prepr_tc pdata_tc r
pdata_co <- mkBuiltinCo pdataTyCon
let Just repr_co = tyConFamilyCoercion_maybe prepr_tc
pdata_co <- mkBuiltinCo pdataTyCon
let Just repr_co = tyConFamilyCoercion_maybe prepr_tc
- co = mkAppCoercion pdata_co
- . mkSymCoercion
- $ mkTyConApp repr_co ty_args
+ co = mkAppCo pdata_co
+ . mkSymCo
+ $ mkAxInstCo repr_co ty_args
scrut = unwrapFamInstScrut pdata_tc ty_args (Var arg)
scrut = unwrapFamInstScrut pdata_tc ty_args (Var arg)
@@
-261,8
+263,8
@@
buildFromArrPRepr vect_tc prepr_tc pdata_tc r
pdata_co <- mkBuiltinCo pdataTyCon
let Just repr_co = tyConFamilyCoercion_maybe prepr_tc
pdata_co <- mkBuiltinCo pdataTyCon
let Just repr_co = tyConFamilyCoercion_maybe prepr_tc
- co = mkAppCoercion pdata_co
- $ mkTyConApp repr_co var_tys
+ co = mkAppCo pdata_co
+ $ mkAxInstCo repr_co var_tys
scrut = mkCoerce co (Var arg)
scrut = mkCoerce co (Var arg)