[commit: ghc] master: Take account of kinds in promoteTcType (08ba691)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/08ba691ad55f30e67466628125244392c48ce1ab/ghc

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

commit 08ba691ad55f30e67466628125244392c48ce1ab
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Oct 24 17:01:41 2016 +0100

    Take account of kinds in promoteTcType
    
    One of the ASSERT failures in Trac #12762, namely the one for T4439,
    showed that I had not dealt correctly with promoting the kind of
    a type in promoteTcType.
    
    Happily I could fix this by simplifying InferRes (eliminating the
    ir_kind field), so things get better. And the ASSERT is fixed.


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

08ba691ad55f30e67466628125244392c48ce1ab
 compiler/typecheck/TcExpr.hs                       |   5 +-
 compiler/typecheck/TcHsType.hs                     |  30 ++---
 compiler/typecheck/TcMType.hs                      | 150 ++++-----------------
 compiler/typecheck/TcPatSyn.hs                     |   2 +-
 compiler/typecheck/TcType.hs                       |   6 +-
 compiler/typecheck/TcUnify.hs                      | 148 +++++++++++++++++---
 testsuite/tests/gadt/gadt7.stderr                  |   6 +-
 .../tests/indexed-types/should_fail/T2664.stderr   |  28 ++--
 .../tests/indexed-types/should_fail/T9662.stderr   |   4 +-
 testsuite/tests/polykinds/T7438.stderr             |   6 +-
 testsuite/tests/polykinds/T9222.stderr             |   2 -
 11 files changed, 196 insertions(+), 191 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 08ba691ad55f30e67466628125244392c48ce1ab