Rewrite CorePrep and improve eta expansion

[ghc-hetmet.git] / compiler / stranal / WorkWrap.lhs

diff --git a/compiler/stranal/WorkWrap.lhs b/compiler/stranal/WorkWrap.lhs
index 5143eea..71f9ef8 100644 (file)
--- a/compiler/stranal/WorkWrap.lhs
+++ b/compiler/stranal/WorkWrap.lhs
@@ -10,7 +10,8 @@ module WorkWrap ( wwTopBinds, mkWrapper ) where
 
 import CoreSyn
 import CoreUnfold      ( certainlyWillInline )
-import CoreUtils       ( exprType, exprIsHNF, exprArity )
+import CoreUtils       ( exprType, exprIsHNF )
+import CoreArity       ( exprArity )
 import Var
 import Id              ( Id, idType, isOneShotLambda, 
                          setIdNewStrictness, mkWorkerId,
@@ -283,7 +284,7 @@ splitFun fn_id fn_info wrap_dmds res_info inline_prag rhs
 -- which is very annoying.
 get_one_shots :: Expr Var -> [Bool]
 get_one_shots (Lam b e)
-  | isIdVar b = isOneShotLambda b : get_one_shots e
+  | isId b    = isOneShotLambda b : get_one_shots e
   | otherwise = get_one_shots e
 get_one_shots (Note _ e) = get_one_shots e
 get_one_shots _         = noOneShotInfo