From: simonpj <unknown>
Date: Wed, 3 Jan 2001 08:34:32 +0000 (+0000)
Subject: [project @ 2001-01-03 08:34:32 by simonpj]
X-Git-Tag: Approximately_9120_patches~2988
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4089c8301030514a1e50cf715ddcd85b88024208;p=ghc-hetmet.git

[project @ 2001-01-03 08:34:32 by simonpj]
Remove bogus zonkInst
---

diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/ghc/compiler/typecheck/TcSimplify.lhs
index 4976f41..4748e9d 100644
--- a/ghc/compiler/typecheck/TcSimplify.lhs
+++ b/ghc/compiler/typecheck/TcSimplify.lhs
@@ -760,10 +760,7 @@ addGiven avails given
 	 -- This assertion isn't necessarily true.  It's permitted
 	 -- to given a redundant context in a type signature (eg (Ord a, Eq a) => ...)
 	 -- and when typechecking instance decls we generate redundant "givens" too.
-    -- addAvail avails given avail
-    addAvail avails given avail `thenNF_Tc` \av ->
-    zonkInst given `thenNF_Tc` \given' ->
-    returnNF_Tc av	
+    addAvail avails given avail
   where
     avail = Avail (instToId given) NoRhs []
 
@@ -1148,7 +1145,7 @@ disambigGroup dicts
     unifyTauTy chosen_default_ty (mkTyVarTy tyvar)	`thenTc_`
     reduceContext (text "disambig" <+> ppr dicts)
 		  try_me [] dicts			`thenTc` \ (binds, frees, ambigs) ->
-    ASSERT( null frees && null ambigs )
+    WARN( not (null frees && null ambigs), ppr frees $$ ppr ambigs )
     warnDefault dicts chosen_default_ty			`thenTc_`
     returnTc binds