projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1a9add1
)
[project @ 2001-01-03 08:34:32 by simonpj]
author
simonpj
<unknown>
Wed, 3 Jan 2001 08:34:32 +0000
(08:34 +0000)
committer
simonpj
<unknown>
Wed, 3 Jan 2001 08:34:32 +0000
(08:34 +0000)
Remove bogus zonkInst
ghc/compiler/typecheck/TcSimplify.lhs
patch
|
blob
|
history
diff --git
a/ghc/compiler/typecheck/TcSimplify.lhs
b/ghc/compiler/typecheck/TcSimplify.lhs
index
4976f41
..
4748e9d
100644
(file)
--- 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.
-- 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 []
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) ->
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
warnDefault dicts chosen_default_ty `thenTc_`
returnTc binds