import CoreLint ( lintUnfolding )
import WorkWrap ( mkWrapper )
-import Id ( Id, mkId, mkVanillaId, isLocalId, isDataConWrapId_maybe )
-import MkId ( mkCCallOpId )
+import Id ( Id, mkVanillaGlobal, mkLocalId, idName, isDataConWrapId_maybe )
+import Module ( Module )
+import MkId ( mkFCallId )
import IdInfo
+import TyCon ( tyConDataCons )
import DataCon ( DataCon, dataConId, dataConSig, dataConArgTys )
-import Type ( mkTyVarTys, splitAlgTyConApp_maybe )
+import Type ( mkTyVarTys, splitTyConApp )
import TysWiredIn ( tupleCon )
import Var ( mkTyVar, tyVarKind )
-import Name ( Name )
+import Name ( Name, nameIsLocalOrFrom )
import Demand ( wwLazy )
import ErrUtils ( pprBagOfErrors )
import Outputable
\begin{code}
tcInterfaceSigs :: RecTcEnv -- Envt to use when checking unfoldings
+ -> Module -- This module
-> [RenamedTyClDecl] -- Ignore non-sig-decls in these decls
-> TcM [Id]
-tcInterfaceSigs unf_env decls
+tcInterfaceSigs unf_env mod decls
= listTc [ do_one name ty id_infos src_loc
| IfaceSig {tcdName = name, tcdType = ty, tcdIdInfo = id_infos, tcdLoc =src_loc} <- decls]
where
- in_scope_vars = filter isLocalId (tcEnvIds unf_env)
+ in_scope_vars = filter (nameIsLocalOrFrom mod . idName) (tcEnvIds unf_env)
+ -- Oops: using isLocalId instead can give a black hole
+ -- because it looks at the idinfo
+
-- 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
tcIfaceType ty `thenTc` \ sigma_ty ->
tcIdInfo unf_env in_scope_vars name
sigma_ty id_infos `thenTc` \ id_info ->
- returnTc (mkId name sigma_ty id_info)
+ returnTc (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
+ = foldlTc tcPrag init_info info_ins
where
- tcPrag info (HsArity arity) = returnTc (info `setArityInfo` arity)
+ -- set the CgInfo to something sensible but uninformative before
+ -- we start, because the default CgInfo is a panic.
+ init_info = vanillaIdInfo `setCgInfo` vanillaCgInfo
+
tcPrag info (HsNoCafRefs) = returnTc (info `setCafInfo` NoCafRefs)
tcPrag info HsCprInfo = returnTc (info `setCprInfo` ReturnsCPR)
+ tcPrag info (HsArity arity) =
+ returnTc (info `setArityInfo` arity
+ `setCgArity` arity)
+
tcPrag info (HsUnfold inline_prag expr)
= tcPragExpr unf_env name in_scope_vars expr `thenNF_Tc` \ maybe_expr' ->
let
tcPrag info (HsStrictness strict_info)
= returnTc (info `setStrictnessInfo` 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
+tcWorkerInfo unf_env ty info worker_name arity
= uniqSMToTcM (mkWrapper ty arity demands res_bot cpr_info) `thenNF_Tc` \ wrap_fn ->
let
-- Watch out! We can't pull on unf_env too eagerly!
info' = case tcLookupRecId_maybe unf_env worker_name of
- Just worker_id -> info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id)
- `setWorkerInfo` HasWorker worker_id arity
+ 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'
where
- -- We are relying here on arity, cpr and strictness info always appearing
+ -- We are relying here on cpr and 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
+
+ (demands, res_bot)
+ = case strictnessInfo info of
+ StrictnessInfo d r -> (d,r)
+ _ -> (take arity (repeat wwLazy),False)
+ -- Noncommittal
\end{code}
For unfoldings we try to do the job lazily, so that we never type check
tcVar name
= tcLookupGlobal_maybe name `thenNF_Tc` \ maybe_id ->
case maybe_id of {
- Just (AnId id) -> returnTc id;
+ Just (AnId id) -> returnTc id ;
Nothing -> failWithTc (noDecl name)
}
= tcIfaceType ty `thenTc` \ ty' ->
returnTc (Lit (MachLitLit lit ty'))
-tcCoreExpr (UfCCall cc ty)
+tcCoreExpr (UfFCall cc ty)
= tcIfaceType ty `thenTc` \ ty' ->
tcGetUnique `thenNF_Tc` \ u ->
- returnTc (Var (mkCCallOpId u cc ty'))
+ returnTc (Var (mkFCallId u cc ty'))
tcCoreExpr (UfTuple (HsTupCon _ boxity arity) args)
= mapTc tcCoreExpr args `thenTc` \ args' ->
= tcCoreExpr scrut `thenTc` \ 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' ->
tcCoreLamBndr (UfValBinder name ty) thing_inside
= tcIfaceType ty `thenTc` \ ty' ->
let
- id = mkVanillaId name ty'
+ id = mkLocalId name ty'
in
tcExtendGlobalValEnv [id] $
thing_inside id
tcCoreValBndr (UfValBinder name ty) thing_inside
= tcIfaceType ty `thenTc` \ 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 tcIfaceType tys `thenTc` \ tys' ->
let
- ids = zipWithEqual "tcCoreValBndr" mkVanillaId names tys'
+ ids = zipWithEqual "tcCoreValBndr" mkLocalId names tys'
in
tcExtendGlobalValEnv ids $
thing_inside ids
let
(main_tyvars, _, ex_tyvars, _, _, _) = dataConSig con
- (_, inst_tys, cons) = case splitAlgTyConApp_maybe scrut_ty of
- Just stuff -> stuff
- Nothing -> pprPanic "tcCoreAlt" (ppr alt)
+ (tycon, inst_tys) = splitTyConApp scrut_ty -- NB: not tcSplitTyConApp
+ -- We are looking at Core here
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')
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 && length inst_tys == length main_tyvars )
tcExtendTyVarEnv ex_tyvars' $
tcExtendGlobalValEnv arg_ids $
tcCoreExpr rhs `thenTc` \ rhs' ->
projects / ghc-hetmet.git / blobdiff