X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcUnify.lhs;h=d7399f5cd3a50a2a92f73f83f06efca882f3f03a;hb=1c9ffbe64003cef8a686ff1e29aae160e314775e;hp=e8365db1c7389cd91060807cba96b28fb0fceb1d;hpb=9e5f0a0f6848dd8234a83d8ff514365aa4717eea;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index e8365db..d7399f5 100644
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -60,6 +60,7 @@ import BasicTypes
 import Util
 import Outputable
 import Unique
+import FastString
 
 import Control.Monad
 \end{code}
@@ -1488,17 +1489,17 @@ uMetaVar outer swapped tv1 BoxTv ref1 ps_ty2 non_var_ty2
 	-- 
 	-- It should not be the case that tv1 occurs in ty2
 	-- (i.e. no occurs check should be needed), but if perchance
-	-- it does, the unbox operation will fill it, and the DEBUG
+	-- it does, the unbox operation will fill it, and the debug code
 	-- checks for that.
-    do 	{ final_ty <- unBox ps_ty2
-#ifdef DEBUG
-	; meta_details <- readMutVar ref1
-	; case meta_details of
-	    Indirect ty -> WARN( True, ppr tv1 <+> ppr ty )
-			   return ()	-- This really should *not* happen
-	    Flexi -> return ()
-#endif
-	; checkUpdateMeta swapped tv1 ref1 final_ty
+    do { final_ty <- unBox ps_ty2
+       ; when debugIsOn $ do
+           { meta_details <- readMutVar ref1
+           ; case meta_details of
+                 Indirect ty -> WARN( True, ppr tv1 <+> ppr ty )
+                                return () -- This really should *not* happen
+                 Flexi -> return ()
+           }
+        ; checkUpdateMeta swapped tv1 ref1 final_ty
         ; return IdCo
         }