X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FTcIface.lhs;h=5af949e1fae829665d083eeb6facd46bcff1b7d9;hb=aee2068e034aca6ddaf6f20f85902137ecf718b7;hp=42321955e65a9abf76387a318d3972acd2c9dee5;hpb=8100cd4395e46ae747be4298c181a4730d6206bc;p=ghc-hetmet.git

diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 4232195..5af949e 100644
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -50,6 +50,7 @@ import Maybes
 import SrcLoc
 import Util
 import DynFlags
+import Breakpoints
 import Control.Monad
 
 import Data.List
@@ -209,7 +210,8 @@ typecheckIface iface
 			      , md_insts     = insts
 			      , md_fam_insts = fam_insts
 			      , md_rules     = rules
-			      , md_exports   = exports 
+			      , md_exports   = exports
+                              , md_dbg_sites = noDbgSites
 			      }
     }
 \end{code}
@@ -378,7 +380,7 @@ tcIfaceDecl ignore_prags
    = bindIfaceTyVars tv_bndrs $ \ tyvars -> do
      { tc_name <- lookupIfaceTop occ_name
      ; rhs_tyki <- tcIfaceType rdr_rhs_ty
-     ; let rhs = if isOpen then OpenSynTyCon rhs_tyki 
+     ; let rhs = if isOpen then OpenSynTyCon rhs_tyki Nothing
 			   else SynonymTyCon rhs_tyki
      ; return (ATyCon (buildSynTyCon tc_name tyvars rhs))
      }
@@ -404,8 +406,8 @@ tcIfaceDecl ignore_prags
      = do { op_name <- lookupIfaceTop occ
 	  ; op_ty   <- forkM (mk_doc op_name rdr_ty) (tcIfaceType rdr_ty)
 		-- Must be done lazily for just the same reason as the 
-		-- context of a data decl: the type sig might mention the
-		-- class being defined
+		-- type of a data con; to avoid sucking in types that
+		-- it mentions unless it's necessray to do so
 	  ; return (op_name, dm, op_ty) }
 
    mk_doc op_name op_ty = ptext SLIT("Class op") <+> sep [ppr op_name, ppr op_ty]
@@ -497,7 +499,7 @@ tcIfaceInst (IfaceInst { ifDFun = dfun_occ, ifOFlag = oflag,
   = do	{ dfun    <- forkM (ptext SLIT("Dict fun") <+> ppr dfun_occ) $
 		     tcIfaceExtId dfun_occ
         ; let mb_tcs' = map (fmap ifaceTyConName) mb_tcs
-	; return (mkImportedInstance cls mb_tcs' orph dfun oflag) }
+	; return (mkImportedInstance cls mb_tcs' dfun oflag) }
 
 tcIfaceFamInst :: IfaceFamInst -> IfL FamInst
 tcIfaceFamInst (IfaceFamInst { ifFamInstTyCon = tycon, 
@@ -545,7 +547,7 @@ tcIfaceRule (IfaceRule {ifRuleName = name, ifActivation = act, ifRuleBndrs = bnd
         ; let this_module = if_mod lcl
 	; returnM (Rule { ru_name = name, ru_fn = fn, ru_act = act, 
 			  ru_bndrs = bndrs', ru_args = args', 
-			  ru_rhs = rhs', ru_orph = orph,
+			  ru_rhs = rhs', 
 			  ru_rough = mb_tcs,
 			  ru_local = nameModule fn == this_module }) }
   where