X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMkIface.lhs;h=a77ce516bedd746d88191ffbd788dccb33cfaf6f;hb=52eed22df83f01b4fbe3d1c67abc5e3893e47d39;hp=b7917daa56b114acae82c1576d6f9495cfe4e2f6;hpb=3f98dd8e6dbe0c07219e32d19e57d12805c120c0;p=ghc-hetmet.git diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs index b7917da..a77ce51 100644 --- a/ghc/compiler/main/MkIface.lhs +++ b/ghc/compiler/main/MkIface.lhs @@ -15,7 +15,7 @@ import HsSyn import HsCore ( HsIdInfo(..), UfExpr(..), toUfExpr, toUfBndr ) import HsTypes ( toHsTyVars ) import BasicTypes ( Fixity(..), NewOrData(..), - Version, initialVersion, bumpVersion, isLoopBreaker + Version, initialVersion, bumpVersion, ) import RnMonad import RnHsSyn ( RenamedInstDecl, RenamedTyClDecl ) @@ -29,8 +29,8 @@ import HscTypes ( VersionInfo(..), ModIface(..), ModDetails(..), ) import CmdLineOpts -import Id ( Id, idType, idInfo, omitIfaceSigForId, isDictFunId, - idSpecialisation, setIdInfo, isLocalId, idName, hasNoBinding +import Id ( idType, idInfo, isImplicitId, isDictFunId, + idSpecialisation, isLocalId, idName, hasNoBinding ) import Var ( isId ) import VarSet @@ -68,11 +68,10 @@ import IO ( IOMode(..), openFile, hClose ) \begin{code} mkModDetails :: TypeEnv -- From typechecker -> [CoreBind] -- Final bindings - -> [Id] -- Top-level Ids from the code generator; -- they have authoritative arity info -> [IdCoreRule] -- Tidy orphan rules -> ModDetails -mkModDetails type_env tidy_binds stg_ids orphan_rules +mkModDetails type_env tidy_binds orphan_rules = ModDetails { md_types = new_type_env, md_rules = rule_dcls, md_insts = filter isDictFunId final_ids } @@ -99,10 +98,9 @@ mkModDetails type_env tidy_binds stg_ids orphan_rules keep_it (AnId id) = hasNoBinding id keep_it other = True - stg_id_set = mkVarSet stg_ids - final_ids = [addStgInfo stg_id_set id | bind <- tidy_binds - , id <- bindersOf bind - , isGlobalName (idName id)] + final_ids = [id | bind <- tidy_binds + , id <- bindersOf bind + , isGlobalName (idName id)] -- The complete rules are gotten by combining -- a) the orphan rules @@ -125,58 +123,6 @@ mkModDetailsFromIface type_env rules -- All the rules from an interface are of the IfaceRuleOut form \end{code} - -We have to add on the arity and CAF info computed by the code generator -This is also the moment at which we may forget that this function has -a worker: see the comments below - -\begin{code} -addStgInfo :: IdSet -- Ids used at code-gen time; they have better pragma info! - -> Id -> Id -addStgInfo stg_ids id - = id `setIdInfo` final_idinfo - where - idinfo = idInfo id - idinfo' = idinfo `setArityInfo` stg_arity - `setCafInfo` cafInfo stg_idinfo - final_idinfo | worker_ok = idinfo' - | otherwise = idinfo' `setWorkerInfo` NoWorker - - stg_idinfo = case lookupVarSet stg_ids id of - Just id' -> idInfo id' - Nothing -> pprTrace "ifaceBinds not found:" (ppr id) $ - idInfo id - - stg_arity = arityInfo stg_idinfo - - ------------ Worker -------------- - -- We only treat a function as having a worker if - -- the exported arity (which is now the number of visible lambdas) - -- is the same as the arity at the moment of the w/w split - -- If so, we can safely omit the unfolding inside the wrapper, and - -- instead re-generate it from the type/arity/strictness info - -- But if the arity has changed, we just take the simple path and - -- put the unfolding into the interface file, forgetting the fact - -- that it's a wrapper. - -- - -- How can this happen? Sometimes we get - -- f = coerce t (\x y -> $wf x y) - -- at the moment of w/w split; but the eta reducer turns it into - -- f = coerce t $wf - -- which is perfectly fine except that the exposed arity so far as - -- the code generator is concerned (zero) differs from the arity - -- when we did the split (2). - -- - -- All this arises because we use 'arity' to mean "exactly how many - -- top level lambdas are there" in interface files; but during the - -- compilation of this module it means "how many things can I apply - -- this to". - worker_ok = case workerInfo idinfo of - NoWorker -> True - HasWorker work_id wrap_arity -> wrap_arity == arityLowerBound stg_arity -\end{code} - - \begin{code} getRules :: [IdCoreRule] -- Orphan rules -> [CoreBind] -- Bindings, with rules in the top-level Ids @@ -292,7 +238,7 @@ ifaceTyCls (ATyCon tycon) so_far | otherwise = DataType ifaceConDecl data_con - = ConDecl (getName data_con) (error "ifaceConDecl") + = ConDecl (getName data_con) (getName (dataConId data_con)) (toHsTyVars ex_tyvars) (toHsContext ex_theta) details noSrcLoc @@ -315,8 +261,8 @@ ifaceTyCls (ATyCon tycon) so_far = ([getName field_label], mk_bang_ty strict_mark (fieldLabelType field_label)) ifaceTyCls (AnId id) so_far - | omitIfaceSigForId id = so_far - | otherwise = iface_sig : so_far + | isImplicitId id = so_far + | otherwise = iface_sig : so_far where iface_sig = IfaceSig { tcdName = getName id, tcdType = toHsType id_type, @@ -350,7 +296,6 @@ ifaceTyCls (AnId id) so_far NoStrictnessInfo -> [] info -> [HsStrictness info] - ------------ Worker -------------- work_info = workerInfo id_info has_worker = case work_info of { HasWorker _ _ -> True; other -> False } @@ -417,11 +362,13 @@ addVersionInfo Nothing new_iface -- No old interface, so definitely write a new one! = (new_iface, Just (text "No old interface available")) -addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, - mi_decls = old_decls, - mi_fixities = old_fixities })) - new_iface@(ModIface { mi_decls = new_decls, - mi_fixities = new_fixities }) +addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, + mi_decls = old_decls, + mi_fixities = old_fixities, + mi_deprecs = old_deprecs })) + new_iface@(ModIface { mi_decls = new_decls, + mi_fixities = new_fixities, + mi_deprecs = new_deprecs }) | no_output_change && no_usage_change = (new_iface, Nothing) @@ -429,8 +376,8 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, -- mi_globals field set to anything reasonable. | otherwise -- Add updated version numbers - = pprTrace "completeIface" (ppr (dcl_tycl old_decls)) - (final_iface, Just pp_tc_diffs) + = --pprTrace "completeIface" (ppr (dcl_tycl old_decls)) + (final_iface, Just pp_diffs) where final_iface = new_iface { mi_version = new_version } @@ -439,11 +386,12 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, vers_rules = bumpVersion no_rule_change (vers_rules old_version), vers_decls = tc_vers } - no_output_change = no_tc_change && no_rule_change && no_export_change + no_output_change = no_tc_change && no_rule_change && no_export_change && no_deprec_change no_usage_change = mi_usages old_iface == mi_usages new_iface no_export_change = mi_exports old_iface == mi_exports new_iface -- Kept sorted no_rule_change = dcl_rules old_decls == dcl_rules new_decls -- Ditto + no_deprec_change = old_deprecs == new_deprecs -- Fill in the version number on the new declarations by looking at the old declarations. -- Set the flag if anything changes. @@ -451,8 +399,13 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, old_vers_decls = vers_decls old_version (no_tc_change, pp_tc_diffs, tc_vers) = diffDecls old_vers_decls old_fixities new_fixities (dcl_tycl old_decls) (dcl_tycl new_decls) - - + pp_diffs = vcat [pp_tc_diffs, + pp_change no_export_change "Export list", + pp_change no_rule_change "Rules", + pp_change no_deprec_change "Deprecations", + pp_change no_usage_change "Usages"] + pp_change True what = empty + pp_change False what = text what <+> ptext SLIT("changed") diffDecls :: NameEnv Version -- Old version map -> NameEnv Fixity -> NameEnv Fixity -- Old and new fixities @@ -484,10 +437,10 @@ diffDecls old_vers old_fixities new_fixities old new new_vers' = extendNameEnv new_vers nd_name (bumpVersion False (lookupNameEnv_NF old_vers od_name)) - only_old d = ptext SLIT("Only in old iface:") <+> ppr d - only_new d = ptext SLIT("Only in new iface:") <+> ppr d - changed d nd = ptext SLIT("Changed in iface: ") <+> ((ptext SLIT("Old:") <+> ppr d) $$ - (ptext SLIT("New:") <+> ppr nd)) + only_old d = ptext SLIT("Only in old iface:") <+> ppr d + only_new d = ptext SLIT("Only in new iface:") <+> ppr d + changed od nd = ptext SLIT("Changed in iface: ") <+> ((ptext SLIT("Old:") <+> ppr od) $$ + (ptext SLIT("New:") <+> ppr nd)) \end{code}