X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplCore.lhs;h=c7b2e6919f69e02c54c1b23dd1efc7b2e0832202;hb=41676ec859d1332d4c4ec56c9ea8b0aa9cedf606;hp=f2fa70573dfda4dd919ec5ba03d5f266b6c33936;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git

diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index f2fa705..c7b2e69 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -8,7 +8,7 @@
 -- 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/CodingStyle#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module SimplCore ( core2core, simplifyExpr ) where
@@ -29,7 +29,7 @@ import Rules		( RuleBase, emptyRuleBase, mkRuleBase, unionRuleBase,
 import PprCore		( pprCoreBindings, pprCoreExpr, pprRules )
 import OccurAnal	( occurAnalysePgm, occurAnalyseExpr )
 import IdInfo		( setNewStrictnessInfo, newStrictnessInfo, 
-			  setWorkerInfo, workerInfo,
+			  setWorkerInfo, workerInfo, setSpecInfoHead,
 			  setInlinePragInfo, inlinePragInfo,
 			  setSpecInfo, specInfo, specInfoRules )
 import CoreUtils	( coreBindsSize )
@@ -37,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
@@ -157,7 +157,7 @@ doCorePass CoreDoSpecConstr	       = {-# SCC "SpecConstr" #-}    trBindsU specCo
 doCorePass CoreDoGlomBinds	       = trBinds glomBinds
 doCorePass CoreDoVectorisation         = {-# SCC "Vectorise" #-}     vectorise
 doCorePass CoreDoPrintCore	       = observe printCore
-doCorePass (CoreDoRuleCheck phase pat) = observe (ruleCheck phase pat)
+doCorePass (CoreDoRuleCheck phase pat) = ruleCheck phase pat
 doCorePass CoreDoNothing	       = observe (\ _ _ -> return ())
 #ifdef OLD_STRICTNESS		       
 doCorePass CoreDoOldStrictness	       = {-# SCC "OldStrictness" #-} trBinds doOldStrictness
@@ -175,8 +175,11 @@ doOldStrictness dfs binds
 
 printCore _ binds = dumpIfSet True "Print Core" (pprCoreBindings binds)
 
-ruleCheck phase pat dflags binds = do showPass dflags "RuleCheck"
-				      printDump (ruleCheckProgram phase pat binds)
+ruleCheck phase pat hsc_env us rb guts 
+  =  do let dflags = hsc_dflags hsc_env
+	showPass dflags "RuleCheck"
+        printDump (ruleCheckProgram phase pat rb (mg_binds guts))
+	return (zeroSimplCount dflags, guts)
 
 -- Most passes return no stats and don't change rules
 trBinds :: (DynFlags -> [CoreBind] -> IO [CoreBind])
@@ -407,7 +410,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 			 text "",
 			 pprSimplCount counts_out]);
 
-	endPass dflags ("Simplify phase " ++ phase_info ++ " done") Opt_D_verbose_core2core binds';
+	endPass dflags ("Simplify phase " ++ phase_info ++ " done") Opt_D_dump_simpl_phases binds';
 
 	return (counts_out, guts { mg_binds = binds' })
     }
@@ -429,7 +432,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
@@ -497,7 +500,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''
@@ -700,6 +703,9 @@ transferIdInfo exported_id local_id
     transfer exp_info = exp_info `setNewStrictnessInfo` newStrictnessInfo local_info
 				 `setWorkerInfo`        workerInfo local_info
 				 `setInlinePragInfo`	inlinePragInfo local_info
-				 `setSpecInfo`	        addSpecInfo (specInfo exp_info)
-							            (specInfo local_info)
+				 `setSpecInfo`	        addSpecInfo (specInfo exp_info) new_info
+    new_info = setSpecInfoHead (idName exported_id) 
+			       (specInfo local_info)
+	-- Remember to set the function-name field of the
+	-- rules as we transfer them from one function to another
 \end{code}