X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUnfold.lhs;h=b6706c14cd71318682b3e8dfaee2bdb0a3b300f4;hp=45b8b927763121dcac331b0d77948af5e0f3501f;hb=444c62505e1e9790db08322fea8625dedd81d446;hpb=8efc5f209899b6e055c5957cd5efbb820ad596ee

diff --git a/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs
index 45b8b92..b6706c1 100644
--- a/compiler/coreSyn/CoreUnfold.lhs
+++ b/compiler/coreSyn/CoreUnfold.lhs
@@ -586,10 +586,13 @@ callSiteInline dflags active_inline id lone_variable arg_infos cont_info
 		  -> True
 
 	  	  | otherwise
-		  -> some_benefit && small_enough
+		  -> some_benefit && small_enough && inline_enough_args
 
 		  where
 		    enough_args	= n_val_args >= n_vals_wanted
+                    inline_enough_args =
+                      not (dopt Opt_InlineIfEnoughArgs dflags) || enough_args
+
 
 		    some_benefit = or arg_infos || really_interesting_cont
 				-- There must be something interesting