X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;h=2f09895562c5912fd46bd0787b919b2819156af7;hb=79a8b87c0bd61d56b4cf45bd584c9174aab48e61;hp=f30ebcb713340b53b2a977d5c4157f2a99e0fb89;hpb=d673a348ba1a8c41e9eaeb255e0c43156d883526;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index f30ebcb..2f09895 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -67,7 +67,7 @@ import TcType ( Type, TcType, TcThetaType, TcTyVarSet, TcTyVar, pprPred, pprParendType, pprThetaArrow, pprTheta, pprClassPred ) import Type ( substTy, substTys, substTyWith, substTheta, zipTopTvSubst ) -import Unify ( matchTys ) +import Unify ( tcMatchTys ) import Kind ( isSubKind ) import Packages ( isHomeModule ) import HscTypes ( ExternalPackageState(..) ) @@ -583,7 +583,7 @@ addInst dflags home_ie dfun ; let { tys' = substTys tenv tys ; (matches, _) = lookupInstEnv dflags (pkg_ie, home_ie) cls tys' ; dup_dfuns = [dup_dfun | (_, (_, dup_tys, dup_dfun)) <- matches, - isJust (matchTys (mkVarSet tvs) tys' dup_tys)] } + isJust (tcMatchTys (mkVarSet tvs) tys' dup_tys)] } -- Find memebers of the match list which -- dfun itself matches. If the match is 2-way, it's a duplicate ; case dup_dfuns of