X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FTcIface.lhs;h=adde9fb080b721ea8dea849372022d3c989281cb;hp=1e8d1caaa1d9e2943ed713d9d83489d7229c4529;hb=11c7f334d1b98effdd62cd1fb93ca984338b3de3;hpb=bab1903ec60117017d8dcb7df276bcc2300a295b

diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 1e8d1ca..adde9fb 100644
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -50,13 +50,14 @@ import Name
 import NameEnv
 import OccName
 import Module
-import UniqFM
+import LazyUniqFM
 import UniqSupply
 import Outputable	
 import ErrUtils
 import Maybes
 import SrcLoc
 import DynFlags
+import Util
 import Control.Monad
 
 import Data.List
@@ -423,7 +424,7 @@ tcIfaceDecl ignore_prags
     ; fds  <- mapM tc_fd rdr_fds
     ; ats' <- mapM (tcIfaceDecl ignore_prags) rdr_ats
     ; let ats = zipWith setTyThingPoss ats' (map ifTyVars rdr_ats)
-    ; cls  <- buildClass cls_name tyvars ctxt fds ats sigs tc_isrec
+    ; cls  <- buildClass ignore_prags cls_name tyvars ctxt fds ats sigs tc_isrec
     ; return (AClass cls) }
   where
    tc_sig (IfaceClassOp occ dm rdr_ty)
@@ -1037,13 +1038,11 @@ tcIfaceTyCon (IfaceTupTc bx ar) = tcWiredInTyCon (tupleTyCon bx ar)
 tcIfaceTyCon (IfaceTc name)     = do { thing <- tcIfaceGlobal name 
 				     ; return (check_tc (tyThingTyCon thing)) }
   where
-#ifdef DEBUG
-    check_tc tc = case toIfaceTyCon tc of
-		   IfaceTc _ -> tc
-		   other     -> pprTrace "check_tc" (ppr tc) tc
-#else
-    check_tc tc = tc
-#endif
+    check_tc tc
+     | debugIsOn = case toIfaceTyCon tc of
+                   IfaceTc _ -> tc
+                   other     -> pprTrace "check_tc" (ppr tc) tc
+     | otherwise = tc
 -- we should be okay just returning Kind constructors without extra loading
 tcIfaceTyCon IfaceLiftedTypeKindTc   = return liftedTypeKindTyCon
 tcIfaceTyCon IfaceOpenTypeKindTc     = return openTypeKindTyCon