[commit: ghc] ghc-8.0: Increase an InScopeSet for a substitution (b3321ca)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/b3321ca73f9d8ae4a44e228ff77ecbe14e291440/ghc

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

commit b3321ca73f9d8ae4a44e228ff77ecbe14e291440
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Apr 12 12:00:55 2016 -0400

    Increase an InScopeSet for a substitution
    
    This is a further fix for #11814
    
    (cherry picked from commit 8d66765c4de22c01b8ae97570ed6c5f5c1a16a35)


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

b3321ca73f9d8ae4a44e228ff77ecbe14e291440
 compiler/types/FamInstEnv.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/types/FamInstEnv.hs b/compiler/types/FamInstEnv.hs
index 3ad2801..52fa965 100644
--- a/compiler/types/FamInstEnv.hs
+++ b/compiler/types/FamInstEnv.hs
@@ -515,7 +515,8 @@ compatibleBranches (CoAxBranch { cab_lhs = lhs1, cab_rhs = rhs1 })
   = case tcUnifyTysFG (const BindMe) lhs1 lhs2 of
       SurelyApart -> True
       Unifiable subst
-        | Type.substTy subst rhs1 `eqType` Type.substTy subst rhs2
+        | Type.substTyAddInScope subst rhs1 `eqType`
+          Type.substTyAddInScope subst rhs2
         -> True
       _ -> False