X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=c8c922e725fe931c482a3ffae24402d70b91ae9a;hp=e73734888543787080770838f00c42f357e00b0c;hb=5edf58c10a0144fa8b328e18d0b7fffec2319424;hpb=e1231b2bcb1c9294c2ecdf150e9aad72a0caa253

diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index e737348..c8c922e 100644
--- a/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
@@ -46,7 +46,6 @@ import Var		( Var )
 import VarSet		( unionVarSet )
 import VarEnv
 import Name		( hashName )
-import Packages		( HomeModules )
 #if mingw32_TARGET_OS
 import Packages		( isDllName )
 #endif
@@ -72,6 +71,7 @@ import TyCon		( tyConArity )
 import TysWiredIn	( boolTy, trueDataCon, falseDataCon )
 import CostCentre	( CostCentre )
 import BasicTypes	( Arity )
+import PackageConfig	( PackageId )
 import Unique		( Unique )
 import Outputable
 import DynFlags		( DynFlags, DynFlag(Opt_DictsCheap), dopt )
@@ -1223,7 +1223,7 @@ If this happens we simply make the RHS into an updatable thunk,
 and 'exectute' it rather than allocating it statically.
 
 \begin{code}
-rhsIsStatic :: HomeModules -> CoreExpr -> Bool
+rhsIsStatic :: PackageId -> CoreExpr -> Bool
 -- This function is called only on *top-level* right-hand sides
 -- Returns True if the RHS can be allocated statically, with
 -- no thunks involved at all.
@@ -1284,7 +1284,7 @@ rhsIsStatic :: HomeModules -> CoreExpr -> Bool
 -- When opt_RuntimeTypes is on, we keep type lambdas and treat
 -- them as making the RHS re-entrant (non-updatable).
 
-rhsIsStatic hmods rhs = is_static False rhs
+rhsIsStatic this_pkg rhs = is_static False rhs
   where
   is_static :: Bool	-- True <=> in a constructor argument; must be atomic
   	  -> CoreExpr -> Bool
@@ -1311,7 +1311,7 @@ rhsIsStatic hmods rhs = is_static False rhs
    where
     go (Var f) n_val_args
 #if mingw32_TARGET_OS
-        | not (isDllName hmods (idName f))
+        | not (isDllName this_pkg (idName f))
 #endif
 	=  saturated_data_con f n_val_args
 	|| (in_arg && n_val_args == 0)