Make the treatment of equalities more uniform

[ghc-hetmet.git] / compiler / typecheck / TcSimplify.lhs

diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs
index 3397594..be9d70d 100644 (file)
--- 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