X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcoreSyn%2FCoreLint.lhs;h=be323be8faa25721e970c006189a926930488792;hb=fe108ff1b0d4b52679ba6deddadf5d2fb3fa8f22;hp=ee5efb7ab5aa207aba5eb69c2b6b7ec7549dee3f;hpb=7f05f1095e9a2c7b2b378859da00fde7ca907080;p=ghc-hetmet.git diff --git a/ghc/compiler/coreSyn/CoreLint.lhs b/ghc/compiler/coreSyn/CoreLint.lhs index ee5efb7..be323be 100644 --- a/ghc/compiler/coreSyn/CoreLint.lhs +++ b/ghc/compiler/coreSyn/CoreLint.lhs @@ -14,11 +14,11 @@ module CoreLint ( import CoreSyn import CoreFVs ( idFreeVars ) -import CoreUtils ( findDefault, exprOkForSpeculation, coreBindsSize, mkPiType ) +import CoreUtils ( findDefault, exprOkForSpeculation, coreBindsSize ) import Unify ( coreRefineTys ) import Bag import Literal ( literalType ) -import DataCon ( dataConRepType, isVanillaDataCon, dataConTyCon, dataConResTy, dataConWorkId ) +import DataCon ( dataConRepType, isVanillaDataCon, dataConTyCon, dataConWorkId ) import TysWiredIn ( tupleCon ) import Var ( Var, Id, TyVar, idType, tyVarKind, mustHaveLocalBinding ) import VarSet @@ -30,15 +30,16 @@ import SrcLoc ( SrcLoc, noSrcLoc, mkSrcSpan ) import Type ( Type, tyVarsOfType, coreEqType, splitFunTy_maybe, mkTyVarTys, splitForAllTy_maybe, splitTyConApp_maybe, - isUnLiftedType, typeKind, + isUnLiftedType, typeKind, mkForAllTy, mkFunTy, isUnboxedTupleType, isSubKind, substTyWith, emptyTvSubst, extendTvInScope, - TvSubst, TvSubstEnv, setTvSubstEnv, substTy, + TvSubst, TvSubstEnv, mkTvSubst, setTvSubstEnv, substTy, extendTvSubst, composeTvSubst, isInScope, getTvSubstEnv, getTvInScope ) import TyCon ( isPrimTyCon ) import BasicTypes ( RecFlag(..), Boxity(..), isNonRec ) -import CmdLineOpts +import StaticFlags ( opt_PprStyle_Debug ) +import DynFlags ( DynFlags, DynFlag(..), dopt ) import Outputable #ifdef DEBUG @@ -65,8 +66,8 @@ endPass dflags pass_name dump_flag binds = do -- Report result size if required -- This has the side effect of forcing the intermediate to be evaluated - debugTraceMsg dflags $ - " Result size = " ++ show (coreBindsSize binds) + debugTraceMsg dflags 2 $ + (text " Result size =" <+> int (coreBindsSize binds)) -- Report verbosely, if required dumpIfSet_core dflags dump_flag pass_name (pprCoreBindings binds) @@ -103,9 +104,9 @@ Outstanding issues: -- -- Things are *not* OK if: -- - -- * Unsaturated type app before specialisation has been done; + -- * Unsaturated type app before specialisation has been done; -- - -- * Oversaturated type app after specialisation (eta reduction + -- * Oversaturated type app after specialisation (eta reduction -- may well be happening...); \begin{code} @@ -119,7 +120,7 @@ lintCoreBindings dflags whoDunnit binds = case (initL (lint_binds binds)) of Nothing -> showPass dflags ("Core Linted result of " ++ whoDunnit) Just bad_news -> printDump (display bad_news) >> - ghcExit 1 + ghcExit dflags 1 where -- Put all the top-level binders in scope at the start -- This is because transformation rules can bring something @@ -197,8 +198,10 @@ lintSingleBinding rec_flag (binder,rhs) %************************************************************************ \begin{code} +type InType = Type -- Substitution not yet applied +type OutType = Type -- Substitution has been applied to this -lintCoreExpr :: CoreExpr -> LintM Type +lintCoreExpr :: CoreExpr -> LintM OutType -- The returned type has the substitution from the monad -- already applied to it: -- lintCoreExpr e subst = exprType (subst e) @@ -232,7 +235,7 @@ lintCoreExpr (Let (Rec pairs) body) where bndrs = map fst pairs -lintCoreExpr (App fun (Type ty)) +lintCoreExpr e@(App fun (Type ty)) -- This is like 'let' for types -- It's needed when dealing with desugarer output for GADTs. Consider -- data T = forall a. T a (a->Int) Bool @@ -257,7 +260,8 @@ lintCoreExpr (App fun (Type ty)) -- False -> fail) -- ) a -- Now the inner case look as though it has incompatible branches. - = go fun [ty] + = addLoc (AnExpr e) $ + go fun [ty] where go (App fun (Type ty)) tys = do { go fun (ty:tys) } @@ -275,16 +279,20 @@ lintCoreExpr (App fun (Type ty)) ; lintCoreArgs fun_ty (map Type tys) } lintCoreExpr e@(App fun arg) - = do { ty <- lintCoreExpr fun + = do { fun_ty <- lintCoreExpr fun ; addLoc (AnExpr e) $ - lintCoreArg ty arg } + lintCoreArg fun_ty arg } lintCoreExpr (Lam var expr) = addLoc (LambdaBodyOf var) $ - do { lintBinder var - ; ty <- addInScopeVars [var] $ - lintCoreExpr expr - ; applySubst (mkPiType var ty) } + do { body_ty <- addInScopeVars [var] $ + lintCoreExpr expr + ; if isId var then do + { var_ty <- lintId var + ; return (mkFunTy var_ty body_ty) } + else + return (mkForAllTy var body_ty) + } -- The applySubst is needed to apply the subst to var lintCoreExpr e@(Case scrut var alt_ty alts) = @@ -329,14 +337,14 @@ lintCoreArgs ty (a : args) = do { res <- lintCoreArg ty a ; lintCoreArgs res args } -lintCoreArg ty a@(Type arg_ty) = +lintCoreArg fun_ty a@(Type arg_ty) = do { arg_ty <- lintTy arg_ty - ; lintTyApp ty arg_ty } + ; lintTyApp fun_ty arg_ty } lintCoreArg fun_ty arg = -- Make sure function type matches argument do { arg_ty <- lintCoreExpr arg - ; let err = mkAppMsg fun_ty arg_ty + ; let err = mkAppMsg fun_ty arg_ty arg ; case splitFunTy_maybe fun_ty of Just (arg,res) -> do { checkTys arg arg_ty err @@ -381,7 +389,7 @@ checkKinds tyvar arg_ty %************************************************************************ \begin{code} -checkCaseAlts :: CoreExpr -> Type -> [CoreAlt] -> LintM () +checkCaseAlts :: CoreExpr -> OutType -> [CoreAlt] -> LintM () -- a) Check that the alts are non-empty -- b1) Check that the DEFAULT comes first, if it exists -- b2) Check that the others are in increasing order @@ -414,15 +422,13 @@ checkCaseAlts e ty alts = \end{code} \begin{code} -checkAltExpr :: CoreExpr -> Type -> LintM () -checkAltExpr expr ty +checkAltExpr :: CoreExpr -> OutType -> LintM () +checkAltExpr expr ann_ty = do { actual_ty <- lintCoreExpr expr - ; ty' <- applySubst ty - ; checkTys actual_ty ty' (mkCaseAltMsg expr actual_ty ty') } + ; checkTys actual_ty ann_ty (mkCaseAltMsg expr actual_ty ann_ty) } -lintCoreAlt :: Type -- Type of scrutinee; a fixed point of - -- the substitution - -> Type -- Type of the alternative +lintCoreAlt :: OutType -- Type of scrutinee + -> OutType -- Type of the alternative -> CoreAlt -> LintM () @@ -432,8 +438,7 @@ lintCoreAlt scrut_ty alt_ty alt@(DEFAULT, args, rhs) = lintCoreAlt scrut_ty alt_ty alt@(LitAlt lit, args, rhs) = do { checkL (null args) (mkDefaultArgsMsg args) - ; checkTys lit_ty scrut_ty - (mkBadPatMsg lit_ty scrut_ty) + ; checkTys lit_ty scrut_ty (mkBadPatMsg lit_ty scrut_ty) ; checkAltExpr rhs alt_ty } where lit_ty = literalType lit @@ -445,7 +450,8 @@ lintCoreAlt scrut_ty alt_ty alt@(DataAlt con, args, rhs) addInScopeVars args $ -- Put the args in scope before lintBinder, -- because the Ids mention the type variables if isVanillaDataCon con then - do { mapM lintBinder args + do { addLoc (CasePat alt) $ do + { mapM lintBinder args -- FIX! Add check that all args are Ids. -- Check the pattern -- Scrutinee type must be a tycon applicn; checked by caller @@ -453,28 +459,34 @@ lintCoreAlt scrut_ty alt_ty alt@(DataAlt con, args, rhs) -- NB: args must be in scope here so that the lintCoreArgs line works. -- NB: relies on existential type args coming *after* ordinary type args - ; con_type <- lintTyApps (dataConRepType con) tycon_arg_tys + ; con_type <- lintTyApps (dataConRepType con) tycon_arg_tys -- Can just map Var as we know that this is a vanilla datacon - ; con_result_ty <- lintCoreArgs con_type (map Var args) - ; checkTys con_result_ty scrut_ty (mkBadPatMsg con_result_ty scrut_ty) - -- Check the RHS + ; con_result_ty <- lintCoreArgs con_type (map Var args) + ; checkTys con_result_ty scrut_ty (mkBadPatMsg con_result_ty scrut_ty) + } + -- Check the RHS ; checkAltExpr rhs alt_ty } else -- GADT do { let (tvs,ids) = span isTyVar args - pat_res_ty = dataConResTy con (mkTyVarTys tvs) - ; subst <- getTvSubst ; let in_scope = getTvInScope subst subst_env = getTvSubstEnv subst - ; case coreRefineTys in_scope tvs pat_res_ty scrut_ty of { - Nothing -> return () ; -- Alternative is dead code - Just refine -> updateTvSubstEnv (composeTvSubst in_scope refine subst_env) $ - do { tvs' <- mapM lintTy (mkTyVarTys tvs) - ; con_type <- lintTyApps (dataConRepType con) tvs' - ; mapM lintBinder ids -- Lint Ids in the refined world - ; lintCoreArgs con_type (map Var ids) - ; checkAltExpr rhs alt_ty + ; case coreRefineTys in_scope con tvs scrut_ty of { + Nothing -> return () ; -- Alternative is dead code + Just (refine, _) -> updateTvSubstEnv (composeTvSubst in_scope refine subst_env) $ + do { addLoc (CasePat alt) $ do + { tvs' <- mapM lintTy (mkTyVarTys tvs) + ; con_type <- lintTyApps (dataConRepType con) tvs' + ; mapM lintBinder ids -- Lint Ids in the refined world + ; lintCoreArgs con_type (map Var ids) + } + + ; let refined_alt_ty = substTy (mkTvSubst in_scope refine) alt_ty + -- alt_ty is already an OutType, so don't re-apply + -- the current substitution. But we must apply the + -- refinement so that the check in checkAltExpr is ok + ; checkAltExpr rhs refined_alt_ty } } } | otherwise -- Scrut-ty is wrong shape @@ -492,7 +504,7 @@ lintBinder :: Var -> LintM () lintBinder var | isId var = lintId var >> return () | otherwise = return () -lintId :: Var -> LintM Type +lintId :: Var -> LintM OutType -- ToDo: lint its rules lintId id = do { checkL (not (isUnboxedTupleType (idType id))) @@ -500,7 +512,7 @@ lintId id -- No variable can be bound to an unboxed tuple. ; lintTy (idType id) } -lintTy :: Type -> LintM Type +lintTy :: InType -> LintM OutType -- Check the type, and apply the substitution to it -- ToDo: check the kind structure of the type lintTy ty @@ -539,7 +551,8 @@ data LintLocInfo = RhsOf Id -- The variable bound | LambdaBodyOf Id -- The lambda-binder | BodyOfLetRec [Id] -- One of the binders - | CaseAlt CoreAlt -- Pattern of a case alternative + | CaseAlt CoreAlt -- Case alternative + | CasePat CoreAlt -- *Pattern* of the case alternative | AnExpr CoreExpr -- Some expression | ImportedUnfolding SrcLoc -- Some imported unfolding (ToDo: say which) \end{code} @@ -650,7 +663,10 @@ dumpLoc (AnExpr e) = (noSrcLoc, text "In the expression:" <+> ppr e) dumpLoc (CaseAlt (con, args, rhs)) - = (noSrcLoc, text "In a case alternative:" <+> parens (ppr con <+> ppr args)) + = (noSrcLoc, text "In a case alternative:" <+> parens (ppr con <+> pp_binders args)) + +dumpLoc (CasePat (con, args, rhs)) + = (noSrcLoc, text "In the pattern of a case alternative:" <+> parens (ppr con <+> pp_binders args)) dumpLoc (ImportedUnfolding locn) = (locn, brackets (ptext SLIT("in an imported unfolding"))) @@ -715,11 +731,12 @@ mkBadAltMsg scrut_ty alt ------------------------------------------------------ -- Other error messages -mkAppMsg :: Type -> Type -> Message -mkAppMsg fun arg +mkAppMsg :: Type -> Type -> CoreExpr -> Message +mkAppMsg fun_ty arg_ty arg = vcat [ptext SLIT("Argument value doesn't match argument type:"), - hang (ptext SLIT("Fun type:")) 4 (ppr fun), - hang (ptext SLIT("Arg type:")) 4 (ppr arg)] + hang (ptext SLIT("Fun type:")) 4 (ppr fun_ty), + hang (ptext SLIT("Arg type:")) 4 (ppr arg_ty), + hang (ptext SLIT("Arg:")) 4 (ppr arg)] mkKindErrMsg :: TyVar -> Type -> Message mkKindErrMsg tyvar arg_ty