projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use addToUFM_Acc where appropriate
[ghc-hetmet.git]
/
compiler
/
codeGen
/
ClosureInfo.lhs
diff --git
a/compiler/codeGen/ClosureInfo.lhs
b/compiler/codeGen/ClosureInfo.lhs
index
bc7dfec
..
18734e1
100644
(file)
--- a/
compiler/codeGen/ClosureInfo.lhs
+++ b/
compiler/codeGen/ClosureInfo.lhs
@@
-72,7
+72,6
@@
import Id
import IdInfo
import DataCon
import Name
import IdInfo
import DataCon
import Name
-import OccName
import Type
import TypeRep
import TcType
import Type
import TypeRep
import TcType
@@
-260,7
+259,7
@@
mkLFReEntrant top fvs args arg_descr
mkLFThunk :: Type -> TopLevelFlag -> [Var] -> UpdateFlag -> LambdaFormInfo
mkLFThunk thunk_ty top fvs upd_flag
mkLFThunk :: Type -> TopLevelFlag -> [Var] -> UpdateFlag -> LambdaFormInfo
mkLFThunk thunk_ty top fvs upd_flag
- = ASSERT( not (isUpdatable upd_flag) || not (isUnLiftedType thunk_ty) )
+ = ASSERT2( not (isUpdatable upd_flag) || not (isUnLiftedType thunk_ty), ppr thunk_ty $$ ppr fvs )
LFThunk top (null fvs)
(isUpdatable upd_flag)
NonStandardThunk
LFThunk top (null fvs)
(isUpdatable upd_flag)
NonStandardThunk
@@
-598,6
+597,10
@@
getCallMethod _ name caf (LFReEntrant _ arity _ _) n_args
| otherwise = DirectEntry (enterIdLabel name caf) arity
getCallMethod _ _ _ (LFCon con) n_args
| otherwise = DirectEntry (enterIdLabel name caf) arity
getCallMethod _ _ _ (LFCon con) n_args
+ | opt_SccProfilingOn -- when profiling, we must always enter
+ = EnterIt -- a closure when we use it, so that the closure
+ -- can be recorded as used for LDV profiling.
+ | otherwise
= ASSERT( n_args == 0 )
ReturnCon con
= ASSERT( n_args == 0 )
ReturnCon con