From: simonpj Date: Fri, 29 Apr 2005 16:58:19 +0000 (+0000) Subject: [project @ 2005-04-29 16:58:19 by simonpj] X-Git-Tag: Initial_conversion_from_CVS_complete~633 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6a5e42fba3415616cbcabef83d197092784ecc13;p=ghc-hetmet.git [project @ 2005-04-29 16:58:19 by simonpj] The boot dfunid should be a LocalId --- diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs index b932ce1..b7ea93e 100644 --- a/ghc/compiler/typecheck/TcRnDriver.lhs +++ b/ghc/compiler/typecheck/TcRnDriver.lhs @@ -110,7 +110,7 @@ import IfaceType ( IfaceType, toIfaceType, interactiveExtNameFun ) import IfaceEnv ( lookupOrig, ifaceExportNames ) import RnEnv ( lookupOccRn, dataTcOccs, lookupFixityRn ) -import Id ( isImplicitId, setIdType, globalIdDetails ) +import Id ( isImplicitId, setIdType, globalIdDetails, mkExportedLocalId ) import MkId ( unsafeCoerceId ) import DataCon ( dataConTyCon ) import TyCon ( tyConName ) @@ -549,10 +549,11 @@ checkHiBootIface let dfun = instanceDFunId inst, idType dfun `tcEqType` boot_inst_ty ] of [] -> do { addErrTc (instMisMatch boot_inst); return emptyBag } - (dfun:_) -> return (unitBag $ noLoc $ VarBind boot_dfun (nlHsVar dfun)) + (dfun:_) -> return (unitBag $ noLoc $ VarBind local_boot_dfun (nlHsVar dfun)) where boot_dfun = instanceDFunId boot_inst boot_inst_ty = idType boot_dfun + local_boot_dfun = mkExportedLocalId (idName boot_dfun) boot_inst_ty ---------------- check_thing (ATyCon boot_tc) (ATyCon real_tc)