[commit: ghc] master: Fix a bug in TcCanonical (Dimitrios spotted) (b2d27e4)

[José Pedro Magalhães]

Ian, can you please merge to 7.4?

Thanks,
Pedro

2011/12/16 José Pedro Magalhães <jpm at cs.uu.nl>

> Repository : ssh://darcs.haskell.org//srv/darcs/ghc
>
> On branch  : master
>
>
> http://hackage.haskell.org/trac/ghc/changeset/b2d27e42ff655728e7fc4ad26659c2b614bf5f22
>
> >---------------------------------------------------------------
>
> commit b2d27e42ff655728e7fc4ad26659c2b614bf5f22
> Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
> Date:   Fri Dec 16 14:56:39 2011 +0000
>
>    Fix a bug in TcCanonical (Dimitrios spotted)
>
> >---------------------------------------------------------------
>
>  compiler/typecheck/TcCanonical.lhs |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/compiler/typecheck/TcCanonical.lhs
> b/compiler/typecheck/TcCanonical.lhs
> index f2b6527..afd9093 100644
> --- a/compiler/typecheck/TcCanonical.lhs
> +++ b/compiler/typecheck/TcCanonical.lhs
> @@ -1296,7 +1296,7 @@ canEqLeafTyVarLeft d fl eqv tv s2       -- eqv : tv
> ~ s2
>
>        ; if no_flattening_happened then
>              if isNothing occ_check_result then
> -                 canEqFailure d fl eqv
> +                 canEqFailure d fl (setVarType eqv $ mkEqPred (mkTyVarTy
> tv, xi2'))
>              else
>                  continueWith $ CTyEqCan { cc_id     = eqv
>                                          , cc_flavor = fl
>
>
>
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/cvs-ghc/attachments/20111216/02614964/attachment.htm>