Commit 7317813a authored by Simon Marlow's avatar Simon Marlow
Browse files

FIX #1472 (also #249, which was not completely fixed previously): -caf-all bugs

parent 8a2809c2
......@@ -136,7 +136,7 @@ stgMassageForProfiling this_pkg mod_name us stg_binds
modl | Just m <- nameModule_maybe (idName binder) = m
| otherwise = mod_name
in
collectCC cc `thenMM_`
collectNewCC cc `thenMM_`
collectCCS ccs `thenMM_`
returnMM ccs
else
......@@ -417,6 +417,14 @@ collectCC cc mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)
else -- must declare it "extern"
((local_ccs, cc : extern_ccs, ccss), ())
-- Version of collectCC used when we definitely want to declare this
-- CC as local, even if its module name is not the same as the current
-- module name (eg. the special :Main module) see bug #249, #1472,
-- test prof001,prof002.
collectNewCC :: CostCentre -> MassageM ()
collectNewCC cc mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)
= ((cc : local_ccs, extern_ccs, ccss), ())
collectCCS :: CostCentreStack -> MassageM ()
collectCCS ccs mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment