[commit: ghc] master: Increase an InScopeSet for a substitution (8d66765)

git at git.haskell.org git at git.haskell.org
Fri Apr 15 13:27:52 UTC 2016


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

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

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

commit 8d66765c4de22c01b8ae97570ed6c5f5c1a16a35
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


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

8d66765c4de22c01b8ae97570ed6c5f5c1a16a35
 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 020dd78..62906dd 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
 



More information about the ghc-commits mailing list