[commit: ghc] wip/new-flatten-skolems-Aug14: Wibbles (fc0694c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/new-flatten-skolems-Aug14
Link       : http://ghc.haskell.org/trac/ghc/changeset/fc0694c6fb97b1c6c4b4357a972d9bb59c6e8578/ghc

>---------------------------------------------------------------

commit fc0694c6fb97b1c6c4b4357a972d9bb59c6e8578
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Sep 30 11:59:47 2014 +0100

    Wibbles


>---------------------------------------------------------------

fc0694c6fb97b1c6c4b4357a972d9bb59c6e8578
 compiler/typecheck/TcSimplify.lhs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs
index b99a2e8..e34f89d 100644
--- a/compiler/typecheck/TcSimplify.lhs
+++ b/compiler/typecheck/TcSimplify.lhs
@@ -1162,9 +1162,9 @@ floatEqualities skols no_given_eqs wanteds@(WC { wc_flat = flats })
     (float_eqs, remaining_flats) = partitionBag float_me flats
     float_me :: Ct -> Bool
     float_me ct
-       | EqPred ty1 ty2 <- classifyPred pred
+       | EqPred ty1 ty2 <- classifyPredType pred
        , skol_set `disjointVarSet` tyVarsOfType pred
-       , typeKind ty1 `eqKind` typeKind ty2  -- See Note [Do not float kind-incompatible equalities]
+       , typeKind ty1 `tcEqKind` typeKind ty2  -- See Note [Do not float kind-incompatible equalities]
        = True
        | otherwise
        = False