[Git][ghc/ghc][wip/T25647] handle explicit implicit binders seperately fix

[Patrick (@soulomoon)]

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


Commits:
7cb61cb6 by Patrick at 2025-03-11T08:28:27+08:00
handle explicit implicit binders seperately fix

- - - - -


2 changed files:

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


Changes:

=====================================
compiler/GHC/Tc/TyCl.hs
=====================================
@@ -265,7 +265,7 @@ tcFamInsLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted
        ; checkFamTelescope tclvl hs_outer_bndrs outer_exp_tvs
        ; outer_imp_wc_tvs <- liftZonkM $ zonkTcTyVarsToTcTyVarsMaybe $ outer_imp_tvs ++ wcs
        -- See GHC.Tc.TyCl Note [Generalising in tcTyFamInstEqnGuts]
-       ; (dvs, cqdvs)  <- candidateQTyVarsWithBinders (outer_imp_wc_tvs ++ outer_exp_tvs) lhs_ty
+       ; (dvs, cqdvs)  <- candidateQTyVarsWithBinders outer_imp_wc_tvs outer_exp_tvs lhs_ty
        ; qtvs <- quantifyTyVarsWithBinders cqdvs skol_info dvs
                  -- Have to make a same defaulting choice for reuslt kind here
                  -- and the `kindGeneralizeAll` in `tcConDecl`.


=====================================
compiler/GHC/Tc/Utils/TcMType.hs
=====================================
@@ -1392,7 +1392,7 @@ partitionCandidates dvs@(DV { dv_kvs = kvs, dv_tvs = tvs }) pred
     (extracted_tvs, rest_tvs) = partitionDVarSet pred tvs
     extracted = dVarSetToVarSet extracted_kvs `unionVarSet` dVarSetToVarSet extracted_tvs
 
-candidateQTyVarsWithBinders :: [TyVar] -> Type -> TcM (CandidatesQTvs, [TyVar])
+candidateQTyVarsWithBinders :: [TyVar] -> [TyVar] -> Type -> TcM (CandidatesQTvs, [TyVar])
 -- (candidateQTyVarsWithBinders tvs ty) returns the candidateQTyVars
 -- of (forall tvs. ty), but do not treat 'tvs' as bound for the purpose
 -- of Note [Naughty quantification candidates].  Why?
@@ -1402,11 +1402,12 @@ candidateQTyVarsWithBinders :: [TyVar] -> Type -> TcM (CandidatesQTvs, [TyVar])
 -- also return the bound variables that need to be quantified
 -- since they can be come from implicit binders and wildcards
 -- See Note [Type variables in type families instance decl]
-candidateQTyVarsWithBinders bound_tvs ty
+candidateQTyVarsWithBinders imp_bound_tvs exp_bound_tvs ty
   = do { kvs     <- candidateQTyVarsOfKinds (map tyVarKind bound_tvs)
        ; cur_lvl <- getTcLevel
        ; all_tvs <- collect_cand_qtvs ty False cur_lvl emptyVarSet kvs ty
-       ; return (all_tvs `delCandidates` bound_tvs, boundedCandidates all_tvs bound_tvs) }
+       ; return (all_tvs `delCandidates` bound_tvs, boundedCandidates all_tvs imp_bound_tvs) }
+      where bound_tvs = imp_bound_tvs ++ exp_bound_tvs
 
 
 -- | Gathers free variables to use as quantification candidates (in



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7cb61cb6eb803628b556667d3bdfb9b7a48b0c51

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7cb61cb6eb803628b556667d3bdfb9b7a48b0c51
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/20250310/290f091f/attachment-0001.html>