X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=d4a050499f45fddce5f38a92e1cc8662a4336583;hb=2f41dd510a893312dfaa0d652f448cc3a045eb88;hp=13c20e758484c7af5922b9fbc7b97f547f9726a2;hpb=42088528ceea9bd88a0caa15e59587d0f593440d;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 13c20e7..d4a0504 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -8,9 +8,7 @@ module Simplify ( simplTopBinds, simplExpr ) where
 
 #include "HsVersions.h"
 
-import DynFlags	( dopt, DynFlag(Opt_D_dump_inlinings),
-			  SimplifierSwitch(..)
-			)
+import DynFlags
 import SimplMonad
 import Type hiding	( substTy, extendTvSubst )
 import SimplEnv	
@@ -361,7 +359,7 @@ simplNonRecX :: SimplEnv
 simplNonRecX env bndr new_rhs
   = do	{ (env, bndr') <- simplBinder env bndr
 	; completeNonRecX env NotTopLevel NonRecursive
-			  (isStrictBndr bndr) bndr bndr' new_rhs }
+			  (isStrictId bndr) bndr bndr' new_rhs }
 
 completeNonRecX :: SimplEnv
 		-> TopLevelFlag -> RecFlag -> Bool
@@ -844,7 +842,7 @@ simplNonRecE env bndr (rhs, rhs_se) (bndrs, body) cont
   = do	{ tick (PreInlineUnconditionally bndr)
 	; simplLam (extendIdSubst env bndr (mkContEx rhs_se rhs)) bndrs body cont }
 
-  | isStrictBndr bndr
+  | isStrictId bndr
   = do	{ simplExprF (rhs_se `setFloats` env) rhs 
 		     (StrictBind bndr bndrs body env cont) }