Commit da336224 authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Remove doingTickyProfiling

It's now just 'dopt Opt_Ticky'
parent 4f15146c
......@@ -310,8 +310,8 @@ tickyAllocHeap hp
ifTicky :: Code -> Code
ifTicky code = do dflags <- getDynFlags
if doingTickyProfiling dflags then code
else nopC
if dopt Opt_Ticky dflags then code
else nopC
addToMemLbl :: Width -> CLabel -> Int -> CmmStmt
addToMemLbl rep lbl n = addToMem rep (CmmLit (CmmLabel lbl)) n
......
......@@ -689,7 +689,7 @@ getCallMethod _dflags _name _caf (LFThunk _ _ _updatable _std_form_info is_fun)
-- So the right thing to do is just to enter the thing
-- Old version:
-- | updatable || doingTickyProfiling dflags -- to catch double entry
-- | updatable || dopt Opt_Ticky dflags -- to catch double entry
-- = EnterIt
-- | otherwise -- Jump direct to code for single-entry thunks
-- = JumpToIt (thunkEntryLabel name caf std_form_info updatable)
......
......@@ -498,7 +498,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 || doingTickyProfiling dflags -- to catch double entry
| updatable || dopt 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
......
......@@ -332,8 +332,8 @@ tickyAllocHeap hp
ifTicky :: FCode () -> FCode ()
ifTicky code = do dflags <- getDynFlags
if doingTickyProfiling dflags then code
else nopC
if dopt Opt_Ticky dflags then code
else nopC
-- All the ticky-ticky counters are declared "unsigned long" in C
bumpTickyCounter :: FastString -> FCode ()
......
......@@ -84,7 +84,6 @@ module DynFlags (
updOptLevel,
setTmpDir,
setPackageName,
doingTickyProfiling,
-- ** Parsing DynFlags
parseDynamicFlagsCmdLine,
......@@ -855,9 +854,6 @@ isNoLink :: GhcLink -> Bool
isNoLink NoLink = True
isNoLink _ = False
doingTickyProfiling :: DynFlags -> Bool
doingTickyProfiling dflags = dopt Opt_Ticky dflags
data PackageFlag
= ExposePackage String
| ExposePackageId String
......
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