X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplCore.lhs;h=744d54b25c8e01906155537561cc57d342a5fad0;hb=62f6cc1dec4223532fbd15de64db4fb036932944;hp=2770784e260fe003387042aeb34e1f8648432739;hpb=9ec880fcb29ff038bcc72d78bbe2fd6933566047;p=ghc-hetmet.git

diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index 2770784..744d54b 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -4,6 +4,13 @@
 \section[SimplCore]{Driver for simplifying @Core@ programs}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module SimplCore ( core2core, simplifyExpr ) where
 
 #include "HsVersions.h"
@@ -30,7 +37,7 @@ import Simplify		( simplTopBinds, simplExpr )
 import SimplEnv		( SimplEnv, simplBinders, mkSimplEnv, setInScopeSet )
 import SimplMonad
 import ErrUtils		( dumpIfSet, dumpIfSet_dyn, showPass )
-import CoreLint		( endPass )
+import CoreLint		( endPass, endIteration )
 import FloatIn		( floatInwards )
 import FloatOut		( floatOutwards )
 import FamInstEnv
@@ -422,7 +429,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 	    if  max_iterations > 2 then
 		hPutStr stderr ("NOTE: Simplifier still going after " ++ 
 				show max_iterations ++ 
-			    	" iterations; bailing out.\n")
+			    	" iterations; bailing out.  Size = " ++ show (coreBindsSize binds) ++ "\n" )
 	    else 
 		return ();
 #endif
@@ -490,7 +497,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 		-- Dump the result of this iteration
 	   dumpIfSet_dyn dflags Opt_D_dump_simpl_iterations herald
 		         (pprSimplCount counts') ;
-	   endPass dflags herald Opt_D_dump_simpl_iterations binds'' ;
+	   endIteration dflags herald Opt_D_dump_simpl_iterations binds'' ;
 
 		-- Loop
   	   do_iteration us2 (iteration_no + 1) all_counts binds''