[commit: ghc] master: Fix #11648. (55577a9)
git at git.haskell.org
git at git.haskell.org
Tue Mar 15 03:50:54 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/55577a9130738932d022d442d0773ffd79d0945d/ghc
>---------------------------------------------------------------
commit 55577a9130738932d022d442d0773ffd79d0945d
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Sat Mar 12 20:59:44 2016 -0500
Fix #11648.
We now check that a CUSK is really a CUSK and issue an error if
it isn't. This also involves more solving and zonking in
kcHsTyVarBndrs, which was the outright bug reported in #11648.
Test cases: polykinds/T11648{,b}
This updates the haddock submodule.
[skip ci]
>---------------------------------------------------------------
55577a9130738932d022d442d0773ffd79d0945d
compiler/deSugar/DsMeta.hs | 19 +-
compiler/hsSyn/Convert.hs | 2 +
compiler/hsSyn/HsDecls.hs | 26 ++-
compiler/hsSyn/HsTypes.hs | 13 +-
compiler/parser/RdrHsSyn.hs | 1 +
compiler/rename/RnSource.hs | 42 ++--
compiler/rename/RnTypes.hs | 63 +++---
compiler/typecheck/TcHsType.hs | 234 +++++++++++++--------
compiler/typecheck/TcMType.hs | 2 +-
compiler/typecheck/TcTyClsDecls.hs | 83 +++++---
compiler/typecheck/TcType.hs | 27 +++
compiler/typecheck/TcValidity.hs | 2 +-
docs/users_guide/glasgow_exts.rst | 62 +++++-
.../tests/dependent/should_compile/KindLevels.hs | 4 +-
.../tests/dependent/should_fail/InferDependency.hs | 6 +
.../dependent/should_fail/InferDependency.stderr | 8 +
.../KindLevels.hs => should_fail/KindLevelsB.hs} | 0
.../tests/dependent/should_fail/KindLevelsB.stderr | 5 +
testsuite/tests/dependent/should_fail/all.T | 2 +
testsuite/tests/polykinds/T11648.hs | 8 +
testsuite/tests/polykinds/T11648b.hs | 7 +
testsuite/tests/polykinds/T11648b.stderr | 8 +
testsuite/tests/polykinds/T6039.stderr | 5 +
testsuite/tests/polykinds/all.T | 4 +-
utils/haddock | 2 +-
25 files changed, 444 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 55577a9130738932d022d442d0773ffd79d0945d
More information about the ghc-commits
mailing list