X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgStackery.lhs;h=bcb59ce032aff27486e55eadfdeea6143c14d5cb;hb=0aa5f6851c493805be58da3798f6ad55b6538cf2;hp=549de5bad1cca035c349d7153cd785cb4d85bb01;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgStackery.lhs b/compiler/codeGen/CgStackery.lhs
index 549de5b..bcb59ce 100644
--- a/compiler/codeGen/CgStackery.lhs
+++ b/compiler/codeGen/CgStackery.lhs
@@ -8,13 +8,6 @@ Stack-twiddling operations, which are pretty low-down and grimy.
 (This is the module that knows all about stack layouts, etc.)
 
 \begin{code}
-{-# OPTIONS_GHC -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/WorkingConventions#Warnings
--- for details
-
 module CgStackery (
 	spRel, getVirtSp, getRealSp, setRealSp,
 	setRealAndVirtualSp, getSpRelOffset,
@@ -38,9 +31,10 @@ import CmmUtils
 import CLabel
 import Constants
 import Util
-import FastString
 import OrdList
 import Outputable
+
+import Control.Monad
 \end{code}
 
 %************************************************************************
@@ -123,7 +117,7 @@ mkVirtStkOffsets init_Sp_offset things
     = loop init_Sp_offset [] (reverse things)
   where
     loop offset offs [] = (offset,offs)
-    loop offset offs ((VoidArg,t):things) = loop offset offs things
+    loop offset offs ((VoidArg,_):things) = loop offset offs things
 	-- ignore Void arguments
     loop offset offs ((rep,t):things)
 	= loop thing_slot ((t,thing_slot):offs) things
@@ -272,15 +266,12 @@ to reflect the frame pushed.
 
 \begin{code}
 pushUpdateFrame :: CmmExpr -> Code -> Code
-
 pushUpdateFrame updatee code
   = do	{
-#ifdef DEBUG
-	  EndOfBlockInfo _ sequel <- getEndOfBlockInfo ;
-	  ASSERT(case sequel of { OnStack -> True; _ -> False})
-#endif
-
-	  allocStackTop (fixedHdrSize + 
+      when debugIsOn $ do
+    	{ EndOfBlockInfo _ sequel <- getEndOfBlockInfo ;
+    	; MASSERT(case sequel of { OnStack -> True; _ -> False}) }
+	; allocStackTop (fixedHdrSize + 
 			   sIZEOF_StgUpdateFrame_NoHdr `quot` wORD_SIZE)
 	; vsp <- getVirtSp
 	; setStackFrame vsp
@@ -303,7 +294,7 @@ emitPushUpdateFrame frame_addr updatee = do
 
 off_updatee :: ByteOff
 off_updatee = fixedHdrSize*wORD_SIZE + oFFSET_StgUpdateFrame_updatee
-\end{code}			
+\end{code}
 
 
 %************************************************************************