X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FstgSyn%2FStgLint.lhs;h=0d1b7b5921294115108dfca4ea4aa3f7f75c8715;hb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;hp=7818f32a13703cf4625c81ee42ce1cf7f0d01b4f;hpb=f23ba2b294429ccbdeb80f0344ec08f6abf61bb7;p=ghc-hetmet.git diff --git a/ghc/compiler/stgSyn/StgLint.lhs b/ghc/compiler/stgSyn/StgLint.lhs index 7818f32..0d1b7b5 100644 --- a/ghc/compiler/stgSyn/StgLint.lhs +++ b/ghc/compiler/stgSyn/StgLint.lhs @@ -10,23 +10,25 @@ module StgLint ( lintStgBindings ) where import StgSyn -import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) -import Id ( Id, idType ) +import Bag ( Bag, emptyBag, isEmptyBag, snocBag, bagToList ) +import Id ( Id, idType, isLocalId ) import VarSet import DataCon ( DataCon, dataConArgTys, dataConRepType ) +import CoreSyn ( AltCon(..) ) import PrimOp ( primOpType ) -import Literal ( literalType, Literal ) +import Literal ( literalType ) import Maybes ( catMaybes ) -import Name ( isLocallyDefined, getSrcLoc ) -import ErrUtils ( ErrMsg, Message, addErrLocHdrLine, pprBagOfErrors, dontAddErrLoc ) -import Type ( mkFunTys, splitFunTys, splitAlgTyConApp_maybe, - isUnLiftedType, isTyVarTy, splitForAllTys, Type +import Name ( getSrcLoc ) +import ErrUtils ( Message, mkLocMessage ) +import Type ( mkFunTys, splitFunTys, splitTyConApp_maybe, + isUnLiftedType, isTyVarTy, dropForAlls, Type ) -import TyCon ( TyCon ) -import Util ( zipEqual ) +import TyCon ( isAlgTyCon, isNewTyCon, tyConDataCons ) +import Util ( zipEqual, equalLength ) +import SrcLoc ( srcLocSpan ) import Outputable -infixr 9 `thenL`, `thenL_`, `thenMaybeL`, `thenMaybeL_` +infixr 9 `thenL`, `thenL_`, `thenMaybeL` \end{code} Checks for @@ -166,7 +168,13 @@ lintStgExpr e@(StgConApp con args) where con_ty = dataConRepType con -lintStgExpr e@(StgPrimApp op args _) +lintStgExpr e@(StgOpApp (StgFCallOp _ _) args res_ty) + = -- We don't have enough type information to check + -- the application; ToDo + mapMaybeL lintStgArg args `thenL` \ maybe_arg_tys -> + returnL (Just res_ty) + +lintStgExpr e@(StgOpApp (StgPrimOp op) args _) = mapMaybeL lintStgArg args `thenL` \ maybe_arg_tys -> case maybe_arg_tys of Nothing -> returnL Nothing @@ -194,10 +202,16 @@ lintStgExpr (StgLetNoEscape _ _ binds body) lintStgExpr (StgSCC _ expr) = lintStgExpr expr -lintStgExpr e@(StgCase scrut _ _ bndr _ alts) +lintStgExpr e@(StgCase scrut _ _ bndr _ alts_type alts) = lintStgExpr scrut `thenMaybeL` \ _ -> - checkTys (idType bndr) scrut_ty (mkDefltMsg bndr) `thenL_` + (case alts_type of + AlgAlt tc -> check_bndr tc + PrimAlt tc -> check_bndr tc + UbxTupAlt tc -> check_bndr tc + PolyAlt -> returnL () + ) `thenL_` + (trace (showSDoc (ppr e)) $ -- we only allow case of tail-call or primop. (case scrut of @@ -206,31 +220,22 @@ lintStgExpr e@(StgCase scrut _ _ bndr _ alts) other -> addErrL (mkCaseOfCaseMsg e)) `thenL_` addInScopeVars [bndr] (lintStgAlts alts scrut_ty) - ) + ) where - scrut_ty = get_ty alts + scrut_ty = idType bndr + bad_bndr = mkDefltMsg bndr + check_bndr tc = case splitTyConApp_maybe scrut_ty of + Just (bndr_tc, _) -> checkL (tc == bndr_tc) bad_bndr + Nothing -> addErrL bad_bndr - get_ty (StgAlgAlts ty _ _) = ty - get_ty (StgPrimAlts ty _ _) = ty -\end{code} -\begin{code} -lintStgAlts :: StgCaseAlts - -> Type -- Type of scrutinee - -> LintM (Maybe Type) -- Type of alternatives +lintStgAlts :: [StgAlt] + -> Type -- Type of scrutinee + -> LintM (Maybe Type) -- Type of alternatives lintStgAlts alts scrut_ty - = (case alts of - StgAlgAlts _ alg_alts deflt -> - mapL (lintAlgAlt scrut_ty) alg_alts `thenL` \ maybe_alt_tys -> - lintDeflt deflt scrut_ty `thenL` \ maybe_deflt_ty -> - returnL (maybe_deflt_ty : maybe_alt_tys) - - StgPrimAlts _ prim_alts deflt -> - mapL (lintPrimAlt scrut_ty) prim_alts `thenL` \ maybe_alt_tys -> - lintDeflt deflt scrut_ty `thenL` \ maybe_deflt_ty -> - returnL (maybe_deflt_ty : maybe_alt_tys) - ) `thenL` \ maybe_result_tys -> + = mapL (lintAlt scrut_ty) alts `thenL` \ maybe_result_tys -> + -- Check the result types case catMaybes (maybe_result_tys) of [] -> returnL Nothing @@ -240,20 +245,29 @@ lintStgAlts alts scrut_ty where check ty = checkTys first_ty ty (mkCaseAltMsg alts) -lintAlgAlt scrut_ty (con, args, _, rhs) - = (case splitAlgTyConApp_maybe scrut_ty of - Nothing -> - addErrL (mkAlgAltMsg1 scrut_ty) - Just (tycon, tys_applied, cons) -> +lintAlt scrut_ty (DEFAULT, _, _, rhs) + = lintStgExpr rhs + +lintAlt scrut_ty (LitAlt lit, _, _, rhs) + = checkTys (literalType lit) scrut_ty (mkAltMsg1 scrut_ty) `thenL_` + lintStgExpr rhs + +lintAlt scrut_ty (DataAlt con, args, _, rhs) + = (case splitTyConApp_maybe scrut_ty of + Just (tycon, tys_applied) | isAlgTyCon tycon && + not (isNewTyCon tycon) -> let + cons = tyConDataCons tycon arg_tys = dataConArgTys con tys_applied -- This almost certainly does not work for existential constructors in checkL (con `elem` cons) (mkAlgAltMsg2 scrut_ty con) `thenL_` - checkL (length arg_tys == length args) (mkAlgAltMsg3 con args) + checkL (equalLength arg_tys args) (mkAlgAltMsg3 con args) `thenL_` mapL check (zipEqual "lintAlgAlt:stg" arg_tys args) `thenL_` returnL () + other -> + addErrL (mkAltMsg1 scrut_ty) ) `thenL_` addInScopeVars args ( lintStgExpr rhs @@ -266,13 +280,6 @@ lintAlgAlt scrut_ty (con, args, _, rhs) -- We give it its own copy, so it isn't overloaded. elem _ [] = False elem x (y:ys) = x==y || elem x ys - -lintPrimAlt scrut_ty alt@(lit,rhs) - = checkTys (literalType lit) scrut_ty (mkPrimAltMsg alt) `thenL_` - lintStgExpr rhs - -lintDeflt StgNoDefault scrut_ty = returnL Nothing -lintDeflt deflt@(StgBindDefault rhs) scrut_ty = lintStgExpr rhs \end{code} @@ -285,8 +292,8 @@ lintDeflt deflt@(StgBindDefault rhs) scrut_ty = lintStgExpr rhs \begin{code} type LintM a = [LintLocInfo] -- Locations -> IdSet -- Local vars in scope - -> Bag ErrMsg -- Error messages so far - -> (a, Bag ErrMsg) -- Result and error messages (if any) + -> Bag Message -- Error messages so far + -> (a, Bag Message) -- Result and error messages (if any) data LintLocInfo = RhsOf Id -- The variable bound @@ -294,12 +301,12 @@ data LintLocInfo | BodyOfLetRec [Id] -- One of the binders dumpLoc (RhsOf v) = - (getSrcLoc v, ptext SLIT(" [RHS of ") <> pp_binders [v] <> char ']' ) + (srcLocSpan (getSrcLoc v), ptext SLIT(" [RHS of ") <> pp_binders [v] <> char ']' ) dumpLoc (LambdaBodyOf bs) = - (getSrcLoc (head bs), ptext SLIT(" [in body of lambda with binders ") <> pp_binders bs <> char ']' ) + (srcLocSpan (getSrcLoc (head bs)), ptext SLIT(" [in body of lambda with binders ") <> pp_binders bs <> char ']' ) dumpLoc (BodyOfLetRec bs) = - (getSrcLoc (head bs), ptext SLIT(" [in body of letrec with binders ") <> pp_binders bs <> char ']' ) + (srcLocSpan (getSrcLoc (head bs)), ptext SLIT(" [in body of letrec with binders ") <> pp_binders bs <> char ']' ) pp_binders :: [Id] -> SDoc @@ -317,7 +324,7 @@ initL m if isEmptyBag errs then Nothing else - Just (pprBagOfErrors errs) + Just (vcat (punctuate (text "") (bagToList errs))) } returnL :: a -> LintM a @@ -339,12 +346,6 @@ thenMaybeL m k loc scope errs (Nothing, errs2) -> (Nothing, errs2) (Just r, errs2) -> k r loc scope errs2 -thenMaybeL_ :: LintM (Maybe a) -> LintM (Maybe b) -> LintM (Maybe b) -thenMaybeL_ m k loc scope errs - = case m loc scope errs of - (Nothing, errs2) -> (Nothing, errs2) - (Just _, errs2) -> k loc scope errs2 - mapL :: (a -> LintM b) -> [a] -> LintM [b] mapL f [] = returnL [] mapL f (x:xs) @@ -369,13 +370,14 @@ checkL False msg loc scope errs = ((), addErr errs msg loc) addErrL :: Message -> LintM () addErrL msg loc scope errs = ((), addErr errs msg loc) -addErr :: Bag ErrMsg -> Message -> [LintLocInfo] -> Bag ErrMsg +addErr :: Bag Message -> Message -> [LintLocInfo] -> Bag Message addErr errs_so_far msg locs = errs_so_far `snocBag` mk_msg locs where - mk_msg (loc:_) = let (l,hdr) = dumpLoc loc in addErrLocHdrLine l hdr msg - mk_msg [] = dontAddErrLoc msg + mk_msg (loc:_) = let (l,hdr) = dumpLoc loc + in mkLocMessage l (hdr $$ msg) + mk_msg [] = msg addLoc :: LintLocInfo -> LintM a -> LintM a addLoc extra_loc m loc scope errs @@ -413,8 +415,7 @@ checkFunApp :: Type -- The function type checkFunApp fun_ty arg_tys msg loc scope errs = cfa res_ty expected_arg_tys arg_tys where - (_, de_forall_ty) = splitForAllTys fun_ty - (expected_arg_tys, res_ty) = splitFunTys de_forall_ty + (expected_arg_tys, res_ty) = splitFunTys (dropForAlls fun_ty) cfa res_ty expected [] -- Args have run out; that's fine = (Just (mkFunTys expected res_ty), errs) @@ -437,7 +438,7 @@ checkFunApp fun_ty arg_tys msg loc scope errs \begin{code} checkInScope :: Id -> LintM () checkInScope id loc scope errs - = if isLocallyDefined id && not (id `elemVarSet` scope) then + = if isLocalId id && not (id `elemVarSet` scope) then ((), addErr errs (hsep [ppr id, ptext SLIT("is out of scope")]) loc) else ((), errs) @@ -450,16 +451,11 @@ checkTys ty1 ty2 msg loc scope errs \end{code} \begin{code} -mkCaseAltMsg :: StgCaseAlts -> Message +mkCaseAltMsg :: [StgAlt] -> Message mkCaseAltMsg alts = ($$) (text "In some case alternatives, type of alternatives not all same:") (empty) -- LATER: ppr alts -mkCaseAbstractMsg :: TyCon -> Message -mkCaseAbstractMsg tycon - = ($$) (ptext SLIT("An algebraic case on an abstract type:")) - (ppr tycon) - mkDefltMsg :: Id -> Message mkDefltMsg bndr = ($$) (ptext SLIT("Binder of a case expression doesn't match type of scrutinee:")) @@ -478,16 +474,10 @@ mkRhsConMsg fun_ty arg_tys hang (ptext SLIT("Constructor type:")) 4 (ppr fun_ty), hang (ptext SLIT("Arg types:")) 4 (vcat (map (ppr) arg_tys))] -mkUnappTyMsg :: Id -> Type -> Message -mkUnappTyMsg var ty - = vcat [text "Variable has a for-all type, but isn't applied to any types.", - (<>) (ptext SLIT("Var: ")) (ppr var), - (<>) (ptext SLIT("Its type: ")) (ppr ty)] - -mkAlgAltMsg1 :: Type -> Message -mkAlgAltMsg1 ty - = ($$) (text "In some case statement, type of scrutinee is not a data type:") - (ppr ty) +mkAltMsg1 :: Type -> Message +mkAltMsg1 ty + = ($$) (text "In a case expression, type of scrutinee does not match patterns") + (ppr ty) mkAlgAltMsg2 :: Type -> DataCon -> Message mkAlgAltMsg2 ty con @@ -513,11 +503,6 @@ mkAlgAltMsg4 ty arg ppr arg ] -mkPrimAltMsg :: (Literal, StgExpr) -> Message -mkPrimAltMsg alt - = text "In a primitive case alternative, type of literal doesn't match type of scrutinee:" - $$ ppr alt - mkCaseOfCaseMsg :: StgExpr -> Message mkCaseOfCaseMsg e = text "Case of non-tail-call:" $$ ppr e