X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=be6eba32587592f60d502eaa9af9587faee77f04;hb=925cfa7c7e46494ff5c579214b6f2e4b840eb5b2;hp=e73d0ac13109bd4bb7b9031729d671a3100b5918;hpb=446ecae3c65cc4d166f9008e60190ffe70530654;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index e73d0ac..be6eba3 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -1025,7 +1025,7 @@ completeCall env var cont
 	    Just unfolding  	-- There is an inlining!
 	      ->  do { tick (UnfoldingDone var)
 		     ; (if dopt Opt_D_dump_inlinings dflags then
-			   pprTrace "Inlining done" (vcat [
+			   pprTrace ("Inlining done" ++ showSDoc (ppr var)) (vcat [
 				text "Before:" <+> ppr var <+> sep (map pprParendExpr args),
 				text "Inlined fn: " <+> nest 2 (ppr unfolding),
 				text "Cont:  " <+> ppr call_cont])
@@ -1680,25 +1680,27 @@ knownAlt env scrut args bndr (DataAlt dc, bs, rhs) cont
 	; env <- simplNonRecX env bndr bndr_rhs
 	; -- pprTrace "knownCon2" (ppr bs $$ ppr rhs $$ ppr (seIdSubst env)) $
 	  simplExprF env rhs cont }
-
--- Ugh!
-bind_args env dead_bndr [] _  = return env
-
-bind_args env dead_bndr (b:bs) (Type ty : args)
-  = ASSERT( isTyVar b )
-    bind_args (extendTvSubst env b ty) dead_bndr bs args
-    
-bind_args env dead_bndr (b:bs) (arg : args)
-  = ASSERT( isId b )
-    do	{ let b' = if dead_bndr then b else zapOccInfo b
-		-- Note that the binder might be "dead", because it doesn't occur 
-		-- in the RHS; and simplNonRecX may therefore discard it via postInlineUnconditionally
-		-- Nevertheless we must keep it if the case-binder is alive, because it may
-		-- be used in the con_app.  See Note [zapOccInfo]
-	; env <- simplNonRecX env b' arg
-	; bind_args env dead_bndr bs args }
-
-bind_args _ _ _ _ = panic "bind_args"
+  where
+    -- Ugh!
+    bind_args env dead_bndr [] _  = return env
+
+    bind_args env dead_bndr (b:bs) (Type ty : args)
+      = ASSERT( isTyVar b )
+        bind_args (extendTvSubst env b ty) dead_bndr bs args
+
+    bind_args env dead_bndr (b:bs) (arg : args)
+      = ASSERT( isId b )
+        do	{ let b' = if dead_bndr then b else zapOccInfo b
+                    -- Note that the binder might be "dead", because it doesn't occur 
+                    -- in the RHS; and simplNonRecX may therefore discard it via postInlineUnconditionally
+                    -- Nevertheless we must keep it if the case-binder is alive, because it may
+                    -- be used in the con_app.  See Note [zapOccInfo]
+            ; env <- simplNonRecX env b' arg
+            ; bind_args env dead_bndr bs args }
+
+    bind_args _ _ _ _ = 
+      pprPanic "bind_args" $ ppr dc $$ ppr bs $$ ppr args $$ 
+                             text "scrut:" <+> ppr scrut
 \end{code}