[commit: ghc] wip/T15952: Continue with #15952 (836568c)

[git at git.haskell.org]

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

On branch  : wip/T15952
Link       : http://ghc.haskell.org/trac/ghc/changeset/836568c532c9ac8ba3f2aaae9470c2064bfd1ad2/ghc

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

commit 836568c532c9ac8ba3f2aaae9470c2064bfd1ad2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sun Dec 30 23:48:39 2018 +0000

    Continue with #15952
    
    * Re-add the TcKind result to tc_infer_hs_type,
      and the TcKind argument to checkExpectedKind.
      (This is just taste; the relevant kind is readily
      available so it seems a pity to recompute it.)
    
    * Expunge the tricky invariants
        Note [The well-kinded type invariant] in TcType
        Note [The tcType invariant] in TcHsType
      Hooray.


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

836568c532c9ac8ba3f2aaae9470c2064bfd1ad2
 compiler/typecheck/TcHsType.hs          | 262 ++++++++++++++------------------
 compiler/typecheck/TcInstDcls.hs        |   4 +-
 compiler/typecheck/TcTyClsDecls.hs      |  17 +--
 compiler/typecheck/TcType.hs            |  20 ++-
 testsuite/tests/polykinds/T13659.stderr |   2 +-
 5 files changed, 142 insertions(+), 163 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 836568c532c9ac8ba3f2aaae9470c2064bfd1ad2