X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fruntime%2Fmain%2FStgUpdate.lhc;h=04d2a5c96bc9d4e5d8b1b04b59d9c6b2587bf1c7;hp=5a229ecdb68cd1e105dd9b43cb0b705b311ea654;hb=5eb1c77c795f92ed0f4c8023847e9d4be1a4fd0d;hpb=769ce8e72ae626356ce57162b7ff448c0ef7e700 diff --git a/ghc/runtime/main/StgUpdate.lhc b/ghc/runtime/main/StgUpdate.lhc index 5a229ec..04d2a5c 100644 --- a/ghc/runtime/main/StgUpdate.lhc +++ b/ghc/runtime/main/StgUpdate.lhc @@ -391,7 +391,7 @@ STGFUN(Perm_Ind_entry) /* Don't add INDs to granularity cost */ - /* Dont: ENT_IND(Node); for ticky-ticky; this ind is here only to help ticky */ + /* Dont: ENT_IND(Node); for ticky-ticky; this ind is here only to help profiling */ /* Enter PAP cost centre -- lexical scoping only */ ENTER_CC_PAP_CL(Node); @@ -479,7 +479,7 @@ STGFUN(UpdatePAP) /* set "CC_pap" to go in the updatee (see Sansom thesis, p 183) */ CC_pap /*really cc_enter*/ = (CostCentre) CC_HDR(Node); - if (IS_SUBSUMED_CC(CC_pap) /*really cc_enter*/) + if (IS_CAF_OR_DICT_OR_SUB_CC(CC_pap) /*really cc_enter*/) CC_pap = CCC; #endif @@ -572,7 +572,7 @@ STGFUN(UpdatePAP) * Take the CC out of the update frame if a CAF/DICT. */ - CCC = (IS_CAF_OR_DICT_CC(CC_pap)) ? GRAB_COST_CENTRE(SuB) : CC_pap; + CCC = (IS_CAF_OR_DICT_OR_SUB_CC(CC_pap)) ? GRAB_COST_CENTRE(SuB) : CC_pap; #endif /* PROFILING */ @@ -658,7 +658,7 @@ STGFUN(PAP_entry) */ CC_pap = (CostCentre) CC_HDR(Node); - CCC = (IS_CAF_OR_DICT_CC(CC_pap)) ? GRAB_COST_CENTRE(SuB) : CC_pap; + CCC = (IS_CAF_OR_DICT_OR_SUB_CC(CC_pap)) ? GRAB_COST_CENTRE(SuB) : CC_pap; #endif /* PROFILING */