X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=d8f9506b23c0c42fb20ca431ad52ea333fce8f85;hb=1dc5c28c2370cc8254f024c5734f76d7e5827cd6;hp=329d32639851725e67c561658cb3056a716e52e8;hpb=a2c92cccbdfdf295901e6c367c35bd4b2b0288e0;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 329d326..d8f9506 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -869,9 +869,6 @@ simplNote env (SCC cc) e cont
   = simplExpr (setEnclosingCC env currentCCS) e 	`thenSmpl` \ e' ->
     rebuild env (mkSCC cc e') cont
 
-simplNote env InlineCall e cont
-  = simplExprF env e (InlinePlease cont)
-
 -- See notes with SimplMonad.inlineMode
 simplNote env InlineMe e cont
   | contIsRhsOrArg cont		-- Totally boring continuation; see notes above
@@ -919,9 +916,9 @@ completeCall env var occ_info cont
   =     -- Simplify the arguments
     getDOptsSmpl					`thenSmpl` \ dflags ->
     let
-	chkr			       = getSwitchChecker env
-	(args, call_cont, inline_call) = getContArgs chkr var cont
-	fn_ty			       = idType var
+	chkr		  = getSwitchChecker env
+	(args, call_cont) = getContArgs chkr var cont
+	fn_ty		  = idType var
     in
     simplifyArgs env fn_ty (interestingArgContext var call_cont) args 
 		 (contResultType call_cont)	$ \ env args ->
@@ -981,7 +978,7 @@ completeCall env var occ_info cont
 						  (notNull arg_infos)
 						  call_cont
     	active_inline = activeInline env var occ_info
-	maybe_inline  = callSiteInline dflags active_inline inline_call occ_info
+	maybe_inline  = callSiteInline dflags active_inline occ_info
 				       var arg_infos interesting_cont
     in
     case maybe_inline of {
@@ -1255,7 +1252,6 @@ rebuild :: SimplEnv -> OutExpr -> SimplCont -> SimplM FloatsWithExpr
 rebuild env expr (Stop _ _ _)		      = rebuildDone env expr
 rebuild env expr (ArgOf _ _ _ cont_fn)	      = cont_fn env expr
 rebuild env expr (CoerceIt to_ty cont)	      = rebuild env (mkCoerce to_ty expr) cont
-rebuild env expr (InlinePlease cont) 	      = rebuild env (Note InlineCall expr) cont
 rebuild env expr (Select _ bndr alts se cont) = rebuildCase (setInScope se env) expr bndr alts cont
 rebuild env expr (ApplyTo _ arg se cont)      = rebuildApp  (setInScope se env) expr arg cont
 
@@ -1806,10 +1802,6 @@ mkDupableCont env (CoerceIt ty cont)
   = mkDupableCont env cont		`thenSmpl` \ (floats, (dup_cont, nondup_cont)) ->
     returnSmpl (floats, (CoerceIt ty dup_cont, nondup_cont))
 
-mkDupableCont env (InlinePlease cont)
-  = mkDupableCont env cont		`thenSmpl` \ (floats, (dup_cont, nondup_cont)) ->
-    returnSmpl (floats, (InlinePlease dup_cont, nondup_cont))
-
 mkDupableCont env cont@(ArgOf _ arg_ty _ _)
   =  returnSmpl (emptyFloats env, (mkBoringStop arg_ty, cont))
   	-- Do *not* duplicate an ArgOf continuation