diff options
Diffstat (limited to 'compiler/vectorise/Vectorise')
| -rw-r--r-- | compiler/vectorise/Vectorise/Builtins/Base.hs | 2 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Builtins/Initialise.hs | 2 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Utils/Closure.hs | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler/vectorise/Vectorise/Builtins/Base.hs b/compiler/vectorise/Vectorise/Builtins/Base.hs index bcd85cb100..d5bbd65ee9 100644 --- a/compiler/vectorise/Vectorise/Builtins/Base.hs +++ b/compiler/vectorise/Vectorise/Builtins/Base.hs @@ -141,7 +141,7 @@ sumTyCon = indexBuiltin "sumTyCon" sumTyCons prodTyCon :: Int -> Builtins -> TyCon prodTyCon n _ | n >= 2 && n <= mAX_DPH_PROD - = tupleTyCon BoxedTuple n + = tupleTyCon Boxed n | otherwise = pprPanic "prodTyCon" (ppr n) diff --git a/compiler/vectorise/Vectorise/Builtins/Initialise.hs b/compiler/vectorise/Vectorise/Builtins/Initialise.hs index 6770103d3b..ee7cf9c2b5 100644 --- a/compiler/vectorise/Vectorise/Builtins/Initialise.hs +++ b/compiler/vectorise/Vectorise/Builtins/Initialise.hs @@ -192,7 +192,7 @@ initBuiltinVars (Builtins { }) preludeDataCons = [mk_tup n (mkFastString $ "tup" ++ show n) | n <- [2..5]] where - mk_tup n name = (tupleCon BoxedTuple n, name) + mk_tup n name = (tupleDataCon Boxed n, name) -- Auxilliary look up functions ----------------------------------------------- diff --git a/compiler/vectorise/Vectorise/Utils/Closure.hs b/compiler/vectorise/Vectorise/Utils/Closure.hs index 0a918f84e9..335b34b909 100644 --- a/compiler/vectorise/Vectorise/Utils/Closure.hs +++ b/compiler/vectorise/Vectorise/Utils/Closure.hs @@ -22,7 +22,7 @@ import TyCon import DataCon import MkId import TysWiredIn -import BasicTypes( TupleSort(..) ) +import BasicTypes( Boxity(..) ) import FastString @@ -128,13 +128,13 @@ buildEnv [] void <- builtin voidVar pvoid <- builtin pvoidVar return (ty, vVar (void, pvoid), \_ body -> body) -buildEnv [v] +buildEnv [v] = return (vVarType v, vVar v, \env body -> vLet (vNonRec v env) body) buildEnv vs = do (lenv_tc, lenv_tyargs) <- pdataReprTyCon ty - let venv_con = tupleCon BoxedTuple (length vs) + let venv_con = tupleDataCon Boxed (length vs) [lenv_con] = tyConDataCons lenv_tc venv = mkCoreTup (map Var vvs) |
