X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=24d4d0292e1b8cd288e81d66d2248f30930da024;hb=bf003a489bd426bfd44925e80b8442a7f8ea8d1c;hp=9b581596d5d166f621fbd8c91dc5956b9a1ae2f3;hpb=ad0e3c1e2b5edc0b95252acd1c615faeec8b99dc;p=ghc-hetmet.git diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs index 9b58159..24d4d02 100644 --- a/compiler/coreSyn/CoreUtils.lhs +++ b/compiler/coreSyn/CoreUtils.lhs @@ -31,7 +31,9 @@ module CoreUtils ( hashExpr, -- Equality - cheapEqExpr, tcEqExpr, tcEqExprX, applyTypeToArgs, applyTypeToArg + cheapEqExpr, tcEqExpr, tcEqExprX, applyTypeToArgs, applyTypeToArg, + + dataConOrigInstPat, dataConRepInstPat, dataConRepFSInstPat ) where #include "HsVersions.h" @@ -42,22 +44,26 @@ import GLAEXTS -- For `xori` import CoreSyn import CoreFVs ( exprFreeVars ) import PprCore ( pprCoreExpr ) -import Var ( Var, TyVar ) +import Var ( Var, TyVar, CoVar, isCoVar, tyVarKind, mkCoVar, mkTyVar ) +import OccName ( mkVarOccFS ) +import SrcLoc ( noSrcLoc ) import VarSet ( unionVarSet ) import VarEnv -import Name ( hashName ) +import Name ( hashName, mkSysTvName ) #if mingw32_TARGET_OS import Packages ( isDllName ) #endif import Literal ( hashLiteral, literalType, litIsDupable, litIsTrivial, isZeroLit, Literal( MachLabel ) ) -import DataCon ( DataCon, dataConRepArity, - isVanillaDataCon, dataConTyCon, dataConRepArgTys, - dataConUnivTyVars ) +import DataCon ( DataCon, dataConRepArity, eqSpecPreds, + dataConTyCon, dataConRepArgTys, + dataConUnivTyVars, dataConExTyVars, dataConEqSpec, + dataConOrigArgTys, dataConTheta ) import PrimOp ( PrimOp(..), primOpOkForSpeculation, primOpIsCheap ) import Id ( Id, idType, globalIdDetails, idNewStrictness, mkWildId, idArity, idName, idUnfolding, idInfo, - isOneShotBndr, isStateHackType, isDataConWorkId_maybe, mkSysLocal, + isOneShotBndr, isStateHackType, + isDataConWorkId_maybe, mkSysLocal, mkUserLocal, isDataConWorkId, isBottomingId, isDictId ) import IdInfo ( GlobalIdDetails(..), megaSeqIdInfo ) @@ -65,13 +71,14 @@ import NewDemand ( appIsBottom ) import Type ( Type, mkFunTy, mkForAllTy, splitFunTy_maybe, splitFunTy, tcEqTypeX, applyTys, isUnLiftedType, seqType, mkTyVarTy, - splitForAllTy_maybe, isForAllTy, splitRecNewType_maybe, + splitForAllTy_maybe, isForAllTy, splitTyConApp_maybe, coreEqType, funResultTy, applyTy, - substTyWith + substTyWith, mkPredTy ) import Coercion ( Coercion, mkTransCoercion, coercionKind, - splitRecNewTypeCo_maybe, mkSymCoercion, mkLeftCoercion, - mkRightCoercion, decomposeCo, coercionKindTyConApp ) + splitNewTypeRepCo_maybe, mkSymCoercion, + decomposeCo, coercionKindPredTy, + splitCoercionKind ) import TyCon ( tyConArity ) import TysWiredIn ( boolTy, trueDataCon, falseDataCon ) import CostCentre ( CostCentre ) @@ -82,6 +89,7 @@ import Outputable import DynFlags ( DynFlags, DynFlag(Opt_DictsCheap), dopt ) import TysPrim ( alphaTy ) -- Debugging only import Util ( equalLength, lengthAtLeast, foldl2 ) +import FastString ( FastString ) \end{code} @@ -204,8 +212,8 @@ mkInlineMe e = Note InlineMe e \begin{code} mkCoerce :: Coercion -> CoreExpr -> CoreExpr mkCoerce co (Cast expr co2) - = ASSERT(let { (from_ty, to_ty) = coercionKind co; - (from_ty2, to_ty2) = coercionKind co2} in + = ASSERT(let { (from_ty, _to_ty) = coercionKind co; + (_from_ty2, to_ty2) = coercionKind co2} in from_ty `coreEqType` to_ty2 ) mkCoerce (mkTransCoercion co2 co) expr @@ -214,7 +222,7 @@ mkCoerce co expr -- if to_ty `coreEqType` from_ty -- then expr -- else - ASSERT2(from_ty `coreEqType` (exprType expr), text "Trying to coerce" <+> text "(" <> ppr expr $$ text "::" <+> ppr (exprType expr) <> text ")" $$ ppr co $$ ppr (coercionKindTyConApp co)) + ASSERT2(from_ty `coreEqType` (exprType expr), text "Trying to coerce" <+> text "(" <> ppr expr $$ text "::" <+> ppr (exprType expr) <> text ")" $$ ppr co $$ ppr (coercionKindPredTy co)) (Cast expr co) \end{code} @@ -673,10 +681,93 @@ deepCast ty tyVars co -- coArgs = [right (left (left co)), right (left co), right co] coArgs = decomposeCo (length tyVars) co +-- These InstPat functions go here to avoid circularity between DataCon and Id +dataConRepInstPat = dataConInstPat dataConRepArgTys (repeat (FSLIT("ipv"))) +dataConRepFSInstPat = dataConInstPat dataConRepArgTys +dataConOrigInstPat = dataConInstPat dc_arg_tys (repeat (FSLIT("ipv"))) + where + dc_arg_tys dc = map mkPredTy (dataConTheta dc) ++ dataConOrigArgTys dc + -- Remember to include the existential dictionaries + +dataConInstPat :: (DataCon -> [Type]) -- function used to find arg tys + -> [FastString] -- A long enough list of FSs to use for names + -> [Unique] -- An equally long list of uniques, at least one for each binder + -> DataCon + -> [Type] -- Types to instantiate the universally quantified tyvars + -> ([TyVar], [CoVar], [Id]) -- Return instantiated variables +-- dataConInstPat arg_fun fss us con inst_tys returns a triple +-- (ex_tvs, co_tvs, arg_ids), +-- +-- ex_tvs are intended to be used as binders for existential type args +-- +-- co_tvs are intended to be used as binders for coercion args and the kinds +-- of these vars have been instantiated by the inst_tys and the ex_tys +-- +-- arg_ids are indended to be used as binders for value arguments, including +-- dicts, and their types have been instantiated with inst_tys and ex_tys +-- +-- Example. +-- The following constructor T1 +-- +-- data T a where +-- T1 :: forall b. Int -> b -> T(a,b) +-- ... +-- +-- has representation type +-- forall a. forall a1. forall b. (a :=: (a1,b)) => +-- Int -> b -> T a +-- +-- dataConInstPat fss us T1 (a1',b') will return +-- +-- ([a1'', b''], [c :: (a1', b'):=:(a1'', b'')], [x :: Int, y :: b'']) +-- +-- where the double-primed variables are created with the FastStrings and +-- Uniques given as fss and us +dataConInstPat arg_fun fss uniqs con inst_tys + = (ex_bndrs, co_bndrs, id_bndrs) + where + univ_tvs = dataConUnivTyVars con + ex_tvs = dataConExTyVars con + arg_tys = arg_fun con + eq_spec = dataConEqSpec con + eq_preds = eqSpecPreds eq_spec + + n_ex = length ex_tvs + n_co = length eq_spec + + -- split the Uniques and FastStrings + (ex_uniqs, uniqs') = splitAt n_ex uniqs + (co_uniqs, id_uniqs) = splitAt n_co uniqs' + + (ex_fss, fss') = splitAt n_ex fss + (co_fss, id_fss) = splitAt n_co fss' + + -- make existential type variables + mk_ex_var uniq fs var = mkTyVar new_name kind + where + new_name = mkSysTvName uniq fs + kind = tyVarKind var + + ex_bndrs = zipWith3 mk_ex_var ex_uniqs ex_fss ex_tvs + + -- make the instantiation substitution + inst_subst = substTyWith (univ_tvs ++ ex_tvs) (inst_tys ++ map mkTyVarTy ex_bndrs) + + -- make new coercion vars, instantiating kind + mk_co_var uniq fs eq_pred = mkCoVar new_name co_kind + where + new_name = mkSysTvName uniq fs + co_kind = inst_subst (mkPredTy eq_pred) + + co_bndrs = zipWith3 mk_co_var co_uniqs co_fss eq_preds + + -- make value vars, instantiating types + mk_id_var uniq fs ty = mkUserLocal (mkVarOccFS fs) uniq (inst_subst ty) noSrcLoc + id_bndrs = zipWith3 mk_id_var id_uniqs id_fss arg_tys + exprIsConApp_maybe :: CoreExpr -> Maybe (DataCon, [CoreExpr]) -- Returns (Just (dc, [x1..xn])) if the argument expression is -- a constructor application of the form (dc x1 .. xn) - exprIsConApp_maybe (Cast expr co) = -- Maybe this is over the top, but here we try to turn -- coerce (S,T) ( x, y ) @@ -687,30 +778,61 @@ exprIsConApp_maybe (Cast expr co) -- (# r, s #) -> ... -- where the memcpy is in the IO monad, but the call is in -- the (ST s) monad - let (from_ty, to_ty) = coercionKind co in case exprIsConApp_maybe expr of { Nothing -> Nothing ; Just (dc, args) -> + + let (from_ty, to_ty) = coercionKind co in case splitTyConApp_maybe to_ty of { Nothing -> Nothing ; Just (tc, tc_arg_tys) | tc /= dataConTyCon dc -> Nothing - | not (isVanillaDataCon dc) -> Nothing + -- | not (isVanillaDataCon dc) -> Nothing | otherwise -> - -- Type constructor must match - -- We knock out existentials to keep matters simple(r) + -- Type constructor must match datacon + + case splitTyConApp_maybe from_ty of { + Nothing -> Nothing ; + Just (tc', tc_arg_tys') | tc /= tc' -> Nothing + -- Both sides of coercion must have the same type constructor + | otherwise -> + let + -- here we do the PushC reduction rule as described in the FC paper arity = tyConArity tc - val_args = drop arity args + n_ex_tvs = length dc_ex_tyvars + + (_univ_args, rest) = splitAt arity args + (ex_args, val_args) = splitAt n_ex_tvs rest + arg_tys = dataConRepArgTys dc dc_tyvars = dataConUnivTyVars dc + dc_ex_tyvars = dataConExTyVars dc + deep arg_ty = deepCast arg_ty dc_tyvars co + + -- first we appropriately cast the value arguments new_val_args = zipWith mkCoerce (map deep arg_tys) val_args + + -- then we cast the existential coercion arguments + orig_tvs = dc_tyvars ++ dc_ex_tyvars + gammas = decomposeCo arity co + new_tys = gammas ++ (map (\ (Type t) -> t) ex_args) + theta = substTyWith orig_tvs new_tys + cast_ty tv (Type ty) + | isCoVar tv + , (ty1, ty2) <- splitCoercionKind (tyVarKind tv) + = Type $ mkTransCoercion (mkSymCoercion (theta ty1)) + (mkTransCoercion ty (theta ty2)) + | otherwise + = Type ty + new_ex_args = zipWith cast_ty dc_ex_tyvars ex_args + in ASSERT( all isTypeArg (take arity args) ) ASSERT( equalLength val_args arg_tys ) - Just (dc, map Type tc_arg_tys ++ new_val_args) - }} + Just (dc, map Type tc_arg_tys ++ new_ex_args ++ new_val_args) + }}} exprIsConApp_maybe (Note _ expr) = exprIsConApp_maybe expr @@ -1028,8 +1150,12 @@ eta_expand n us (Lam v body) ty eta_expand n us expr ty = ASSERT2 (exprType expr `coreEqType` ty, ppr (exprType expr) $$ ppr ty) case splitForAllTy_maybe ty of { - Just (tv,ty') -> Lam tv (eta_expand n us (App expr (Type (mkTyVarTy tv))) ty') + Just (tv,ty') -> + Lam lam_tv (eta_expand n us2 (App expr (Type (mkTyVarTy lam_tv))) (substTyWith [tv] [mkTyVarTy lam_tv] ty')) + where + lam_tv = mkTyVar (mkSysTvName uniq FSLIT("etaT")) (tyVarKind tv) + (uniq:us2) = us ; Nothing -> case splitFunTy_maybe ty of { @@ -1047,9 +1173,9 @@ eta_expand n us expr ty -- We want to get -- coerce T (\x::[T] -> (coerce ([T]->Int) e) x) - case splitRecNewTypeCo_maybe ty of { + case splitNewTypeRepCo_maybe ty of { Just(ty1,co) -> - mkCoerce co (eta_expand n us (mkCoerce (mkSymCoercion co) expr) ty1) ; + mkCoerce (mkSymCoercion co) (eta_expand n us (mkCoerce co expr) ty1) ; Nothing -> -- We have an expression of arity > 0, but its type isn't a function