X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fstranal%2FWwLib.lhs;h=bceb45348779d222735ec2d6cf39fd48fc5ec1ae;hb=eb4427afd02f653087fa3d2720193b625b6411ee;hp=43aabc38957b1a5d800c0e744b38edfe482d03b9;hpb=d95ce839533391e7118257537044f01cbb1d6694;p=ghc-hetmet.git

diff --git a/compiler/stranal/WwLib.lhs b/compiler/stranal/WwLib.lhs
index 43aabc3..bceb453 100644
--- a/compiler/stranal/WwLib.lhs
+++ b/compiler/stranal/WwLib.lhs
@@ -23,7 +23,7 @@ import TysWiredIn	( tupleCon )
 import Type
 import Coercion         ( mkSymCoercion, splitNewTypeRepCo_maybe )
 import BasicTypes	( Boxity(..) )
-import Var              ( Var, isIdVar )
+import Var              ( Var )
 import UniqSupply
 import Unique
 import Util		( zipWithEqual )
@@ -127,15 +127,15 @@ mkWwBodies fun_ty demands res_info one_shots
         -- Don't do CPR if the worker doesn't have any value arguments
         -- Then the worker is just a constant, so we don't want to unbox it.
 	; (wrap_fn_cpr, work_fn_cpr,  _cpr_res_ty)
-	       <- if any isIdVar work_args then
+	       <- if any isId work_args then
 	             mkWWcpr res_ty res_info
 	          else
 	             return (id, id, res_ty)
 
 	; let (work_lam_args, work_call_args) = mkWorkerArgs work_args res_ty
-	; return ([idNewDemandInfo v | v <- work_call_args, isIdVar v],
-              	  wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var,
-              	  mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args) }
+	; return ([idNewDemandInfo v | v <- work_call_args, isId v],
+                  Note InlineMe . wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var,
+                  mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args) }
         -- We use an INLINE unconditionally, even if the wrapper turns out to be
         -- something trivial like
         --      fw = ...
@@ -169,7 +169,7 @@ mkWorkerArgs :: [Var]
 	     -> ([Var],	-- Lambda bound args
 		 [Var])	-- Args at call site
 mkWorkerArgs args res_ty
-    | any isIdVar args || not (isUnLiftedType res_ty)
+    | any isId args || not (isUnLiftedType res_ty)
     = (args, args)
     | otherwise	
     = (args ++ [voidArgId], args ++ [realWorldPrimId])