X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcSimplify.lhs;h=773b312cc428ec5ecd557e46850669c0d073d753;hb=884b0a57dde7b1d9556a4c47f6a14a11d39c3c64;hp=3f25a4cea912deb6211590de7461815852c8eb43;hpb=f6a741fad12b14b102be1aca959b8d63cbb2734a;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs
index 3f25a4c..773b312 100644
--- a/compiler/typecheck/TcSimplify.lhs
+++ b/compiler/typecheck/TcSimplify.lhs
@@ -2716,11 +2716,11 @@ report_no_instances tidy_env mb_what insts
 	    (clas,tys) = getDictClassTys wanted
 
     mk_overlap_msg dict (matches, unifiers)
-      = vcat [	addInstLoc [dict] ((ptext SLIT("Overlapping instances for") 
+      = ASSERT( not (null matches) )
+        vcat [	addInstLoc [dict] ((ptext SLIT("Overlapping instances for") 
 					<+> pprPred (dictPred dict))),
     		sep [ptext SLIT("Matching instances") <> colon,
     		     nest 2 (vcat [pprInstances ispecs, pprInstances unifiers])],
-		ASSERT( not (null matches) )
 		if not (isSingleton matches)
     		then 	-- Two or more matches
 		     empty
@@ -2728,7 +2728,8 @@ report_no_instances tidy_env mb_what insts
 		ASSERT( not (null unifiers) )
 		parens (vcat [ptext SLIT("The choice depends on the instantiation of") <+>
 	    		         quotes (pprWithCommas ppr (varSetElems (tyVarsOfInst dict))),
-			      ptext SLIT("Use -fallow-incoherent-instances to use the first choice above")])]
+			      ptext SLIT("To pick the first instance above, use -fallow-incoherent-instances"),
+			      ptext SLIT("when compiling the other instances")])]
       where
     	ispecs = [ispec | (ispec, _) <- matches]