X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FId.lhs;h=b1a4a1a5d7223b210f7574524b603a3b23f600c8;hb=7d841483081735f5f906a6bb5e80249d97f3226b;hp=64f32ff13b4d1384eb47b7ff9414c7674ae581de;hpb=11a3ee539ec8fb79cf81410e45b7fd9cbc0cd721;p=ghc-hetmet.git diff --git a/ghc/compiler/basicTypes/Id.lhs b/ghc/compiler/basicTypes/Id.lhs index 64f32ff..b1a4a1a 100644 --- a/ghc/compiler/basicTypes/Id.lhs +++ b/ghc/compiler/basicTypes/Id.lhs @@ -8,29 +8,30 @@ module Id ( Id, DictId, -- Simple construction - mkId, mkVanillaId, mkSysLocal, mkUserLocal, + mkGlobalId, mkLocalId, mkSpecPragmaId, mkLocalIdWithInfo, + mkSysLocal, mkUserLocal, mkVanillaGlobal, mkTemplateLocals, mkTemplateLocalsNum, mkWildId, mkTemplateLocal, + mkWorkerId, -- Taking an Id apart idName, idType, idUnique, idInfo, - idPrimRep, isId, + idPrimRep, isId, globalIdDetails, recordSelectorFieldLabel, -- Modifying an Id - setIdName, setIdUnique, setIdType, setIdNoDiscard, + setIdName, setIdUnique, setIdType, setIdLocalExported, setGlobalIdDetails, setIdInfo, lazySetIdInfo, modifyIdInfo, maybeModifyIdInfo, - zapFragileIdInfo, zapLamIdInfo, + zapLamIdInfo, zapDemandIdInfo, -- Predicates isImplicitId, isDeadBinder, - externallyVisibleId, - isIP, - isSpecPragmaId, isRecordSelector, - isPrimOpId, isPrimOpId_maybe, isDictFunId, + isSpecPragmaId, isExportedId, isLocalId, isGlobalId, + isRecordSelector, + isPrimOpId, isPrimOpId_maybe, + isFCallId, isFCallId_maybe, isDataConId, isDataConId_maybe, isDataConWrapId, isDataConWrapId_maybe, isBottomingId, - isExportedId, isLocalId, hasNoBinding, -- Inline pragma stuff @@ -42,75 +43,91 @@ module Id ( -- IdInfo stuff setIdUnfolding, - setIdArityInfo, - setIdDemandInfo, - setIdStrictness, + setIdArity, + setIdNewDemandInfo, + setIdNewStrictness, zapIdNewStrictness, setIdTyGenInfo, setIdWorkerInfo, setIdSpecialisation, - setIdCafInfo, - setIdCprInfo, + setIdCgInfo, setIdOccInfo, - idArity, idArityInfo, - idFlavour, - idDemandInfo, - idStrictness, +#ifdef OLD_STRICTNESS + idDemandInfo, + idStrictness, + idCprInfo, + setIdStrictness, + setIdDemandInfo, + setIdCprInfo, +#endif + + idArity, + idNewDemandInfo, + idNewStrictness, idNewStrictness_maybe, idTyGenInfo, idWorkerInfo, idUnfolding, - idSpecialisation, + idSpecialisation, idCoreRules, + idCgInfo, idCafInfo, - idCprInfo, idLBVarInfo, idOccInfo, +#ifdef OLD_STRICTNESS + newStrictnessFromOld -- Temporary +#endif + ) where #include "HsVersions.h" -import CoreSyn ( Unfolding, CoreRules ) +import CoreSyn ( Unfolding, CoreRules, IdCoreRule, rulesRules ) import BasicTypes ( Arity ) import Var ( Id, DictId, - isId, mkIdVar, - idName, idType, idUnique, idInfo, - setIdName, setVarType, setIdUnique, + isId, isExportedId, isSpecPragmaId, isLocalId, + idName, idType, idUnique, idInfo, isGlobalId, + setIdName, setVarType, setIdUnique, setIdLocalExported, setIdInfo, lazySetIdInfo, modifyIdInfo, maybeModifyIdInfo, - externallyVisibleId + globalIdDetails, setGlobalIdDetails ) +import qualified Var ( mkLocalId, mkGlobalId, mkSpecPragmaId ) import Type ( Type, typePrimRep, addFreeTyVars, - usOnce, seqType, splitTyConApp_maybe ) + usOnce, eqUsage, seqType, splitTyConApp_maybe ) import IdInfo -import Demand ( Demand ) +import qualified Demand ( Demand ) +import NewDemand ( Demand, StrictSig, topSig, isBottomingSig ) import Name ( Name, OccName, - mkSysLocalName, mkLocalName, - getOccName, isIPOcc + mkSystemName, mkInternalName, + getOccName, getSrcLoc ) -import OccName ( UserFS ) +import OccName ( EncodedFS, UserFS, mkWorkerOcc ) import PrimRep ( PrimRep ) import TysPrim ( statePrimTyCon ) import FieldLabel ( FieldLabel ) +import Maybes ( orElse ) import SrcLoc ( SrcLoc ) -import Unique ( Unique, mkBuiltinUnique, getBuiltinUniques, - getNumBuiltinUniques ) import Outputable +import Unique ( Unique, mkBuiltinUnique ) +-- infixl so you can say (id `set` a `set` b) infixl 1 `setIdUnfolding`, - `setIdArityInfo`, - `setIdDemandInfo`, - `setIdStrictness`, + `setIdArity`, + `setIdNewDemandInfo`, + `setIdNewStrictness`, `setIdTyGenInfo`, `setIdWorkerInfo`, `setIdSpecialisation`, `setInlinePragma`, - `idCafInfo`, - `idCprInfo` - - -- infixl so you can say (id `set` a `set` b) + `idCafInfo` +#ifdef OLD_STRICTNESS + ,`idCprInfo` + ,`setIdStrictness` + ,`setIdDemandInfo` +#endif \end{code} @@ -121,51 +138,64 @@ infixl 1 `setIdUnfolding`, %* * %************************************************************************ -Absolutely all Ids are made by mkId. It - a) Pins free-tyvar-info onto the Id's type, - where it can easily be found. - b) Ensures that exported Ids are +Absolutely all Ids are made by mkId. It is just like Var.mkId, +but in addition it pins free-tyvar-info onto the Id's type, +where it can easily be found. \begin{code} -mkId :: Name -> Type -> IdInfo -> Id -mkId name ty info = mkIdVar name (addFreeTyVars ty) info +mkLocalIdWithInfo :: Name -> Type -> IdInfo -> Id +mkLocalIdWithInfo name ty info = Var.mkLocalId name (addFreeTyVars ty) info + +mkSpecPragmaId :: Name -> Type -> Id +mkSpecPragmaId name ty = Var.mkSpecPragmaId name (addFreeTyVars ty) vanillaIdInfo + +mkGlobalId :: GlobalIdDetails -> Name -> Type -> IdInfo -> Id +mkGlobalId details name ty info = Var.mkGlobalId details name (addFreeTyVars ty) info \end{code} \begin{code} -mkVanillaId :: Name -> Type -> Id -mkVanillaId name ty = mkId name ty vanillaIdInfo +mkLocalId :: Name -> Type -> Id +mkLocalId name ty = mkLocalIdWithInfo name ty vanillaIdInfo -- SysLocal: for an Id being created by the compiler out of thin air... -- UserLocal: an Id with a name the user might recognize... mkUserLocal :: OccName -> Unique -> Type -> SrcLoc -> Id -mkSysLocal :: UserFS -> Unique -> Type -> Id - -mkSysLocal fs uniq ty = mkVanillaId (mkSysLocalName uniq fs) ty -mkUserLocal occ uniq ty loc = mkVanillaId (mkLocalName uniq occ loc) ty +mkSysLocal :: EncodedFS -> Unique -> Type -> Id +mkVanillaGlobal :: Name -> Type -> IdInfo -> Id + +-- for SysLocal, we assume the base name is already encoded, to avoid +-- re-encoding the same string over and over again. +mkSysLocal fs uniq ty = mkLocalId (mkSystemName uniq fs) ty +mkUserLocal occ uniq ty loc = mkLocalId (mkInternalName uniq occ loc) ty +mkVanillaGlobal = mkGlobalId VanillaGlobal \end{code} Make some local @Ids@ for a template @CoreExpr@. These have bogus @Uniques@, but that's OK because the templates are supposed to be instantiated before use. - + \begin{code} -- "Wild Id" typically used when you need a binder that you don't expect to use mkWildId :: Type -> Id -mkWildId ty = mkSysLocal SLIT("wild") (mkBuiltinUnique 1) ty +mkWildId ty = mkSysLocal FSLIT("wild") (mkBuiltinUnique 1) ty + +mkWorkerId :: Unique -> Id -> Type -> Id +-- A worker gets a local name. CoreTidy will externalise it if necessary. +mkWorkerId uniq unwrkr ty + = mkLocalId wkr_name ty + where + wkr_name = mkInternalName uniq (mkWorkerOcc (getOccName unwrkr)) (getSrcLoc unwrkr) -- "Template locals" typically used in unfoldings mkTemplateLocals :: [Type] -> [Id] -mkTemplateLocals tys = zipWith (mkSysLocal SLIT("tpl")) - (getBuiltinUniques (length tys)) - tys +mkTemplateLocals tys = zipWith mkTemplateLocal [1..] tys mkTemplateLocalsNum :: Int -> [Type] -> [Id] -mkTemplateLocalsNum n tys = zipWith (mkSysLocal SLIT("tpl")) - (getNumBuiltinUniques n (length tys)) - tys +-- The Int gives the starting point for unique allocation +mkTemplateLocalsNum n tys = zipWith mkTemplateLocal [n..] tys mkTemplateLocal :: Int -> Type -> Id -mkTemplateLocal i ty = mkSysLocal SLIT("tpl") (mkBuiltinUnique i) ty +mkTemplateLocal i ty = mkSysLocal FSLIT("tpl") (mkBuiltinUnique i) ty \end{code} @@ -191,96 +221,76 @@ idPrimRep id = typePrimRep (idType id) %* * %************************************************************************ -\begin{code} -idFlavour :: Id -> IdFlavour -idFlavour id = flavourInfo (idInfo id) +The @SpecPragmaId@ exists only to make Ids that are +on the *LHS* of bindings created by SPECIALISE pragmas; +eg: s = f Int d +The SpecPragmaId is never itself mentioned; it +exists solely so that the specialiser will find +the call to f, and make specialised version of it. +The SpecPragmaId binding is discarded by the specialiser +when it gathers up overloaded calls. +Meanwhile, it is not discarded as dead code. -setIdNoDiscard :: Id -> Id -setIdNoDiscard id -- Make an Id into a NoDiscardId, unless it is already - = modifyIdInfo setNoDiscardInfo id +\begin{code} recordSelectorFieldLabel :: Id -> FieldLabel -recordSelectorFieldLabel id = case idFlavour id of - RecordSelId lbl -> lbl +recordSelectorFieldLabel id = case globalIdDetails id of + RecordSelId lbl -> lbl -isRecordSelector id = case idFlavour id of +isRecordSelector id = case globalIdDetails id of RecordSelId lbl -> True other -> False -isPrimOpId id = case idFlavour id of +isPrimOpId id = case globalIdDetails id of PrimOpId op -> True other -> False -isPrimOpId_maybe id = case idFlavour id of +isPrimOpId_maybe id = case globalIdDetails id of PrimOpId op -> Just op other -> Nothing -isDataConId id = case idFlavour id of +isFCallId id = case globalIdDetails id of + FCallId call -> True + other -> False + +isFCallId_maybe id = case globalIdDetails id of + FCallId call -> Just call + other -> Nothing + +isDataConId id = case globalIdDetails id of DataConId _ -> True other -> False -isDataConId_maybe id = case idFlavour id of +isDataConId_maybe id = case globalIdDetails id of DataConId con -> Just con other -> Nothing -isDataConWrapId_maybe id = case idFlavour id of +isDataConWrapId_maybe id = case globalIdDetails id of DataConWrapId con -> Just con other -> Nothing -isDataConWrapId id = case idFlavour id of +isDataConWrapId id = case globalIdDetails id of DataConWrapId con -> True other -> False -isSpecPragmaId id = case idFlavour id of - SpecPragmaId -> True - other -> False - -hasNoBinding id = case idFlavour id of - DataConId _ -> True +-- hasNoBinding returns True of an Id which may not have a +-- binding, even though it is defined in this module. +-- Data constructor workers used to be things of this kind, but +-- they aren't any more. Instead, we inject a binding for +-- them at the CorePrep stage. +hasNoBinding id = case globalIdDetails id of PrimOpId _ -> True + FCallId _ -> True other -> False - -- hasNoBinding returns True of an Id which may not have a - -- binding, even though it is defined in this module. Notably, - -- the constructors of a dictionary are in this situation. - -isDictFunId id = case idFlavour id of - DictFunId -> True - other -> False - --- Don't drop a binding for an exported Id, --- if it otherwise looks dead. --- Perhaps a better name would be isDiscardableId -isExportedId :: Id -> Bool -isExportedId id = case idFlavour id of - VanillaId -> False - other -> True - -isLocalId :: Id -> Bool --- True of Ids that are locally defined, but are not constants --- like data constructors, record selectors, and the like. --- See comments with CoreFVs.isLocalVar -isLocalId id -#ifdef DEBUG - | not (isId id) = pprTrace "isLocalid" (ppr id) False - | otherwise -#endif - = case idFlavour id of - VanillaId -> True - ExportedId -> True - SpecPragmaId -> True - other -> False -\end{code} - -isImplicitId tells whether an Id's info is implied by other -declarations, so we don't need to put its signature in an interface -file, even if it's mentioned in some other interface unfolding. - -\begin{code} isImplicitId :: Id -> Bool + -- isImplicitId tells whether an Id's info is implied by other + -- declarations, so we don't need to put its signature in an interface + -- file, even if it's mentioned in some other interface unfolding. isImplicitId id - = case idFlavour id of + = case globalIdDetails id of RecordSelId _ -> True -- Includes dictionary selectors + FCallId _ -> True PrimOpId _ -> True DataConId _ -> True DataConWrapId _ -> True @@ -295,8 +305,6 @@ isImplicitId id isDeadBinder :: Id -> Bool isDeadBinder bndr | isId bndr = isDeadOcc (idOccInfo bndr) | otherwise = False -- TyVars count as not dead - -isIP id = isIPOcc (getOccName id) \end{code} @@ -309,26 +317,37 @@ isIP id = isIPOcc (getOccName id) \begin{code} --------------------------------- -- ARITY -idArityInfo :: Id -> ArityInfo -idArityInfo id = arityInfo (idInfo id) - idArity :: Id -> Arity -idArity id = arityLowerBound (idArityInfo id) +idArity id = arityInfo (idInfo id) -setIdArityInfo :: Id -> ArityInfo -> Id -setIdArityInfo id arity = modifyIdInfo (`setArityInfo` arity) id +setIdArity :: Id -> Arity -> Id +setIdArity id arity = modifyIdInfo (`setArityInfo` arity) id +#ifdef OLD_STRICTNESS --------------------------------- - -- STRICTNESS + -- (OLD) STRICTNESS idStrictness :: Id -> StrictnessInfo idStrictness id = strictnessInfo (idInfo id) setIdStrictness :: Id -> StrictnessInfo -> Id setIdStrictness id strict_info = modifyIdInfo (`setStrictnessInfo` strict_info) id +#endif -- isBottomingId returns true if an application to n args would diverge isBottomingId :: Id -> Bool -isBottomingId id = isBottomingStrictness (idStrictness id) +isBottomingId id = isBottomingSig (idNewStrictness id) + +idNewStrictness_maybe :: Id -> Maybe StrictSig +idNewStrictness :: Id -> StrictSig + +idNewStrictness_maybe id = newStrictnessInfo (idInfo id) +idNewStrictness id = idNewStrictness_maybe id `orElse` topSig + +setIdNewStrictness :: Id -> StrictSig -> Id +setIdNewStrictness id sig = modifyIdInfo (`setNewStrictnessInfo` Just sig) id + +zapIdNewStrictness :: Id -> Id +zapIdNewStrictness id = modifyIdInfo (`setNewStrictnessInfo` Nothing) id --------------------------------- -- TYPE GENERALISATION @@ -354,37 +373,66 @@ idUnfolding id = unfoldingInfo (idInfo id) setIdUnfolding :: Id -> Unfolding -> Id setIdUnfolding id unfolding = modifyIdInfo (`setUnfoldingInfo` unfolding) id +#ifdef OLD_STRICTNESS --------------------------------- - -- DEMAND -idDemandInfo :: Id -> Demand + -- (OLD) DEMAND +idDemandInfo :: Id -> Demand.Demand idDemandInfo id = demandInfo (idInfo id) -setIdDemandInfo :: Id -> Demand -> Id +setIdDemandInfo :: Id -> Demand.Demand -> Id setIdDemandInfo id demand_info = modifyIdInfo (`setDemandInfo` demand_info) id +#endif + +idNewDemandInfo :: Id -> NewDemand.Demand +idNewDemandInfo id = newDemandInfo (idInfo id) + +setIdNewDemandInfo :: Id -> NewDemand.Demand -> Id +setIdNewDemandInfo id dmd = modifyIdInfo (`setNewDemandInfo` dmd) id --------------------------------- -- SPECIALISATION idSpecialisation :: Id -> CoreRules idSpecialisation id = specInfo (idInfo id) +idCoreRules :: Id -> [IdCoreRule] +idCoreRules id = [(id,rule) | rule <- rulesRules (idSpecialisation id)] + setIdSpecialisation :: Id -> CoreRules -> Id setIdSpecialisation id spec_info = modifyIdInfo (`setSpecInfo` spec_info) id --------------------------------- + -- CG INFO +idCgInfo :: Id -> CgInfo +#ifdef OLD_STRICTNESS +idCgInfo id = case cgInfo (idInfo id) of + NoCgInfo -> pprPanic "idCgInfo" (ppr id) + info -> info +#else +idCgInfo id = cgInfo (idInfo id) +#endif + +setIdCgInfo :: Id -> CgInfo -> Id +setIdCgInfo id cg_info = modifyIdInfo (`setCgInfo` cg_info) id + + --------------------------------- -- CAF INFO idCafInfo :: Id -> CafInfo -idCafInfo id = cafInfo (idInfo id) - -setIdCafInfo :: Id -> CafInfo -> Id -setIdCafInfo id caf_info = modifyIdInfo (`setCafInfo` caf_info) id - +#ifdef OLD_STRICTNESS +idCafInfo id = case cgInfo (idInfo id) of + NoCgInfo -> pprPanic "idCafInfo" (ppr id) + info -> cgCafInfo info +#else +idCafInfo id = cgCafInfo (idCgInfo id) +#endif --------------------------------- -- CPR INFO +#ifdef OLD_STRICTNESS idCprInfo :: Id -> CprInfo idCprInfo id = cprInfo (idInfo id) setIdCprInfo :: Id -> CprInfo -> Id setIdCprInfo id cpr_info = modifyIdInfo (`setCprInfo` cpr_info) id +#endif --------------------------------- -- Occcurrence INFO @@ -422,7 +470,7 @@ idLBVarInfo id = lbvarInfo (idInfo id) isOneShotLambda :: Id -> Bool isOneShotLambda id = analysis || hack where analysis = case idLBVarInfo id of - LBVarInfo u | u == usOnce -> True + LBVarInfo u | u `eqUsage` usOnce -> True other -> False hack = case splitTyConApp_maybe (idType id) of Just (tycon,_) | tycon == statePrimTyCon -> True @@ -460,10 +508,9 @@ clearOneShotLambda id \end{code} \begin{code} -zapFragileIdInfo :: Id -> Id -zapFragileIdInfo id = maybeModifyIdInfo zapFragileInfo id - zapLamIdInfo :: Id -> Id zapLamIdInfo id = maybeModifyIdInfo zapLamInfo id + +zapDemandIdInfo id = maybeModifyIdInfo zapDemandInfo id \end{code}