X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=98a70752731899abb8b8275cf539e3522500529c;hb=a8176b20a96ec219f0eb4269f908efbd5f5d9902;hp=f6e6a996a9bf48a385b81903d90b2ea37fa28a91;hpb=9c8f079e2798f40548f6012fe8be7c29a3b499f8;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs index f6e6a99..98a7075 100644 --- a/ghc/compiler/typecheck/TcInstDcls.lhs +++ b/ghc/compiler/typecheck/TcInstDcls.lhs @@ -33,7 +33,7 @@ import TcType ( mkClassPred, mkTyVarTy, mkTyVarTys, tcSplitForAllTys, import Inst ( InstOrigin(..), newDicts, instToId, LIE, mkLIE, emptyLIE, plusLIE, plusLIEs ) import TcDeriv ( tcDeriving ) -import TcEnv ( TcEnv, tcExtendGlobalValEnv, isLocalThing, +import TcEnv ( TcEnv, tcExtendGlobalValEnv, isHomePackageThing, tcExtendTyVarEnvForMeths, tcLookupId, tcLookupClass, InstInfo(..), pprInstInfo, simpleInstInfoTyCon, simpleInstInfoTy, newDFunName @@ -204,7 +204,7 @@ tcInstDecls1 inst_env0 prs hst unf_env get_fixity this_mod decls -- manager. let local_inst_info = catMaybes local_inst_infos - (local_iface_dfuns, pkg_iface_dfuns) = partition (isLocalThing this_mod) iface_dfuns + (local_iface_dfuns, pkg_iface_dfuns) = partition isHomePackageThing iface_dfuns hst_dfuns = foldModuleEnv ((++) . md_insts) [] hst in