X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=45cda3856f130f3d4ab14400059d512a52caba18;hb=522c8ebea4546658b4a5ee6727a0cab64fd72e8b;hp=80aa89a9ade01edf4bf77d5e144f4868d5cad6c0;hpb=a35f75aa20bf0a329be0b782986c3e12155b4d49;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 80aa89a..45cda38 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -370,7 +370,6 @@ completeNonRecX env is_strict old_bndr new_bndr new_rhs thing_inside
   | otherwise
   = 	-- Make the arguments atomic if necessary, 
 	-- adding suitable bindings
-    -- pprTrace "completeNonRecX" (ppr new_bndr <+> ppr new_rhs) $
     mkAtomicArgsE env is_strict new_rhs		$ \ env new_rhs ->
     completeLazyBind env NotTopLevel
 		     old_bndr new_bndr new_rhs	`thenSmpl` \ (floats, env) ->
@@ -927,7 +926,7 @@ simplVar env var cont
   = case substId env var of
 	DoneEx e	 -> simplExprF (zapSubstEnv env) e cont
 	ContEx tvs ids e -> simplExprF (setSubstEnv env tvs ids) e cont
-	DoneId var1 occ  -> completeCall (zapSubstEnv env) var1 occ cont
+	DoneId var1      -> completeCall (zapSubstEnv env) var1 cont
 		-- Note [zapSubstEnv]
 		-- The template is already simplified, so don't re-substitute.
 		-- This is VITAL.  Consider
@@ -941,7 +940,7 @@ simplVar env var cont
 ---------------------------------------------------------
 --	Dealing with a call site
 
-completeCall env var occ_info cont
+completeCall env var cont
   =     -- Simplify the arguments
     getDOptsSmpl					`thenSmpl` \ dflags ->
     let
@@ -1006,8 +1005,8 @@ completeCall env var occ_info cont
 	interesting_cont = interestingCallContext (notNull args)
 						  (notNull arg_infos)
 						  call_cont
-    	active_inline = activeInline env var occ_info
-	maybe_inline  = callSiteInline dflags active_inline occ_info
+    	active_inline = activeInline env var
+	maybe_inline  = callSiteInline dflags active_inline
 				       var arg_infos interesting_cont
     in
     case maybe_inline of {