diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-16 15:28:26 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-16 16:08:38 +0100 |
| commit | cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5 (patch) | |
| tree | 30fb18578f1c5c81fef7ccc6ec5879a41fd4e5c0 /compiler/codeGen/StgCmmClosure.hs | |
| parent | 6759e5a482d927870c90efe97b820d492785a6fd (diff) | |
| download | haskell-cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5.tar.gz | |
Some alpha renaming
Mostly d -> g (matching DynFlag -> GeneralFlag).
Also renamed if* to when*, matching the Haskell if/when names
Diffstat (limited to 'compiler/codeGen/StgCmmClosure.hs')
| -rw-r--r-- | compiler/codeGen/StgCmmClosure.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index f865c37ad8..e4c42d203d 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -400,7 +400,7 @@ nodeMustPointToIt _ (LFCon _) = True -- 27/11/92. nodeMustPointToIt dflags (LFThunk _ no_fvs updatable NonStandardThunk _) - = updatable || not no_fvs || dopt Opt_SccProfilingOn dflags + = updatable || not no_fvs || gopt Opt_SccProfilingOn dflags -- For the non-updatable (single-entry case): -- -- True if has fvs (in which case we need access to them, and we @@ -472,7 +472,7 @@ getCallMethod :: DynFlags -> CallMethod getCallMethod dflags _name _ lf_info _n_args - | nodeMustPointToIt dflags lf_info && dopt Opt_Parallel dflags + | nodeMustPointToIt dflags lf_info && gopt Opt_Parallel dflags = -- If we're parallel, then we must always enter via node. -- The reason is that the closure may have been -- fetched since we allocated it. @@ -496,7 +496,7 @@ getCallMethod dflags name caf (LFThunk _ _ updatable std_form_info is_fun) n_arg -- is the fast-entry code] -- Since is_fun is False, we are *definitely* looking at a data value - | updatable || dopt Opt_Ticky dflags -- to catch double entry + | updatable || gopt Opt_Ticky dflags -- to catch double entry {- OLD: || opt_SMP I decided to remove this, because in SMP mode it doesn't matter if we enter the same thunk multiple times, so the optimisation @@ -852,7 +852,7 @@ enterIdLabel dflags id c mkProfilingInfo :: DynFlags -> Id -> String -> ProfilingInfo mkProfilingInfo dflags id val_descr - | not (dopt Opt_SccProfilingOn dflags) = NoProfilingInfo + | not (gopt Opt_SccProfilingOn dflags) = NoProfilingInfo | otherwise = ProfilingInfo ty_descr_w8 val_descr_w8 where ty_descr_w8 = stringToWord8s (getTyDescription (idType id)) @@ -899,7 +899,7 @@ mkDataConInfoTable dflags data_con is_static ptr_wds nonptr_wds cl_type = Constr (dataConTagZ data_con) (dataConIdentity data_con) - prof | not (dopt Opt_SccProfilingOn dflags) = NoProfilingInfo + prof | not (gopt Opt_SccProfilingOn dflags) = NoProfilingInfo | otherwise = ProfilingInfo ty_descr val_descr ty_descr = stringToWord8s $ occNameString $ getOccName $ dataConTyCon data_con |