X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=3fec58dd0a402b6d98daa0bc0e4f6b5518ca10e8;hp=88dcd8e64c2a305e7c8b4e5b00de68cebec5bb2a;hb=1cdafe99abae1628f34ca8c064e3a8c0fcdbd079;hpb=89a16d32889b369508faa8a069abffa3257d3a4f

diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index 88dcd8e..3fec58d 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -13,7 +13,8 @@ import TcBinds		( mkPragFun, tcPrags, badBootDeclErr )
 import TcClassDcl	( tcMethodBind, mkMethodBind, badMethodErr, 
 			  tcClassDecl2, getGenericInstances )
 import TcRnMonad       
-import TcMType		( tcSkolSigType, checkValidTheta, checkValidInstHead, instTypeErr, 
+import TcMType		( tcSkolSigType, checkValidTheta, checkValidInstHead,
+			  checkInstTermination, instTypeErr, 
 			  checkAmbiguity, SourceTyCtxt(..) )
 import TcType		( mkClassPred, tyVarsOfType, 
 			  tcSplitSigmaTy, tcSplitDFunHead, mkTyVarTys,
@@ -195,6 +196,7 @@ tcLocalInstDecl1 decl@(L loc (InstDecl poly_ty binds uprags))
     checkValidTheta InstThetaCtxt theta			`thenM_`
     checkAmbiguity tyvars theta (tyVarsOfType tau)	`thenM_`
     checkValidInstHead tau				`thenM` \ (clas,inst_tys) ->
+    checkInstTermination theta inst_tys			`thenM_`
     checkTc (checkInstFDs theta clas inst_tys)
 	    (instTypeErr (pprClassPred clas inst_tys) msg)	`thenM_`
     newDFunName clas inst_tys (srcSpanStart loc)		`thenM` \ dfun_name ->