X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplCore.lhs;h=86d3ec0a1e13d22bfdd04665288c314993460446;hb=6084fb5517da34f65034370a3695e2af3b85ce2b;hp=9a4c1eb289a6bf0c3b13161342dc80561b9755c5;hpb=4e94e62917cc4cf5b4711b398f01e1b980cd4a5d;p=ghc-hetmet.git

diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index 9a4c1eb..86d3ec0 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -161,7 +161,7 @@ doCorePass CoreDoWorkerWrapper         = {-# SCC "WorkWrap" #-}      trBindsU ww
 doCorePass CoreDoSpecialising          = {-# SCC "Specialise" #-}    trBindsU specProgram
 doCorePass CoreDoSpecConstr	       = {-# SCC "SpecConstr" #-}    trBindsU specConstrProgram
 doCorePass CoreDoGlomBinds	       = trBinds glomBinds
-doCorePass CoreDoVectorisation         = {-# SCC "Vectorise" #-}     vectorise
+doCorePass (CoreDoVectorisation be)    = {-# SCC "Vectorise" #-}     vectorise be
 doCorePass CoreDoPrintCore	       = observe printCore
 doCorePass (CoreDoRuleCheck phase pat) = ruleCheck phase pat
 doCorePass CoreDoNothing	       = observe (\ _ _ -> return ())
@@ -493,15 +493,13 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 	-- iteration_no is the number of the iteration we are
 	-- about to begin, with '1' for the first
       | iteration_no > max_iterations	-- Stop if we've run out of iterations
-      = do {
-	    when (debugIsOn && (max_iterations > 2)) $
-		    hPutStr stderr ("NOTE: Simplifier still going after " ++ 
-				show max_iterations ++ 
-			    	" iterations; bailing out.  Size = " ++ show (coreBindsSize binds) ++ "\n" )
+      =  WARN(debugIsOn && (max_iterations > 2),
+                text ("Simplifier still going after " ++
+				show max_iterations ++
+			    	" iterations; bailing out.  Size = " ++ show (coreBindsSize binds) ++ "\n" ))
 		-- Subtract 1 from iteration_no to get the
 		-- number of iterations we actually completed
-	    ; return ("Simplifier bailed out", iteration_no - 1, counts, binds)
-	}
+	    return ("Simplifier bailed out", iteration_no - 1, counts, binds)
 
       -- Try and force thunks off the binds; significantly reduces
       -- space usage, especially with -O.  JRS, 000620.