[Git][ghc/ghc][wip/T25647] fix order

[Patrick (@soulomoon)]

Patrick pushed to branch wip/T25647 at Glasgow Haskell Compiler / GHC


Commits:
6ea2e274 by Patrick at 2025-03-15T22:42:40+08:00
fix order

- - - - -


2 changed files:

- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/Utils/TcMType.hs


Changes:

=====================================
compiler/GHC/Tc/TyCl.hs
=====================================
@@ -259,11 +259,13 @@ quantifyFamInstLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty
        -- See GHC.Tc.TyCl Note [Generalising in tcTyFamInstEqnGuts]
        -- See Note [Type variables in type families instance decl]
        ; (dvs, outer_wcs_imp_dvs) <- candidateQTyVarsWithBinders outer_exp_tvs (outer_imp_tvs ++ wcs) lhs_ty
-       ; (qtvs, outer_wcs_imp_qtvs) <- quantifyTyVarsWithBinders skol_info dvs outer_wcs_imp_dvs
+       ; (qtvs, outer_wcs_imp_qtvs') <- quantifyTyVarsWithBinders skol_info dvs outer_wcs_imp_dvs
                  -- Have to make a same defaulting choice for result kind here
                  -- and the `kindGeneralizeAll` in `tcConDecl`.
                  -- see (GT4) in
                  -- GHC.Tc.TyCl Note [Generalising in tcTyFamInstEqnGuts]
+       ; let outer_wcs_imp_qtvs_set = mkVarSet outer_wcs_imp_qtvs'
+       ; let outer_wcs_imp_qtvs = [v | v <- outer_wcs_imp_qtvs, v `elemVarSet` outer_wcs_imp_qtvs_set]
        ; let final_tvs = scopedSort (qtvs ++ outer_wcs_imp_qtvs ++ outer_exp_tvs)
              -- This scopedSort is important: the qtvs may be /interleaved/ with
              -- the outer_tvs.  See Note [Generalising in tcTyFamInstEqnGuts]


=====================================
compiler/GHC/Tc/Utils/TcMType.hs
=====================================
@@ -1790,7 +1790,6 @@ quantifyTyVarsWithBinders skol_info dvs outer_wcs_imp_dvs
        ; undefaulted <- defaultTyVars DefaultNonStandardTyVars dvs
        ; undefaulted_outer_wcs_imp_tvs <- defaultTyVars TryNotToDefaultNonStandardTyVars outer_wcs_imp_dvs
        ; (final_qtvs, final_outer_wcs_imp_qtvs)  <- liftZonkM $ do
-            -- resume order and then skolemise
             qtvs <- mapMaybeM zonk_quant $ undefaulted
             outer_wcs_imp_qtvs <- mapMaybeM zonk_quant $ undefaulted_outer_wcs_imp_tvs
             return (qtvs, outer_wcs_imp_qtvs)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6ea2e274405f3a35a3478efb93b3ed0f38985b71

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6ea2e274405f3a35a3478efb93b3ed0f38985b71
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/20250315/1e265bef/attachment-0001.html>