From bd6875f0f5dea4f47e9cbe351df7e59a7768fec3 Mon Sep 17 00:00:00 2001 From: Simon Peyton Jones <simonpj@microsoft.com> Date: Tue, 16 Apr 2013 07:28:27 +0100 Subject: [PATCH] Merge 1353d1 into the 7.6 branch (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs index cdeeea0eb113..7c2f83d03875 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' -- GitLab