X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FstgSyn%2FStgSyn.lhs;h=f1c50cc8fd017d2a8e67dc56e4fafdaa99b36af1;hb=0f800dc9f3dc695cd06d0fdd7799a52c37241752;hp=75f6a94eec7b2ed3120abd5ed01f05168eeaee83;hpb=853e20a3eb86137cdb8accf69c6caa9db83a3d34;p=ghc-hetmet.git diff --git a/ghc/compiler/stgSyn/StgSyn.lhs b/ghc/compiler/stgSyn/StgSyn.lhs index 75f6a94..f1c50cc 100644 --- a/ghc/compiler/stgSyn/StgSyn.lhs +++ b/ghc/compiler/stgSyn/StgSyn.lhs @@ -66,6 +66,7 @@ import UniqSet ( isEmptyUniqSet, uniqSetToList, UniqSet ) import Unique ( Unique ) import Bitmap import DynFlags ( DynFlags ) +import Packages ( HomeModules ) import StaticFlags ( opt_SccProfilingOn ) \end{code} @@ -105,18 +106,18 @@ data GenStgArg occ isStgTypeArg (StgTypeArg _) = True isStgTypeArg other = False -isDllArg :: DynFlags -> StgArg -> Bool +isDllArg :: HomeModules -> StgArg -> Bool -- Does this argument refer to something in a different DLL? -isDllArg dflags (StgTypeArg v) = False -isDllArg dflags (StgVarArg v) = isDllName dflags (idName v) -isDllArg dflags (StgLitArg lit) = False +isDllArg hmods (StgTypeArg v) = False +isDllArg hmods (StgVarArg v) = isDllName hmods (idName v) +isDllArg hmods (StgLitArg lit) = False -isDllConApp :: DynFlags -> DataCon -> [StgArg] -> Bool +isDllConApp :: HomeModules -> DataCon -> [StgArg] -> Bool -- Does this constructor application refer to -- anything in a different DLL? -- If so, we can't allocate it statically -isDllConApp dflags con args - = isDllName dflags (dataConName con) || any (isDllArg dflags) args +isDllConApp hmods con args + = isDllName hmods (dataConName con) || any (isDllArg hmods) args stgArgType :: StgArg -> Type -- Very half baked becase we have lost the type arguments