diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2022-12-02 17:28:31 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2022-12-08 14:00:21 +0000 |
| commit | 95949343018a59c9114a5aaf8e1af283de6987d6 (patch) | |
| tree | a112801c7675c4091573d200d4859115ab4be493 | |
| parent | f73683325ce0755dabd1ed801ba3d6a2521ae3c4 (diff) | |
| download | haskell-wip/T21623-faster.tar.gz | |
Wibbleswip/T21623-faster
| -rw-r--r-- | compiler/GHC/Core/TyCon.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/Core/Type.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/GHC/Core/TyCon.hs b/compiler/GHC/Core/TyCon.hs index 2c1e92a247..266322c594 100644 --- a/compiler/GHC/Core/TyCon.hs +++ b/compiler/GHC/Core/TyCon.hs @@ -2465,7 +2465,7 @@ tcTyConScopedTyVars tc@(TyCon { tyConDetails = details }) | otherwise = pprPanic "tcTyConScopedTyVars" (ppr tc) -tyConTypeKindPieces :: TyCon -> (Kind, [TyConBinder], Kind, Bool) +tyConTypeKindPieces :: TyCon -> ([TyConBinder], Kind, Bool) -- This rather specialised function returns the bits needed for typeKind tyConTypeKindPieces (TyCon { tyConBinders = bndrs , tyConKind = kind, tyConResKind = res_kind @@ -2473,9 +2473,9 @@ tyConTypeKindPieces (TyCon { tyConBinders = bndrs | TcTyCon { tctc_is_poly = False } <- details = -- For MonoTcTyCons we must use the tyConKind -- because only that is zonked. See setTcTyConKind - (kind, [], kind, False) + ([], kind, False) | otherwise - = (kind, bndrs, res_kind, closed) + = (bndrs, res_kind, closed) {- ----------------------------------------------- diff --git a/compiler/GHC/Core/Type.hs b/compiler/GHC/Core/Type.hs index a3bf436ac8..2f621a8694 100644 --- a/compiler/GHC/Core/Type.hs +++ b/compiler/GHC/Core/Type.hs @@ -1488,7 +1488,7 @@ tyConAppResKind tc args tyConAppResKind tc args = go1 tc_bndrs args where - !(_, tc_bndrs, !tc_res_kind, closed_res_kind) = tyConTypeKindPieces tc + !(tc_bndrs, !tc_res_kind, closed_res_kind) = tyConTypeKindPieces tc init_subst = mkEmptySubst $ mkInScopeSet (tyCoVarsOfTypes args) go1 :: [TyConBinder] -> [Type] -> Type |