[commit: ghc] master: Suppress substitution assertions to fix tests (e5a0a89)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e5a0a8903715b8717342dabeb72d69b4d5e61e5c/ghc

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

commit e5a0a8903715b8717342dabeb72d69b4d5e61e5c
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Mon Feb 1 02:39:50 2016 -0800

    Suppress substitution assertions to fix tests
    
    This is one place that I've missed with D1862.
    This doesn't fix the underlying problem and I prefer to suppress it
    now and fix it later as this is a part of a larger effort (#11371)
    to fix an old bug with `substTy` called with invalid `in_scope` sets.
    
    Test Plan: `make test TEST="hClose002 hClose003 hDuplicateTo001"
    
    Reviewers: thomie, austin, bgamari, trofi
    
    Reviewed By: trofi
    
    Differential Revision: https://phabricator.haskell.org/D1872
    
    GHC Trac Issues: #11371


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

e5a0a8903715b8717342dabeb72d69b4d5e61e5c
 compiler/basicTypes/MkId.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index fd6c2ce..8aaa005 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -695,7 +695,7 @@ wrapCo co rep_ty (unbox_rep, box_rep)  -- co :: arg_ty ~ rep_ty
                          UnitBox -> do { rep_id <- newLocal (TcType.substTy subst rep_ty)
                                        ; return ([rep_id], Var rep_id) }
                          Boxer boxer -> boxer subst
-               ; let sco = substCo subst co
+               ; let sco = substCoUnchecked subst co
                ; return (rep_ids, rep_expr `Cast` mkSymCo sco) }
 
 ------------------------