X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUnfold.lhs;h=68495105dc8b08922044dbbd34ad865c5d5ce35b;hb=1525a5819aa3a6eae8d8b05cfe348a2384da0c84;hp=e50f304f30cd7d9adcd9ee8a81ce828d0f006b99;hpb=7739836e374122a93d3af924d67cf93f8e237baf;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs
index e50f304..6849510 100644
--- a/compiler/coreSyn/CoreUnfold.lhs
+++ b/compiler/coreSyn/CoreUnfold.lhs
@@ -200,6 +200,8 @@ sizeExpr bOMB_OUT_SIZE top_args expr
 	-- then we'll get a dfun which is a pair of two INLINE lambdas
 
     size_up (Note _        body) = size_up body	-- Other notes cost nothing
+    
+    size_up (Cast e _)           = size_up e
 
     size_up (App fun (Type t)) = size_up fun
     size_up (App fun arg)      = size_up_app fun [arg]
@@ -500,7 +502,6 @@ StrictAnal.addStrictnessInfoToTopId
 \begin{code}
 callSiteInline :: DynFlags
 	       -> Bool			-- True <=> the Id can be inlined
-	       -> Bool			-- 'inline' note at call site
 	       -> OccInfo
 	       -> Id			-- The Id
 	       -> [Bool]		-- One for each value arg; True if it is interesting
@@ -508,7 +509,7 @@ callSiteInline :: DynFlags
 	       -> Maybe CoreExpr	-- Unfolding, if any
 
 
-callSiteInline dflags active_inline inline_call occ id arg_infos interesting_cont
+callSiteInline dflags active_inline occ id arg_infos interesting_cont
   = case idUnfolding id of {
 	NoUnfolding -> Nothing ;
 	OtherCon cs -> Nothing ;
@@ -547,9 +548,6 @@ callSiteInline dflags active_inline inline_call occ id arg_infos interesting_con
 		-- consider_safe decides whether it's a good idea to
 		-- inline something, given that there's no
 		-- work-duplication issue (the caller checks that).
-	  | inline_call  = True
-
-	  | otherwise
 	  = case guidance of
 	      UnfoldNever  -> False
 	      UnfoldIfGoodArgs n_vals_wanted arg_discounts size res_discount