X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcIfaceSig.lhs;h=15fba8a1b1051cd3ac906a5bb87ca11815acf2a4;hb=a06f5e7b2158b57e40ebf255eb9d0b74e9625762;hp=58ed069efae6133440957f508cbb64e3afa74080;hpb=849b7bca043a521fc60e18393cc311c754f2d9fe;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs index 58ed069..15fba8a 100644 --- a/ghc/compiler/typecheck/TcIfaceSig.lhs +++ b/ghc/compiler/typecheck/TcIfaceSig.lhs @@ -4,23 +4,25 @@ \section[TcIfaceSig]{Type checking of type signatures in interface files} \begin{code} -module TcIfaceSig ( tcInterfaceSigs, tcVar, tcCoreExpr, tcCoreLamBndrs ) where +module TcIfaceSig ( tcInterfaceSigs, + tcVar, + tcCoreExpr, + tcCoreLamBndrs, + tcCoreBinds ) where #include "HsVersions.h" -import HsSyn ( HsDecl(..), TyClDecl(..), HsTupCon(..) ) -import TcMonad -import TcMonoType ( tcHsType ) - -- NB: all the tyars in interface files are kinded, - -- so tcHsType will do the Right Thing without - -- having to mess about with zonking - -import TcEnv ( TcEnv, RecTcEnv, tcExtendTyVarEnv, - tcExtendGlobalValEnv, tcSetEnv, - tcLookupGlobal_maybe, tcLookupRecId +import HsSyn ( CoreDecl(..), TyClDecl(..), HsTupCon(..) ) +import TcHsSyn ( TypecheckedCoreBind ) +import TcRnTypes +import TcRnMonad +import TcMonoType ( tcIfaceType, kcHsSigType ) +import TcEnv ( RecTcGblEnv, tcExtendTyVarEnv, + tcExtendGlobalValEnv, + tcLookupGlobal_maybe, tcLookupRecId_maybe ) -import RnHsSyn ( RenamedHsDecl ) +import RnHsSyn ( RenamedCoreDecl, RenamedTyClDecl ) import HsCore import Literal ( Literal(..) ) import CoreSyn @@ -29,18 +31,20 @@ import CoreUnfold import CoreLint ( lintUnfolding ) import WorkWrap ( mkWrapper ) -import Id ( Id, mkId, mkVanillaId, isDataConWrapId_maybe ) -import MkId ( mkCCallOpId ) +import Id ( Id, mkVanillaGlobal, mkLocalId, isDataConWrapId_maybe ) +import MkId ( mkFCallId ) import IdInfo -import DataCon ( dataConSig, dataConArgTys ) -import Type ( mkTyVarTys, splitAlgTyConApp_maybe ) +import TyCon ( tyConDataCons, tyConTyVars ) +import DataCon ( DataCon, dataConWorkId, dataConExistentialTyVars, dataConArgTys ) +import Type ( mkTyVarTys, splitTyConApp ) +import TysWiredIn ( tupleCon ) import Var ( mkTyVar, tyVarKind ) import Name ( Name ) -import Demand ( wwLazy ) -import ErrUtils ( pprBagOfErrors ) +import UniqSupply ( initUs_ ) import Outputable -import Util ( zipWithEqual ) -import HscTypes ( TyThing(..) ) +import Util ( zipWithEqual, dropList, equalLength ) +import HscTypes ( TyThing(..), typeEnvIds ) +import CmdLineOpts ( DynFlag(..) ) \end{code} Ultimately, type signatures in interfaces will have pragmatic @@ -51,36 +55,46 @@ As always, we do not have to worry about user-pragmas in interface signatures. \begin{code} -tcInterfaceSigs :: RecTcEnv -- Envt to use when checking unfoldings - -> [RenamedHsDecl] -- Ignore non-sig-decls in these decls +tcInterfaceSigs :: RecTcGblEnv -- Envt to use when checking unfoldings + -> [RenamedTyClDecl] -- Ignore non-sig-decls in these decls -> TcM [Id] tcInterfaceSigs unf_env decls - = listTc [ do_one name ty id_infos src_loc - | TyClD (IfaceSig name ty id_infos src_loc) <- decls] + = sequenceM [ do_one name ty id_infos src_loc + | IfaceSig {tcdName = name, tcdType = ty, + tcdIdInfo = id_infos, tcdLoc =src_loc} <- decls] where - in_scope_vars = [] -- I think this will be OK + in_scope_vars = typeEnvIds (tcg_type_env unf_env) + -- When we have hi-boot files, an unfolding might refer to + -- something defined in this module, so we must build a + -- suitable in-scope set. This thunk will only be poked + -- if -dcore-lint is on. do_one name ty id_infos src_loc - = tcAddSrcLoc src_loc $ - tcAddErrCtxt (ifaceSigCtxt name) $ - tcHsType ty `thenTc` \ sigma_ty -> + = addSrcLoc src_loc $ + addErrCtxt (ifaceSigCtxt name) $ + tcIfaceType ty `thenM` \ sigma_ty -> tcIdInfo unf_env in_scope_vars name - sigma_ty id_infos `thenTc` \ id_info -> - returnTc (mkId name sigma_ty id_info) + sigma_ty id_infos `thenM` \ id_info -> + returnM (mkVanillaGlobal name sigma_ty id_info) \end{code} \begin{code} tcIdInfo unf_env in_scope_vars name ty info_ins - = foldlTc tcPrag constantIdInfo info_ins + = foldlM tcPrag init_info info_ins where - tcPrag info (HsArity arity) = returnTc (info `setArityInfo` arity) - tcPrag info (HsNoCafRefs) = returnTc (info `setCafInfo` NoCafRefs) - tcPrag info HsCprInfo = returnTc (info `setCprInfo` ReturnsCPR) + -- Set the CgInfo to something sensible but uninformative before + -- we start; default assumption is that it has CAFs + init_info = hasCafIdInfo + + tcPrag info (HsNoCafRefs) = returnM (info `setCafInfo` NoCafRefs) + + tcPrag info (HsArity arity) = + returnM (info `setArityInfo` arity) tcPrag info (HsUnfold inline_prag expr) - = tcPragExpr unf_env name in_scope_vars expr `thenNF_Tc` \ maybe_expr' -> + = tcPragExpr unf_env name in_scope_vars expr `thenM` \ maybe_expr' -> let -- maybe_expr doesn't get looked at if the unfolding -- is never inspected; so the typecheck doesn't even happen @@ -90,40 +104,37 @@ tcIdInfo unf_env in_scope_vars name ty info_ins info1 = info `setUnfoldingInfo` unfold_info info2 = info1 `setInlinePragInfo` inline_prag in - returnTc info2 + returnM info2 tcPrag info (HsStrictness strict_info) - = returnTc (info `setStrictnessInfo` strict_info) + = returnM (info `setAllStrictnessInfo` Just strict_info) - tcPrag info (HsWorker nm) - = tcWorkerInfo unf_env ty info nm + tcPrag info (HsWorker nm arity) + = tcWorkerInfo unf_env ty info nm arity \end{code} \begin{code} -tcWorkerInfo unf_env ty info worker_name - | not (hasArity arity_info) - = pprPanic "Worker with no arity info" (ppr worker_name) - - | otherwise - = uniqSMToTcM (mkWrapper ty arity demands res_bot cpr_info) `thenNF_Tc` \ wrap_fn -> +tcWorkerInfo unf_env ty info worker_name arity + = newUniqueSupply `thenM` \ us -> let + wrap_fn = initUs_ us (mkWrapper ty strict_sig) + -- Watch out! We can't pull on unf_env too eagerly! - info' = case tcLookupRecId unf_env worker_name of - Just worker_id -> info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id) - `setWorkerInfo` HasWorker worker_id arity + info' = case tcLookupRecId_maybe unf_env worker_name of + Just worker_id -> + info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id) + `setWorkerInfo` HasWorker worker_id arity - Nothing -> pprTrace "tcWorkerInfo failed:" (ppr worker_name) info + Nothing -> pprTrace "tcWorkerInfo failed:" + (ppr worker_name) info in - returnTc info' + returnM info' where - -- We are relying here on arity, cpr and strictness info always appearing + -- We are relying here on strictness info always appearing -- before worker info, fingers crossed .... - arity_info = arityInfo info - arity = arityLowerBound arity_info - cpr_info = cprInfo info - (demands, res_bot) = case strictnessInfo info of - StrictnessInfo d r -> (d,r) - _ -> (take arity (repeat wwLazy),False) -- Noncommittal + strict_sig = case newStrictnessInfo info of + Just sig -> sig + Nothing -> pprPanic "Worker info but no strictness for" (ppr worker_name) \end{code} For unfoldings we try to do the job lazily, so that we never type check @@ -131,32 +142,22 @@ an unfolding that isn't going to be looked at. \begin{code} tcPragExpr unf_env name in_scope_vars expr - = tcDelay unf_env doc $ - tcCoreExpr expr `thenTc` \ core_expr' -> + = forkM doc $ + setGblEnv unf_env $ + + tcCoreExpr expr `thenM` \ core_expr' -> -- Check for type consistency in the unfolding - tcGetSrcLoc `thenNF_Tc` \ src_loc -> - getDOptsTc `thenTc` \ dflags -> - case lintUnfolding dflags src_loc in_scope_vars core_expr' of - (Nothing,_) -> returnTc core_expr' -- ignore warnings - (Just fail_msg,_) -> failWithTc ((doc <+> text "failed Lint") $$ fail_msg) + ifOptM Opt_DoCoreLinting ( + getSrcLocM `thenM` \ src_loc -> + case lintUnfolding src_loc in_scope_vars core_expr' of + Nothing -> returnM () + Just fail_msg -> failWithTc ((doc <+> text "Failed Lint") $$ fail_msg) + ) `thenM_` + + returnM core_expr' where doc = text "unfolding of" <+> ppr name - -tcDelay :: RecTcEnv -> SDoc -> TcM a -> NF_TcM (Maybe a) -tcDelay unf_env doc thing_inside - = forkNF_Tc ( - recoverNF_Tc bad_value ( - tcSetEnv unf_env thing_inside `thenTc` \ r -> - returnTc (Just r) - )) - where - -- The trace tells what wasn't available, for the benefit of - -- compiler hackers who want to improve it! - bad_value = getErrsTc `thenNF_Tc` \ (warns,errs) -> - returnNF_Tc (pprTrace "Failed:" - (hang doc 4 (pprBagOfErrors errs)) - Nothing) \end{code} @@ -168,9 +169,9 @@ Variables in unfoldings \begin{code} tcVar :: Name -> TcM Id tcVar name - = tcLookupGlobal_maybe name `thenNF_Tc` \ maybe_id -> + = tcLookupGlobal_maybe name `thenM` \ maybe_id -> case maybe_id of { - Just (AnId id) -> returnTc id; + Just (AnId id) -> returnM id ; Nothing -> failWithTc (noDecl name) } @@ -183,87 +184,89 @@ UfCore expressions. tcCoreExpr :: UfExpr Name -> TcM CoreExpr tcCoreExpr (UfType ty) - = tcHsType ty `thenTc` \ ty' -> + = tcIfaceType ty `thenM` \ ty' -> -- It might not be of kind type - returnTc (Type ty') + returnM (Type ty') tcCoreExpr (UfVar name) - = tcVar name `thenTc` \ id -> - returnTc (Var id) + = tcVar name `thenM` \ id -> + returnM (Var id) tcCoreExpr (UfLit lit) - = returnTc (Lit lit) + = returnM (Lit lit) -- The dreaded lit-lits are also similar, except here the type -- is read in explicitly rather than being implicit tcCoreExpr (UfLitLit lit ty) - = tcHsType ty `thenTc` \ ty' -> - returnTc (Lit (MachLitLit lit ty')) + = tcIfaceType ty `thenM` \ ty' -> + returnM (Lit (MachLitLit lit ty')) -tcCoreExpr (UfCCall cc ty) - = tcHsType ty `thenTc` \ ty' -> - tcGetUnique `thenNF_Tc` \ u -> - returnTc (Var (mkCCallOpId u cc ty')) +tcCoreExpr (UfFCall cc ty) + = tcIfaceType ty `thenM` \ ty' -> + newUnique `thenM` \ u -> + returnM (Var (mkFCallId u cc ty')) -tcCoreExpr (UfTuple (HsTupCon name _) args) - = tcVar name `thenTc` \ con_id -> - mapTc tcCoreExpr args `thenTc` \ args' -> +tcCoreExpr (UfTuple (HsTupCon boxity arity) args) + = mappM tcCoreExpr args `thenM` \ args' -> let -- Put the missing type arguments back in con_args = map (Type . exprType) args' ++ args' in - returnTc (mkApps (Var con_id) con_args) + returnM (mkApps (Var con_id) con_args) + where + con_id = dataConWorkId (tupleCon boxity arity) + tcCoreExpr (UfLam bndr body) = tcCoreLamBndr bndr $ \ bndr' -> - tcCoreExpr body `thenTc` \ body' -> - returnTc (Lam bndr' body') + tcCoreExpr body `thenM` \ body' -> + returnM (Lam bndr' body') tcCoreExpr (UfApp fun arg) - = tcCoreExpr fun `thenTc` \ fun' -> - tcCoreExpr arg `thenTc` \ arg' -> - returnTc (App fun' arg') + = tcCoreExpr fun `thenM` \ fun' -> + tcCoreExpr arg `thenM` \ arg' -> + returnM (App fun' arg') tcCoreExpr (UfCase scrut case_bndr alts) - = tcCoreExpr scrut `thenTc` \ scrut' -> + = tcCoreExpr scrut `thenM` \ scrut' -> let scrut_ty = exprType scrut' - case_bndr' = mkVanillaId case_bndr scrut_ty + case_bndr' = mkLocalId case_bndr scrut_ty in tcExtendGlobalValEnv [case_bndr'] $ - mapTc (tcCoreAlt scrut_ty) alts `thenTc` \ alts' -> - returnTc (Case scrut' case_bndr' alts') + mappM (tcCoreAlt scrut_ty) alts `thenM` \ alts' -> + returnM (Case scrut' case_bndr' alts') tcCoreExpr (UfLet (UfNonRec bndr rhs) body) - = tcCoreExpr rhs `thenTc` \ rhs' -> + = tcCoreExpr rhs `thenM` \ rhs' -> tcCoreValBndr bndr $ \ bndr' -> - tcCoreExpr body `thenTc` \ body' -> - returnTc (Let (NonRec bndr' rhs') body') + tcCoreExpr body `thenM` \ body' -> + returnM (Let (NonRec bndr' rhs') body') tcCoreExpr (UfLet (UfRec pairs) body) = tcCoreValBndrs bndrs $ \ bndrs' -> - mapTc tcCoreExpr rhss `thenTc` \ rhss' -> - tcCoreExpr body `thenTc` \ body' -> - returnTc (Let (Rec (bndrs' `zip` rhss')) body') + mappM tcCoreExpr rhss `thenM` \ rhss' -> + tcCoreExpr body `thenM` \ body' -> + returnM (Let (Rec (bndrs' `zip` rhss')) body') where (bndrs, rhss) = unzip pairs tcCoreExpr (UfNote note expr) - = tcCoreExpr expr `thenTc` \ expr' -> + = tcCoreExpr expr `thenM` \ expr' -> case note of - UfCoerce to_ty -> tcHsType to_ty `thenTc` \ to_ty' -> - returnTc (Note (Coerce to_ty' + UfCoerce to_ty -> tcIfaceType to_ty `thenM` \ to_ty' -> + returnM (Note (Coerce to_ty' (exprType expr')) expr') - UfInlineCall -> returnTc (Note InlineCall expr') - UfInlineMe -> returnTc (Note InlineMe expr') - UfSCC cc -> returnTc (Note (SCC cc) expr') + UfInlineCall -> returnM (Note InlineCall expr') + UfInlineMe -> returnM (Note InlineMe expr') + UfSCC cc -> returnM (Note (SCC cc) expr') \end{code} \begin{code} tcCoreLamBndr (UfValBinder name ty) thing_inside - = tcHsType ty `thenTc` \ ty' -> + = tcIfaceType ty `thenM` \ ty' -> let - id = mkVanillaId name ty' + id = mkLocalId name ty' in tcExtendGlobalValEnv [id] $ thing_inside id @@ -281,17 +284,17 @@ tcCoreLamBndrs (b:bs) thing_inside thing_inside (b':bs') tcCoreValBndr (UfValBinder name ty) thing_inside - = tcHsType ty `thenTc` \ ty' -> + = tcIfaceType ty `thenM` \ ty' -> let - id = mkVanillaId name ty' + id = mkLocalId name ty' in tcExtendGlobalValEnv [id] $ thing_inside id tcCoreValBndrs bndrs thing_inside -- Expect them all to be ValBinders - = mapTc tcHsType tys `thenTc` \ tys' -> + = mappM tcIfaceType tys `thenM` \ tys' -> let - ids = zipWithEqual "tcCoreValBndr" mkVanillaId names tys' + ids = zipWithEqual "tcCoreValBndr" mkLocalId names tys' in tcExtendGlobalValEnv ids $ thing_inside ids @@ -303,56 +306,96 @@ tcCoreValBndrs bndrs thing_inside -- Expect them all to be ValBinders \begin{code} tcCoreAlt scrut_ty (UfDefault, names, rhs) = ASSERT( null names ) - tcCoreExpr rhs `thenTc` \ rhs' -> - returnTc (DEFAULT, [], rhs') + tcCoreExpr rhs `thenM` \ rhs' -> + returnM (DEFAULT, [], rhs') tcCoreAlt scrut_ty (UfLitAlt lit, names, rhs) = ASSERT( null names ) - tcCoreExpr rhs `thenTc` \ rhs' -> - returnTc (LitAlt lit, [], rhs') + tcCoreExpr rhs `thenM` \ rhs' -> + returnM (LitAlt lit, [], rhs') tcCoreAlt scrut_ty (UfLitLitAlt str ty, names, rhs) = ASSERT( null names ) - tcCoreExpr rhs `thenTc` \ rhs' -> - tcHsType ty `thenTc` \ ty' -> - returnTc (LitAlt (MachLitLit str ty'), [], rhs') + tcCoreExpr rhs `thenM` \ rhs' -> + tcIfaceType ty `thenM` \ ty' -> + returnM (LitAlt (MachLitLit str ty'), [], rhs') -- A case alternative is made quite a bit more complicated -- by the fact that we omit type annotations because we can -- work them out. True enough, but its not that easy! -tcCoreAlt scrut_ty alt@(UfDataAlt con_name, names, rhs) - = tcVar con_name `thenTc` \ con_id -> +tcCoreAlt scrut_ty alt@(con, names, rhs) + = tcConAlt con `thenM` \ con -> let - con = case isDataConWrapId_maybe con_id of - Just con -> con - Nothing -> pprPanic "tcCoreAlt" (ppr con_id) - - (main_tyvars, _, ex_tyvars, _, _, _) = dataConSig con - - (_, inst_tys, cons) = case splitAlgTyConApp_maybe scrut_ty of - Just stuff -> stuff - Nothing -> pprPanic "tcCoreAlt" (ppr alt) - ex_tyvars' = [mkTyVar name (tyVarKind tv) | (name,tv) <- names `zip` ex_tyvars] - ex_tys' = mkTyVarTys ex_tyvars' - arg_tys = dataConArgTys con (inst_tys ++ ex_tys') - id_names = drop (length ex_tyvars) names + ex_tyvars = dataConExistentialTyVars con + (tycon, inst_tys) = splitTyConApp scrut_ty -- NB: not tcSplitTyConApp + -- We are looking at Core here + main_tyvars = tyConTyVars tycon + ex_tyvars' = [mkTyVar name (tyVarKind tv) | (name,tv) <- names `zip` ex_tyvars] + ex_tys' = mkTyVarTys ex_tyvars' + arg_tys = dataConArgTys con (inst_tys ++ ex_tys') + id_names = dropList ex_tyvars names arg_ids #ifdef DEBUG - | length id_names /= length arg_tys - = pprPanic "tcCoreAlts" (ppr (con_name, names, rhs) $$ + | not (equalLength id_names arg_tys) + = pprPanic "tcCoreAlts" (ppr (con, names, rhs) $$ (ppr main_tyvars <+> ppr ex_tyvars) $$ ppr arg_tys) | otherwise #endif - = zipWithEqual "tcCoreAlts" mkVanillaId id_names arg_tys + = zipWithEqual "tcCoreAlts" mkLocalId id_names arg_tys in - ASSERT( con `elem` cons && length inst_tys == length main_tyvars ) + ASSERT( con `elem` tyConDataCons tycon && equalLength inst_tys main_tyvars ) tcExtendTyVarEnv ex_tyvars' $ tcExtendGlobalValEnv arg_ids $ - tcCoreExpr rhs `thenTc` \ rhs' -> - returnTc (DataAlt con, ex_tyvars' ++ arg_ids, rhs') + tcCoreExpr rhs `thenM` \ rhs' -> + returnM (DataAlt con, ex_tyvars' ++ arg_ids, rhs') + + +tcConAlt :: UfConAlt Name -> TcM DataCon +tcConAlt (UfTupleAlt (HsTupCon boxity arity)) + = returnM (tupleCon boxity arity) + +tcConAlt (UfDataAlt con_name) + = tcVar con_name `thenM` \ con_id -> + returnM (case isDataConWrapId_maybe con_id of + Just con -> con + Nothing -> pprPanic "tcCoreAlt" (ppr con_id)) \end{code} +%************************************************************************ +%* * +\subsection{Core decls} +%* * +%************************************************************************ + + +\begin{code} +tcCoreBinds :: [RenamedCoreDecl] -> TcM [TypecheckedCoreBind] +-- We don't assume the bindings are in dependency order +-- So first build the environment, then check the RHSs +tcCoreBinds ls = mappM tcCoreBinder ls `thenM` \ bndrs -> + tcExtendGlobalValEnv bndrs $ + mappM (tcCoreBind bndrs) ls + +tcCoreBinder (CoreDecl nm ty _ _) + = kcHsSigType ty `thenM_` + tcIfaceType ty `thenM` \ ty' -> + returnM (mkLocalId nm ty') + +tcCoreBind bndrs (CoreDecl nm _ rhs loc) + = tcVar nm `thenM` \ id -> + tcCoreExpr rhs `thenM` \ rhs' -> + let + mb_err = lintUnfolding loc bndrs rhs' + in + (case mb_err of + Just err -> addErr err + Nothing -> returnM ()) `thenM_` + + returnM (id, rhs') +\end{code} + + \begin{code} ifaceSigCtxt sig_name = hsep [ptext SLIT("In an interface-file signature for"), ppr sig_name]