[Git][ghc/ghc][wip/T21623] Wibble

[Simon Peyton Jones (@simonpj)]

Simon Peyton Jones pushed to branch wip/T21623 at Glasgow Haskell Compiler / GHC


Commits:
33295998 by Simon Peyton Jones at 2022-09-06T15:52:20+01:00
Wibble

- - - - -


2 changed files:

- compiler/GHC/Core/TyCo/Subst.hs
- compiler/GHC/Tc/TyCl.hs


Changes:

=====================================
compiler/GHC/Core/TyCo/Subst.hs
=====================================
@@ -815,7 +815,7 @@ substTyVar (Subst _ _ tenv _) tv
       Just ty -> ty
       Nothing -> TyVarTy tv
 
-substTyVarToTyVar :: Subst -> TyVar -> TyVar
+substTyVarToTyVar :: HasDebugCallStack => Subst -> TyVar -> TyVar
 -- Apply the substitution, expecing the result to be a TyVarTy
 substTyVarToTyVar (Subst _ _ tenv _) tv
   = assert (isTyVar tv) $


=====================================
compiler/GHC/Tc/TyCl.hs
=====================================
@@ -3834,8 +3834,8 @@ rejigConRes tc_tvbndrs res_tmpl dc_tvbndrs res_ty
         subst_user_tvs  = mapVarBndrs (substTyVarToTyVar arg_subst)
         substed_tvbndrs = subst_user_tvs dc_tvbndrs
 
-        substed_eqs = [ mkEqSpec (substTyVarToTyVar subst tv)
-                                 (substTy subst ty)
+        substed_eqs = [ mkEqSpec (substTyVarToTyVar arg_subst tv)
+                                 (substTy arg_subst ty)
                       | (tv,ty) <- raw_eqs ]
     in
     (univ_tvs, substed_ex_tvs, substed_tvbndrs, substed_eqs, arg_subst)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/33295998c12f4aa50da2ac17545eaa1837ef451a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/33295998c12f4aa50da2ac17545eaa1837ef451a
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220906/82e6a049/attachment-0001.html>