X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUnfold.lhs;h=ad2a391ec27fedbb89a7f649cfed945b7dea460a;hb=b6cc5851fa49720b31d989d210c8e43dc27cbfe6;hp=169c4ec676b13dfbf6b4596733b746fc091a47c2;hpb=f2dcf256399e9a2de6343c625630b51f8abf4863;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs
index 169c4ec..ad2a391 100644
--- a/compiler/coreSyn/CoreUnfold.lhs
+++ b/compiler/coreSyn/CoreUnfold.lhs
@@ -45,7 +45,7 @@ import Id		( Id, idType, isId,
 import DataCon		( isUnboxedTupleCon )
 import Literal		( litSize )
 import PrimOp		( primOpIsDupable, primOpOutOfLine )
-import IdInfo		( OccInfo(..), GlobalIdDetails(..) )
+import IdInfo		( GlobalIdDetails(..) )
 import Type		( isUnLiftedType )
 import PrelNames	( hasKey, buildIdKey, augmentIdKey )
 import Bag
@@ -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,14 +502,13 @@ StrictAnal.addStrictnessInfoToTopId
 \begin{code}
 callSiteInline :: DynFlags
 	       -> Bool			-- True <=> the Id can be inlined
-	       -> OccInfo
 	       -> Id			-- The Id
 	       -> [Bool]		-- One for each value arg; True if it is interesting
 	       -> Bool			-- True <=> continuation is interesting
 	       -> Maybe CoreExpr	-- Unfolding, if any
 
 
-callSiteInline dflags active_inline occ id arg_infos interesting_cont
+callSiteInline dflags active_inline id arg_infos interesting_cont
   = case idUnfolding id of {
 	NoUnfolding -> Nothing ;
 	OtherCon cs -> Nothing ;
@@ -529,12 +530,8 @@ callSiteInline dflags active_inline occ id arg_infos interesting_cont
 
  	yes_or_no 
 	  | not active_inline = False
-	  | otherwise = case occ of
-				IAmDead		     -> pprTrace "callSiteInline: dead" (ppr id) False
-				IAmALoopBreaker      -> False
-				--OneOcc in_lam _ _    -> (not in_lam || is_cheap) && consider_safe True
-				other		     -> is_cheap && consider_safe False
-		-- we consider even the once-in-one-branch
+	  | otherwise = is_cheap && consider_safe False
+		-- We consider even the once-in-one-branch
 		-- occurrences, because they won't all have been
 		-- caught by preInlineUnconditionally.  In particular,
 		-- if the occurrence is once inside a lambda, and the
@@ -594,7 +591,6 @@ callSiteInline dflags active_inline occ id arg_infos interesting_cont
     if dopt Opt_D_dump_inlinings dflags then
 	pprTrace "Considering inlining"
 		 (ppr id <+> vcat [text "active:" <+> ppr active_inline,
-				   text "occ info:" <+> ppr occ,
 			  	   text "arg infos" <+> ppr arg_infos,
 				   text "interesting continuation" <+> ppr interesting_cont,
 				   text "is value:" <+> ppr is_value,