Commit bd6875f0 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge 1353d1 into the 7.6 branch

(without this I get an ASSERT failure)

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

    Fix over-zealous ASSERT in TcUnify
parent 3ed9baf4
......@@ -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'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment