Adapt FC-code in TcUnify to pre-subsumption

Wed Sep 20 04:01:18 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
  * Adapt FC-code in TcUnify to pre-subsumption

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index 000024e..b616b37 100644 (file)
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -699,11 +699,10 @@ tc_sub1 mb_fun act_sty actual_ty exp_ib exp_sty expected_ty
        ; traceTc (text "tc_sub_spec" <+> vcat [ppr actual_ty, 
                                                ppr tyvars <+> ppr theta <+> ppr tau,
                                                ppr tau'])
-       ; co_fn2 <- tc_sub mb_fun tau tau exp_ib exp_sty expected_ty
+       ; co_fn2 <- tc_sub mb_fun tau' tau' exp_ib exp_sty expected_ty
 
                -- Deal with the dictionaries
-       ; co_fn1 <- instCall InstSigOrigin (mkTyVarTys tyvars) theta
-       ; co_fn2 <- tc_sub False tau tau exp_sty expected_ty
+       ; co_fn1 <- instCall InstSigOrigin inst_tys (substTy subst' theta)
        ; return (co_fn2 <.> co_fn1) }
 
 -----------------------------------