X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcSimplify.lhs;h=be9d70d74debe1fe09483b3060cd08ad452fc47a;hb=3787d9878e4d62829a555f01b2a4c5866f24f303;hp=33975947af016ad45841660a891d72a8f958d422;hpb=06f6f35dadc461336675e6d2b8a2192b1f518a1b;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs index 3397594..be9d70d 100644 --- a/compiler/typecheck/TcSimplify.lhs +++ b/compiler/typecheck/TcSimplify.lhs @@ -1820,7 +1820,8 @@ reduceContext env wanteds -- 8. Substitute the wanted *equations* in the wanted *dictionaries* ; let irreds = dict_irreds ++ implic_irreds - ; (norm_irreds, normalise_binds2) <- substEqInDictInsts eq_irreds irreds + ; (norm_irreds, normalise_binds2) <- substEqInDictInsts True {-wanted-} + eq_irreds irreds -- 9. eliminate the artificial skolem constants introduced in 1. ; eliminate_skolems @@ -2206,7 +2207,7 @@ reduceImplication env -- it makes no difference co = wrap_inline -- Note [Always inline implication constraints] <.> mkWpTyLams tvs - <.> mkWpTyLams eq_tyvars + <.> mkWpLams eq_tyvars <.> mkWpLams dict_ids <.> WpLet (binds `unionBags` bind) wrap_inline | null dict_ids = idHsWrapper