recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 8ad34dc4 by Recursion Ninja at 2026-06-26T13:48:24-04:00 Monomorphising GHC pass parameters where appropriate - - - - - 4 changed files: - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Rename/Pat.hs - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Iface/Syntax.hs ===================================== @@ -671,7 +671,7 @@ fromIfaceWarningTxt = \case fromIfaceStringLiteralWithNames :: (IfaceStringLiteral, [IfExtName]) -> WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLoc names) -fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral (GhcPass p) +fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral GhcRn fromIfaceStringLiteral (IfStringLiteral st fs) = StringLiteral st fs ===================================== compiler/GHC/Iface/Warnings.hs ===================================== @@ -28,6 +28,6 @@ toIfaceWarningTxt (DeprecatedTxt src strs) = IfDeprecatedTxt src (map (toIfaceSt toIfaceStringLiteralWithNames :: WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn -> (IfaceStringLiteral, [IfExtName]) toIfaceStringLiteralWithNames (WithHsDocIdentifiers src names) = (toIfaceStringLiteral src, map unLoc names) -toIfaceStringLiteral :: StringLiteral (GhcPass p) -> IfaceStringLiteral +toIfaceStringLiteral :: StringLiteral GhcRn -> IfaceStringLiteral toIfaceStringLiteral sLit = IfStringLiteral (stringLitSourceText sLit) (sl_fs sLit) ===================================== compiler/GHC/Rename/Pat.hs ===================================== @@ -1026,7 +1026,7 @@ getFieldIds flds = map (hsRecFieldSel . unLoc) flds getFieldRdrs :: [LHsRecField GhcRn arg] -> [RdrName] getFieldRdrs flds = map (foExt . unXRec @GhcRn . hfbLHS . unLoc) flds -getFieldLbls :: [LHsRecField (GhcPass p) arg] -> [IdGhcP p] +getFieldLbls :: [LHsRecField GhcRn arg] -> [IdGhcP p] getFieldLbls flds = map (unLoc . foLabel . unLoc . hfbLHS . unLoc) flds ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1584,7 +1584,7 @@ instance ExactPrint (LocatedP (WarningTxt GhcPs)) where c' <- markEpToken c return (L (EpAnn l (AnnPragma o' c' (os',cs') l1 l2 t m) css) (DeprecatedTxt src ws')) -instance Typeable p => ExactPrint (InWarningCategory (GhcPass p)) where +instance Typeable p => ExactPrint (InWarningCategory GhcPs) where getAnnotationEntry _ = NoEntryVal setAnnotationAnchor a _ _ _ = a @@ -1969,7 +1969,7 @@ exactNsSpec (DataNamespaceSpecifier data_) = do -- --------------------------------------------------------------------- -instance Typeable p => ExactPrint (StringLiteral (GhcPass p)) where +instance Typeable p => ExactPrint (StringLiteral GhcPs) where getAnnotationEntry = const NoEntryVal setAnnotationAnchor a _ _ _ = a View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ad34dc4449f5bbd7e75785cb35e7100... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ad34dc4449f5bbd7e75785cb35e7100... You're receiving this email because of your account on gitlab.haskell.org.