X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=0eab695dc6feeb9236d9fd1359c8d06629a55dd9;hb=f2aaae9757e7532485c97f6c9a9ed5437542d1dd;hp=c50251d0fb6901994edd93095f1a7858537cfa30;hpb=344562443cc0165c171c1bb28fb810f0513cd824;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index c50251d..0eab695 100644
--- a/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
@@ -69,7 +69,6 @@ import CostCentre
 import Unique
 import Outputable
 import TysPrim
-import PrelNames( absentErrorIdKey )
 import FastString
 import Maybes
 import Util
@@ -482,7 +481,10 @@ exprIsDupable e
     decrement n = Just (n-1)
 
 dupAppSize :: Int
-dupAppSize = 6	 -- Size of term we are prepared to duplicate
+dupAppSize = 8	 -- Size of term we are prepared to duplicate
+	         -- This is *just* big enough to make test MethSharing
+		 -- inline enough join points.  Really it should be
+		 -- smaller, and could be if we fixed Trac #4960.
 \end{code}
 
 %************************************************************************
@@ -564,6 +566,7 @@ exprIsCheap' good_app other_expr 	-- Applications and variables
   = go other_expr []
   where
 	-- Accumulate value arguments, then decide
+    go (Cast e _) val_args                 = go e val_args
     go (App f a) val_args | isRuntimeArg a = go f (a:val_args)
 			  | otherwise      = go f val_args
 
@@ -699,10 +702,7 @@ exprOkForSpeculation (Case e _ _ alts)
 
 exprOkForSpeculation other_expr
   = case collectArgs other_expr of
-	(Var f, args) | f `hasKey` absentErrorIdKey	-- Note [Absent error Id]
-                      -> all exprOkForSpeculation args  --    in WwLib
-                      | otherwise 
-                      -> spec_ok (idDetails f) args
+	(Var f, args) -> spec_ok (idDetails f) args
         _             -> False
  
   where