X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FMkId.lhs;h=c621e5b8f5c3dd21bdc236dfa0b2a51dca0cbea7;hb=cd829ab3b15e6a7c30cedde2ca59fb5617aec32c;hp=47ca1b04e1f24a479aaca545b852f97aee3af793;hpb=4a7acfe8e74b4367c8043db7b824f203bf13ce00;p=ghc-hetmet.git diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs index 47ca1b0..c621e5b 100644 --- a/compiler/basicTypes/MkId.lhs +++ b/compiler/basicTypes/MkId.lhs @@ -46,9 +46,10 @@ import TysPrim ( openAlphaTyVars, alphaTyVar, alphaTy, ) import TysWiredIn ( charTy, mkListTy ) import PrelRules ( primOpRules ) -import Type ( TyThing(..), mkForAllTy, tyVarsOfTypes, newTyConInstRhs, coreEqType ) +import Type ( TyThing(..), mkForAllTy, tyVarsOfTypes, newTyConInstRhs, coreEqType, + mkTopTvSubst, substTyVar ) import Coercion ( mkSymCoercion, mkUnsafeCoercion, - splitRecNewTypeCo_maybe ) + splitNewTypeRepCo_maybe, isEqPred ) import TcType ( Type, ThetaType, mkDictTy, mkPredTys, mkPredTy, mkTyConApp, mkTyVarTys, mkClassPred, mkFunTys, mkFunTy, mkSigmaTy, tcSplitSigmaTy, @@ -62,7 +63,7 @@ import TyCon ( TyCon, isNewTyCon, tyConDataCons, FieldLabel, tyConStupidTheta, isProductTyCon, isDataTyCon, isRecursiveTyCon, newTyConCo, tyConArity ) import Class ( Class, classTyCon, classSelIds ) -import Var ( Id, TyVar, Var, setIdType ) +import Var ( Id, TyVar, Var, setIdType, mkWildCoVar ) import VarSet ( isEmptyVarSet, subVarSet, varSetElems ) import Name ( mkFCallName, mkWiredInName, Name, BuiltInSyntax(..) ) import OccName ( mkOccNameFS, varName ) @@ -70,7 +71,7 @@ import PrimOp ( PrimOp, primOpSig, primOpOcc, primOpTag ) import ForeignCall ( ForeignCall ) import DataCon ( DataCon, DataConIds(..), dataConTyCon, dataConUnivTyVars, dataConFieldLabels, dataConRepArity, dataConResTys, - dataConRepArgTys, dataConRepType, + dataConRepArgTys, dataConRepType, dataConFullSig, dataConSig, dataConStrictMarks, dataConExStricts, splitProductType, isVanillaDataCon, dataConFieldType, dataConInstOrigArgTys, deepSplitProductType @@ -95,7 +96,7 @@ import PrelNames import Util ( dropList, isSingleton ) import Outputable import FastString -import ListSetOps ( assoc ) +import ListSetOps ( assoc, minusList ) \end{code} %************************************************************************ @@ -193,24 +194,28 @@ mkDataConIds wrap_name wkr_name data_con = NewDC nt_wrap_id | any isMarkedStrict all_strict_marks -- Algebraic, needs wrapper + || not (null eq_spec) = AlgDC (Just alg_wrap_id) wrk_id | otherwise -- Algebraic, no wrapper = AlgDC Nothing wrk_id where - (tvs, theta, orig_arg_tys) = dataConSig data_con - tycon = dataConTyCon data_con + (univ_tvs, ex_tvs, eq_spec, theta, orig_arg_tys) = dataConFullSig data_con + tycon = dataConTyCon data_con - dict_tys = mkPredTys theta - all_arg_tys = dict_tys ++ orig_arg_tys - tycon_args = dataConUnivTyVars data_con - result_ty_args = (mkTyVarTys tycon_args) - result_ty = mkTyConApp tycon result_ty_args - - wrap_ty = mkForAllTys tvs (mkFunTys all_arg_tys result_ty) + ----------- Wrapper -------------- -- We used to include the stupid theta in the wrapper's args -- but now we don't. Instead the type checker just injects these -- extra constraints where necessary. + wrap_tvs = (univ_tvs `minusList` map fst eq_spec) ++ ex_tvs + subst = mkTopTvSubst eq_spec + dict_tys = mkPredTys theta + result_ty_args = map (substTyVar subst) univ_tvs + result_ty = mkTyConApp tycon result_ty_args + wrap_ty = mkForAllTys wrap_tvs $ mkFunTys dict_tys $ + mkFunTys orig_arg_tys $ result_ty + -- NB: watch out here if you allow user-written equality + -- constraints in data constructor signatures ----------- Worker (algebraic data types only) -------------- -- The *worker* for the data constructor is the function that @@ -260,7 +265,7 @@ mkDataConIds wrap_name wkr_name data_con -- No existentials on a newtype, but it can have a context -- e.g. newtype Eq a => T a = MkT (...) mkCompulsoryUnfolding $ - mkLams tvs $ Lam id_arg1 $ + mkLams wrap_tvs $ Lam id_arg1 $ wrapNewTypeBody tycon result_ty_args (Var id_arg1) @@ -290,14 +295,16 @@ mkDataConIds wrap_name wkr_name data_con -- we want to see that w is strict in its two arguments alg_unf = mkTopUnfolding $ Note InlineMe $ - mkLams tvs $ + mkLams wrap_tvs $ mkLams dict_args $ mkLams id_args $ foldr mk_case con_app (zip (dict_args ++ id_args) all_strict_marks) i3 [] - con_app i rep_ids = mkApps (Var wrk_id) - (map varToCoreExpr (tvs ++ reverse rep_ids)) + con_app i rep_ids = Var wrk_id `mkTyApps` result_ty_args + `mkVarApps` ex_tvs + `mkTyApps` map snd eq_spec + `mkVarApps` reverse rep_ids (dict_args,i2) = mkLocals 1 dict_tys (id_args,i3) = mkLocals i2 orig_arg_tys @@ -461,7 +468,14 @@ mkRecordSelId tycon field_label stupid_dict_tys = mkPredTys (dataConsStupidTheta data_cons_w_field) n_stupid_dicts = length stupid_dict_tys - (field_tyvars,field_theta,field_tau) = tcSplitSigmaTy field_ty + (pre_field_tyvars,pre_field_theta,field_tau) = tcSplitSigmaTy field_ty + -- tcSplitSigmaTy puts tyvars with EqPred kinds in with the theta, but + -- this is not what we want here, so we need to split out the EqPreds + -- as new wild tyvars + field_tyvars = pre_field_tyvars ++ eq_vars + eq_vars = map (mkWildCoVar . mkPredTy) + (filter isEqPred pre_field_theta) + field_theta = filter (not . isEqPred) pre_field_theta field_dict_tys = mkPredTys field_theta n_field_dict_tys = length field_dict_tys -- If the field has a universally quantified type we have to @@ -540,7 +554,7 @@ mkRecordSelId tycon field_label mk_alt data_con = -- In the non-vanilla case, the pattern must bind type variables and -- the context stuff; hence the arg_prefix binding below - mkReboxingAlt uniqs data_con (arg_prefix ++ arg_ids) (Var the_arg_id) + pprTrace "mkReboxingAlt" (ppr data_con <+> ppr (arg_prefix ++ arg_ids)) $ mkReboxingAlt uniqs data_con (arg_prefix ++ arg_ids) (Var the_arg_id) where (arg_prefix, arg_ids) | isVanillaDataCon data_con -- Instantiate from commmon base @@ -550,7 +564,11 @@ mkRecordSelId tycon field_label = (dc_tvs ++ mkTemplateLocalsNum arg_base (mkPredTys dc_theta), mkTemplateLocalsNum arg_base' dc_arg_tys) - (dc_tvs, dc_theta, dc_arg_tys) = dataConSig data_con + (pre_dc_tvs, pre_dc_theta, dc_arg_tys) = dataConSig data_con + -- again we need to pull the EqPreds out of dc_theta, into dc_tvs + dc_eqvars = map (mkWildCoVar . mkPredTy) (filter isEqPred pre_dc_theta) + dc_tvs = drop (length (dataConUnivTyVars data_con)) pre_dc_tvs ++ dc_eqvars + dc_theta = filter (not . isEqPred) pre_dc_theta arg_base' = arg_base + length dc_theta unpack_base = arg_base' + length dc_arg_tys @@ -630,7 +648,7 @@ mkProductBox arg_ids ty (tycon, tycon_args, pack_con, con_arg_tys) = splitProductType "mkProductBox" ty result_expr - | isNewTyCon tycon + | isNewTyCon tycon && not (isRecursiveTyCon tycon) = wrap (mkProductBox arg_ids (newTyConInstRhs tycon tycon_args)) | otherwise = mkConApp pack_con (map Type tycon_args ++ map Var arg_ids)