[commit: ghc] ghc-7.6: Merge 1353d1 into the 7.6 branch (bd6875f)

[Simon Peyton Jones]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-7.6

https://github.com/ghc/ghc/commit/bd6875f0f5dea4f47e9cbe351df7e59a7768fec3

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

commit bd6875f0f5dea4f47e9cbe351df7e59a7768fec3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Apr 16 07:28:27 2013 +0100

    Merge 1353d1 into the 7.6 branch
    
    (without this I get an ASSERT failure)
    
        commit 1353d1ef98603a1bff1f8eb181d1368e934b3647
        Author: Simon Peyton Jones <simonpj at microsoft.com>
        Date:   Thu Dec 20 20:13:36 2012 +0000
    
        Fix over-zealous ASSERT in TcUnify

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

 compiler/typecheck/TcUnify.lhs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index cdeeea0..7c2f83d 100644
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -235,7 +235,7 @@ matchExpectedTyConApp tc orig_ty
     --    (a::*) ~ Maybe
     -- because that'll make types that are utterly ill-kinded.
     -- This happened in Trac #7368
-    defer = ASSERT2( isLiftedTypeKind res_kind, ppr tc )
+    defer = ASSERT2( isSubOpenTypeKind res_kind, ppr tc )
             do { kappa_tys <- mapM (const newMetaKindVar) kvs
                ; let arg_kinds' = map (substKiWith kvs kappa_tys) arg_kinds
                ; tau_tys <- mapM newFlexiTyVarTy arg_kinds'