Simon Peyton Jones pushed to branch wip/T27994 at Glasgow Haskell Compiler / GHC Commits: 06084f6b by Simon Peyton Jones at 2026-10-21T17:31:59+01:00 Wibbles - - - - - 2 changed files: - compiler/GHC/Core/Unify.hs - compiler/GHC/Tc/Solver/FunDeps.hs Changes: ===================================== compiler/GHC/Core/Unify.hs ===================================== @@ -1138,8 +1138,11 @@ niFixSubst, niFixSubst' :: InScopeSet -> TvSubstEnv -> Subst -- see Note [Finding the substitution fixpoint] -- ToDo: use laziness instead of iteration? niFixSubst in_scope tenv - = pprTrace "niFixSubst" (vcat [ text "In: " <+> ppr tenv - , text "Out:" <+> ppr (S.getTvSubstEnv subst) ]) + | isEmptyVarEnv tenv -- Fast path for common case + = mkEmptySubst in_scope + | otherwise + = -- pprTrace "niFixSubst" (vcat [ text "In: " <+> ppr tenv + -- , text "Out:" <+> ppr (S.getTvSubstEnv subst) ]) subst where subst = niFixSubst' in_scope tenv ===================================== compiler/GHC/Tc/Solver/FunDeps.hs ===================================== @@ -735,7 +735,8 @@ mkTopOpenFamEqFDs fam_tc inj_flags work_args (EqCt { eq_rhs = work_rhs }) | Just {} <- tcUnifyTysForInjectivity Matching [branch_rhs] [work_rhs] -- No need for an apartness check here; -- for open type families there are no "preceding" equations - = Just (mkInjectivityFDEqn inj_flags branch_qtvs branch_lhs_tys work_args) + = Just (mkInjectivityFDEqn inj_flags branch_qtvs + (branch_rhs:branch_lhs_tys) (work_rhs:work_args)) | otherwise = Nothing View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/06084f6b4ea606ca8f433d6bddb82eda... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/06084f6b4ea606ca8f433d6bddb82eda... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
participants (1)
-
Simon Peyton Jones (@simonpj)