Merge 1353d1 into the 7.6 branch
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 16 Apr 2013 06:28:27 +0000 (07:28 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 16 Apr 2013 06:28:27 +0000 (07:28 +0100)
(without this I get an ASSERT failure)

    commit 1353d1ef98603a1bff1f8eb181d1368e934b3647
    Author: Simon Peyton Jones <simonpj@microsoft.com>
    Date:   Thu Dec 20 20:13:36 2012 +0000

    Fix over-zealous ASSERT in TcUnify

compiler/typecheck/TcUnify.lhs

index cdeeea0..7c2f83d 100644 (file)
@@ -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'