- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/floatout-verbosity-check] compiler: avoid unneeded traversals in GHC.Unit.State
by Cheng Shao (＠TerrorJack) 02 Mar '26

02 Mar '26

Cheng Shao pushed to branch wip/floatout-verbosity-check at Glasgow Haskell Compiler / GHC Commits: 8da5121c by Cheng Shao at 2026-03-02T21:42:28+00:00 compiler: avoid unneeded traversals in GHC.Unit.State Following !15591, this patch avoids unneeded traversals in `reportCycles`/`reportUnusable` when log verbosity is below given threshold. Also applies `logVerbAtLeast` when appropriate. Co-authored-by: Codex <codex(a)openai.com> - - - - - 2 changed files: - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Error.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1279,7 +1279,7 @@ pprReason pref reason = case reason of nest 2 (hsep (map ppr deps)) reportCycles :: Logger -> [SCC UnitInfo] -> IO () -reportCycles logger sccs = mapM_ report sccs +reportCycles logger sccs = when (logVerbAtLeast logger 2) $ mapM_ report sccs where report (AcyclicSCC _) = return () report (CyclicSCC vs) = @@ -1288,7 +1288,7 @@ reportCycles logger sccs = mapM_ report sccs nest 2 (hsep (map (ppr . unitId) vs)) reportUnusable :: Logger -> UnusableUnits -> IO () -reportUnusable logger pkgs = mapM_ report (nonDetUniqMapToList pkgs) +reportUnusable logger pkgs = when (logVerbAtLeast logger 2) $ mapM_ report (nonDetUniqMapToList pkgs) where report (ipid, (_, reason)) = debugTraceMsg logger 2 $ @@ -1389,7 +1389,7 @@ mergeDatabases logger = foldM merge (emptyUniqMap, emptyUniqMap) . zip [1..] merge (pkg_map, prec_map) (i, UnitDatabase db_path db) = do debugTraceMsg logger 2 $ text "loading package database" <+> ppr db_path - when (log_verbosity (logFlags logger) >= 2) $ + when (logVerbAtLeast logger 2) $ forM_ (Set.toList override_set) $ \pkg -> debugTraceMsg logger 2 $ text "package" <+> ppr pkg <+> ===================================== compiler/GHC/Utils/Error.hs ===================================== @@ -463,7 +463,7 @@ withTiming' logger what force_result prtimings action debugTraceMsg :: Logger -> Int -> SDoc -> IO () debugTraceMsg logger val msg = - when (log_verbosity (logFlags logger) >= val) $ + when (logVerbAtLeast logger val) $ logInfo logger (withPprStyle defaultDumpStyle msg) {-# INLINE debugTraceMsg #-} -- see Note [INLINE conditional tracing utilities] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8da5121cf870d86854281e69c430847… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8da5121cf870d86854281e69c430847… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Clean up join points, casts & ticks
by Marge Bot (＠marge-bot) 02 Mar '26

02 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 08bc245b by sheaf at 2026-03-01T11:11:54-05:00 Clean up join points, casts & ticks This commit shores up the logic dealing with casts and ticks occurring in between a join point binding and a jump. Fixes #26642 #26929 #26693 Makes progress on #14610 #26157 #26422 Changes: - Remove 'GHC.Types.Tickish.TickishScoping' in favour of simpler predicates 'tickishHasNoScope'/'tickishHasSoftScope', as things were before commit 993975d3. This makes the code easier to read and document (fewer indirections). - Introduce 'canCollectArgsThroughTick' for consistent handling of ticks around PrimOps and other 'Id's that cannot be eta-reduced. See overhauled Note [Ticks and mandatory eta expansion]. - New Note [JoinId vs TailCallInfo] in GHC.Core.SimpleOpt that explains robustness of JoinId vs fragility of TailCallInfo. - Allow casts/non-soft-scoped ticks to occur in between a join point binder and a jump, but only in Core Prep. See Note [Join points, casts, and ticks] and Note [Join points, casts, and ticks... in Core Prep] in GHC.Core.Opt.Simplify.Iteration. Also update Core Lint to account for this. See Note [Linting join points with casts or ticks] in GHC.Core.Lint. - Update 'GHC.Core.Utils.mergeCaseAlts' to avoid pushing a cast in between a join point binding and its jumps. This fixes #26642. See the new (MC5) and (MC6) in Note [Merge Nested Cases]. - Update float out to properly handle source note ticks. They are now properly floated out instead of being discarded. This increases the number of ticks in certain tests with -g. Test cases: T26642 and TrickyJoins. Metric increase due to more source note ticks with -g: ------------------------- Metric Increase: libdir size_hello_artifact size_hello_unicode ------------------------- - - - - - 476c4cdf by Sean D. Gillespie at 2026-03-02T10:14:37-05:00 Add SIMD absolute value on x86 and LLVM On x86, absolute value of 32 bits or less is implemented with PABSB/PABSW/PABSD if SSSE3 is available. Otherwise, there is a fallback for SSE2. For 64 bit integers it uses VPABSQ, required by AVX-512VL, with fallbacks for SSE4.2 and SSE2. There is no dedicated instruction for floating point absolute value on x86, so it is simulated using bitwise AND. Absolute value for signed integers and floats are implemented by the "llvm.abs/llvm.fabs" standard library intrinsics. This implementation uses MachOps constructors, unlike non-vector floating point absolute value, which uses CallishMachOps. - - - - - 709448c0 by Sean D. Gillespie at 2026-03-02T10:14:46-05:00 Add SIMD floating point square root On x86, this is implemented with the SQRTPS and SQRTPD instructions. On LLVM, it uses the sqrt library intrinstic. - - - - - 0deadf66 by Sean D. Gillespie at 2026-03-02T10:14:47-05:00 Improve error message for SIMD on aarch64 When encountering vector literals on aarch64, previously it would throw: <no location info>: error: panic! (the 'impossible' happened) GHC version 9.15.20251219: getRegister' (CmmLit:CmmVec): Now it is more consistent with the other vector operations: <no location info>: error: sorry! (unimplemented feature or known bug) GHC version 9.15.20251219: SIMD operations on AArch64 currently require the LLVM backend - - - - - a1280207 by Vladislav Zavialov at 2026-03-02T16:07:36-05:00 Replace maybeAddSpace with spaceIfSingleQuote Simplify pretty-printing of HsTypes by using spaceIfSingleQuote. This allows us to drop the unwieldy lhsTypeHasLeadingPromotionQuote helper function. Follow-up to 178c1fd830c78377ef5d338406a41e1d8eb5f0da - - - - - 63 changed files: - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/Cmm/MachOp.hs - compiler/GHC/Cmm/Node.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - compiler/GHC/CmmToC.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/Config/Core/Lint.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/StgToCmm/Expr.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/StgToJS/Prim.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/Tickish.hs - libraries/base/src/GHC/Base.hs - libraries/base/src/GHC/Exts.hs - libraries/ghc-experimental/CHANGELOG.md - testsuite/tests/codeGen/should_compile/debug.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/interface-stability/ghc-prim-exports.stdout - testsuite/tests/interface-stability/ghc-prim-exports.stdout-mingw32 - testsuite/tests/simd/should_run/doublex2_arith.hs - testsuite/tests/simd/should_run/doublex2_arith.stdout - testsuite/tests/simd/should_run/doublex2_arith_baseline.hs - testsuite/tests/simd/should_run/doublex2_arith_baseline.stdout - testsuite/tests/simd/should_run/floatx4_arith.hs - testsuite/tests/simd/should_run/floatx4_arith.stdout - testsuite/tests/simd/should_run/floatx4_arith_baseline.hs - testsuite/tests/simd/should_run/floatx4_arith_baseline.stdout - testsuite/tests/simd/should_run/int16x8_arith.hs - testsuite/tests/simd/should_run/int16x8_arith.stdout - testsuite/tests/simd/should_run/int16x8_arith_baseline.hs - testsuite/tests/simd/should_run/int16x8_arith_baseline.stdout - testsuite/tests/simd/should_run/int32x4_arith.hs - testsuite/tests/simd/should_run/int32x4_arith.stdout - testsuite/tests/simd/should_run/int32x4_arith_baseline.hs - testsuite/tests/simd/should_run/int32x4_arith_baseline.stdout - testsuite/tests/simd/should_run/int64x2_arith.hs - testsuite/tests/simd/should_run/int64x2_arith.stdout - testsuite/tests/simd/should_run/int64x2_arith_baseline.hs - testsuite/tests/simd/should_run/int64x2_arith_baseline.stdout - testsuite/tests/simd/should_run/int8x16_arith.hs - testsuite/tests/simd/should_run/int8x16_arith.stdout - testsuite/tests/simd/should_run/int8x16_arith_baseline.hs - testsuite/tests/simd/should_run/int8x16_arith_baseline.stdout - + testsuite/tests/simplCore/should_compile/T26642.hs - + testsuite/tests/simplCore/should_compile/TrickyJoins.hs - testsuite/tests/simplCore/should_compile/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77b48b37fa767a00d747419c0483af… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77b48b37fa767a00d747419c0483af… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/longpath-aware-manifest] Add `-fwin-aware-long-paths` to support ling paths on Windows
by Hannes Siebenhandl (＠fendor) 02 Mar '26

02 Mar '26

Hannes Siebenhandl pushed to branch wip/fendor/longpath-aware-manifest at Glasgow Haskell Compiler / GHC Commits: e23169ef by Fendor at 2026-03-02T21:37:51+01:00 Add `-fwin-aware-long-paths` to support ling paths on Windows While Windows supports file paths longer than the MAX_PATH restriction, it is opt-in, and not enabled by default. By declaring the binary to be long path aware in the manifest of the windows executable, the binary opts-in to the new behaviour. It is up to the developer to make sure they use UNC paths and Win.h specific functions for filesystem operations to use long paths in their application. See https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-li… and https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests for the documentation on the application manifest and long path option. - - - - - 5 changed files: - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Linker/Windows.hs - docs/users_guide/phases.rst Changes: ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -1210,6 +1210,7 @@ defaultFlags settings = [ Opt_AutoLinkPackages, Opt_DiagnosticsShowCaret, Opt_EmbedManifest, + Opt_WinLongPathAware, Opt_FamAppCache, Opt_GenManifest, Opt_GhciHistory, ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -744,6 +744,7 @@ data GeneralFlag | Opt_PrintBindContents | Opt_GenManifest | Opt_EmbedManifest + | Opt_WinLongPathAware | Opt_SharedImplib | Opt_BuildingCabalPackage | Opt_IgnoreDotGhci ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -2525,6 +2525,7 @@ fFlagsDeps = [ flagSpec "eager-blackholing" Opt_EagerBlackHoling, flagSpec "orig-thunk-info" Opt_OrigThunkInfo, flagSpec "embed-manifest" Opt_EmbedManifest, + flagSpec "win-aware-long-paths" Opt_WinLongPathAware, flagSpec "enable-rewrite-rules" Opt_EnableRewriteRules, flagSpec "enable-th-splice-warnings" Opt_EnableThSpliceWarnings, flagSpec "error-spans" Opt_ErrorSpans, ===================================== compiler/GHC/Linker/Windows.hs ===================================== @@ -16,6 +16,7 @@ import System.Directory data ManifestOpts = ManifestOpts { manifestEmbed :: !Bool -- ^ Should the manifest be embedded in the binary with Windres + , manifestLongPathAware :: !Bool , manifestTempdir :: TempDir , manifestWindresConfig :: WindresConfig , manifestObjectSuf :: String @@ -24,6 +25,7 @@ data ManifestOpts = ManifestOpts initManifestOpts :: DynFlags -> ManifestOpts initManifestOpts dflags = ManifestOpts { manifestEmbed = gopt Opt_EmbedManifest dflags + , manifestLongPathAware = gopt Opt_WinLongPathAware dflags , manifestTempdir = tmpDir dflags , manifestWindresConfig = configureWindres dflags , manifestObjectSuf = objectSuf dflags @@ -37,21 +39,7 @@ maybeCreateManifest -> IO [FilePath] -- ^ extra objects to embed, maybe maybeCreateManifest logger tmpfs opts exe_filename = do let manifest_filename = exe_filename <.> "manifest" - manifest = - "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n\ - \ <assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n\ - \ <assemblyIdentity version=\"1.0.0.0\"\n\ - \ processorArchitecture=\"X86\"\n\ - \ name=\"" ++ dropExtension exe_filename ++ "\"\n\ - \ type=\"win32\"/>\n\n\ - \ <trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\">\n\ - \ <security>\n\ - \ <requestedPrivileges>\n\ - \ <requestedExecutionLevel level=\"asInvoker\" uiAccess=\"false\"/>\n\ - \ </requestedPrivileges>\n\ - \ </security>\n\ - \ </trustInfo>\n\ - \</assembly>\n" + manifest = manifestContents (manifestLongPathAware opts) exe_filename writeFile manifest_filename manifest @@ -80,3 +68,36 @@ maybeCreateManifest logger tmpfs opts exe_filename = do removeFile manifest_filename return [rc_obj_filename] + +manifestContents :: Bool -> FilePath -> String +manifestContents longPathAware exe_filename = + unlines $ + [ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + , " <assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" + , " <assemblyIdentity version=\"1.0.0.0\"" + , " processorArchitecture=\"X86\"" + , " name=\"" ++ dropExtension exe_filename ++ "\"" + , " type=\"win32\"/>" + , " <trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\">" + , " <security>" + , " <requestedPrivileges>" + , " <requestedExecutionLevel level=\"asInvoker\" uiAccess=\"false\"/>" + , " </requestedPrivileges>" + , " </security>" + , " </trustInfo>" + ] + ++ + ( + if longPathAware + then + [ " <application xmlns=\"urn:schemas-microsoft-com:asm.v3\">" + , " <windowsSettings xmlns:ws2=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">" + , " <ws2:longPathAware>true</ws2:longPathAware>" + , " </windowsSettings>" + , " </application>" + ] + else + [] + ) ++ + [ " </assembly>" + ] ===================================== docs/users_guide/phases.rst ===================================== @@ -1430,6 +1430,29 @@ for example). See also :ghc-flag:`-pgmwindres ⟨cmd⟩` (:ref:`replacing-phases`) and :ghc-flag:`-optwindres ⟨option⟩` (:ref:`forcing-options-through`). +.. ghc-flag:: -fwin-aware-long-paths + :shortdesc: Declare the linked binary to be long path aware on Windows. + :reverse: -fno-win-aware-long-paths + :type: dynamic + :category: linking + :since: 9.14.2 + + Declare in the manifest file that GHC generates when linking a binary on Windows + to be aware of long paths. + + Windows paths usually have a `MAX_PATH <https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-li…>`__ + limit of 260 characters. + This limitation can be lifted by opting into enabling long paths in various + ways, see `Enable long paths in Windows 10 and later`_. + + To invoke the compiled program with long paths, the Windows manifest needs + to declare that the program is aware of long paths and can handle them + appropriately. + + :ghc-flag:`-fno-embed-manifest` also implies :ghc-flag:`-fno-win-aware-long-paths`. + + _Enable long paths in Windows 10 and later: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-li… + .. ghc-flag:: -fno-shared-implib :shortdesc: Don't generate an import library for a DLL (Windows only) :type: dynamic View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e23169efcda88936d05b0660b066645… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e23169efcda88936d05b0660b066645… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/floatout-verbosity-check
by Cheng Shao (＠TerrorJack) 02 Mar '26

02 Mar '26

Cheng Shao pushed new branch wip/floatout-verbosity-check at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/floatout-verbosity-check You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-head
by Cheng Shao (＠TerrorJack) 02 Mar '26

02 Mar '26

Cheng Shao pushed new branch wip/fix-head at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-head You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/andreask/div_test
by Andreas Klebinger (＠AndreasK) 02 Mar '26

02 Mar '26

Andreas Klebinger pushed new branch wip/andreask/div_test at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/andreask/div_test You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26971] Adding WIP decoupling of L.H.S and GHC.Hs.Doc
by recursion-ninja (＠recursion-ninja) 02 Mar '26

02 Mar '26

recursion-ninja pushed to branch wip/fix-26971 at Glasgow Haskell Compiler / GHC Commits: 273fba40 by Recursion Ninja at 2026-03-02T09:19:17-05:00 Adding WIP decoupling of L.H.S and GHC.Hs.Doc - - - - - 19 changed files: - compiler/GHC/Hs/Basic.hs - compiler/GHC/Hs/Doc.hs - − compiler/GHC/Hs/Doc.hs-boot - compiler/GHC/Hs/DocString.hs - compiler/GHC/Hs/Extension.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax/Decls.hs - + compiler/Language/Haskell/Syntax/Doc.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - + compiler/Language/Haskell/Syntax/UTF8.hs - compiler/ghc.cabal.in Changes: ===================================== compiler/GHC/Hs/Basic.hs ===================================== @@ -14,7 +14,7 @@ import GHC.Prelude import GHC.Utils.Outputable import GHC.Utils.Binary import GHC.Types.Name -import GHC.Parser.Annotation +--import GHC.Parser.Annotation import GHC.Utils.Misc ((<||>)) import Data.Data (Data) @@ -86,8 +86,8 @@ instance Binary FixityDirection where -- @ data NamespaceSpecifier = NoNamespaceSpecifier - | TypeNamespaceSpecifier (EpToken "type") - | DataNamespaceSpecifier (EpToken "data") + | TypeNamespaceSpecifier () -- (EpToken "type") + | DataNamespaceSpecifier () --(EpToken "data") deriving (Eq, Data) -- | Check if namespace specifiers overlap, i.e. if they are equal or ===================================== compiler/GHC/Hs/Doc.hs ===================================== @@ -32,6 +32,7 @@ import GHC.Data.EnumSet (EnumSet) import GHC.Types.Avail import GHC.Types.Name.Set import GHC.Driver.Flags +import GHC.Parser.Annotation import Control.DeepSeq import Data.Data @@ -49,29 +50,15 @@ import Data.Function import GHC.Hs.DocString +import Language.Haskell.Syntax.Doc import Language.Haskell.Syntax.Extension import Language.Haskell.Syntax.Module.Name --- | A docstring with the (probable) identifiers found in it. -type HsDoc = WithHsDocIdentifiers HsDocString +deriving instance Eq a => Eq (WithHsDocIdentifiers a GhcPs) +deriving instance Eq a => Eq (WithHsDocIdentifiers a GhcRn) +deriving instance Eq a => Eq (WithHsDocIdentifiers a GhcTc) --- | Annotate a value with the probable identifiers found in it --- These will be used by haddock to generate links. --- --- The identifiers are bundled along with their location in the source file. --- This is useful for tooling to know exactly where they originate. --- --- This type is currently used in two places - for regular documentation comments, --- with 'a' set to 'HsDocString', and for adding identifier information to --- warnings, where 'a' is 'StringLiteral' -data WithHsDocIdentifiers a pass = WithHsDocIdentifiers - { hsDocString :: !a - , hsDocIdentifiers :: ![Located (IdP pass)] - } - -deriving instance (Data pass, Data (IdP pass), Data a) => Data (WithHsDocIdentifiers a pass) -deriving instance (Eq (IdP pass), Eq a) => Eq (WithHsDocIdentifiers a pass) -instance (NFData (IdP pass), NFData a) => NFData (WithHsDocIdentifiers a pass) where +instance (NFData (LIdP (GhcPass pass)), NFData a) => NFData (WithHsDocIdentifiers a (GhcPass pass)) where rnf (WithHsDocIdentifiers d i) = rnf d `seq` rnf i -- | For compatibility with the existing @-ddump-parsed' output, we only show @@ -81,12 +68,26 @@ instance (NFData (IdP pass), NFData a) => NFData (WithHsDocIdentifiers a pass) w instance Outputable a => Outputable (WithHsDocIdentifiers a pass) where ppr (WithHsDocIdentifiers s _ids) = ppr s -instance Binary a => Binary (WithHsDocIdentifiers a GhcRn) where +{- +instance forall a . (Binary a, Binary (Anno Name)) => Binary (WithHsDocIdentifiers a (GhcRn)) where put_ bh (WithHsDocIdentifiers s ids) = do put_ bh s - put_ bh $ BinLocated <$> (sortBy (stableNameCmp `on` getName) ids) + put_ bh $ BinGenLocated <$> ids +-- put_ bh ids get bh = - liftA2 WithHsDocIdentifiers (get bh) (fmap unBinLocated <$> get bh) + liftA2 (WithHsDocIdentifiers :: a -> [LIdP (GhcPass p)] -> WithHsDocIdentifiers a (GhcPass p)) (get bh) (fmap unBinGenLocated <$> get bh) +-} +{- +ids = [GenLocated (Anno Name) Name] + = [GenLocated (SrcSpanAnnN) Name] + = [GenLocated (EpAnn NameAnn) Name] + + +[LIdP GhcRn] = [XRec GhcRn (IdP GhcRn)] + = [XRec GhcRn (IdGhcP 'Renamed)] + = [XRec GhcRn Name] +-} + -- | Extract a mapping from the lexed identifiers to the names they may -- correspond to. @@ -98,22 +99,21 @@ hsDocIds (WithHsDocIdentifiers _ ids) = mkNameSet $ map unLoc ids -- and will come either before or after depending on how it was written -- i.e it will come after the thing if it is a '-- ^' or '{-^' and before -- otherwise. -pprWithDoc :: LHsDoc name -> SDoc -> SDoc +pprWithDoc :: LHsDoc (GhcPass name) -> SDoc -> SDoc pprWithDoc doc = pprWithDocString (hsDocString $ unLoc doc) -- | See 'pprWithHsDoc' -pprMaybeWithDoc :: Maybe (LHsDoc name) -> SDoc -> SDoc +pprMaybeWithDoc :: Maybe (LHsDoc (GhcPass name)) -> SDoc -> SDoc pprMaybeWithDoc Nothing = id pprMaybeWithDoc (Just doc) = pprWithDoc doc -- | Print a doc with its identifiers, useful for debugging -pprHsDocDebug :: (Outputable (IdP name)) => HsDoc name -> SDoc +pprHsDocDebug :: HsDoc (GhcPass name) -> SDoc pprHsDocDebug (WithHsDocIdentifiers s ids) = vcat [ text "text:" $$ nest 2 (pprHsDocString s) - , text "identifiers:" $$ nest 2 (vcat (map pprLocatedAlways ids)) +-- , text "identifiers:" $$ nest 2 (vcat (map pprLocatedAlways ids)) ] - -type LHsDoc pass = Located (HsDoc pass) +-- XRec p (IdP p) -- | A simplified version of 'HsImpExp.IE'. data DocStructureItem @@ -136,6 +136,7 @@ data DocStructureItem -- ^ Invariant: This list of Avails must be sorted -- to guarantee interface file determinism. +{- instance Binary DocStructureItem where put_ bh = \case DsiSectionHeading level doc -> do @@ -165,6 +166,7 @@ instance Binary DocStructureItem where 3 -> DsiExports <$> get bh 4 -> DsiModExport <$> get bh <*> get bh _ -> fail "instance Binary DocStructureItem: Invalid tag" +-} instance Outputable DocStructureItem where ppr = \case @@ -185,8 +187,8 @@ instance Outputable DocStructureItem where instance NFData DocStructureItem where rnf = \case - DsiSectionHeading level doc -> rnf level `seq` rnf doc - DsiDocChunk doc -> rnf doc + DsiSectionHeading level !doc -> rnf level -- `seq` rnf doc + DsiDocChunk !doc -> () -- rnf doc DsiNamedChunkRef name -> rnf name DsiExports avails -> rnf avails DsiModExport mod_names avails -> rnf mod_names `seq` rnf avails @@ -220,10 +222,16 @@ data Docs = Docs instance NFData Docs where rnf (Docs mod_hdr exps decls args structure named_chunks haddock_opts language extentions) +{- = rnf mod_hdr `seq` rnf exps `seq` rnf decls `seq` rnf args `seq` rnf structure `seq` rnf named_chunks `seq` rnf haddock_opts `seq` rnf language `seq` rnf extentions `seq` () +-} + = rnf structure + `seq` rnf haddock_opts `seq` rnf language `seq` rnf extentions + `seq` () +{- instance Binary Docs where put_ bh docs = do put_ bh (docs_mod_hdr docs) @@ -255,6 +263,7 @@ instance Binary Docs where , docs_language = language , docs_extensions = exts } +-} instance Outputable Docs where ppr docs = ===================================== compiler/GHC/Hs/Doc.hs-boot deleted ===================================== @@ -1,18 +0,0 @@ -module GHC.Hs.Doc where - --- See #21592 for progress on removing this boot file. - -import GHC.Types.SrcLoc -import GHC.Hs.DocString -import Data.Kind - -type role WithHsDocIdentifiers representational nominal -type WithHsDocIdentifiers :: Type -> Type -> Type -data WithHsDocIdentifiers a pass - -type HsDoc :: Type -> Type -type HsDoc = WithHsDocIdentifiers HsDocString - -type LHsDoc :: Type -> Type -type LHsDoc pass = Located (HsDoc pass) - ===================================== compiler/GHC/Hs/DocString.hs ===================================== @@ -1,8 +1,11 @@ +{-# LANGUAGE TypeFamilies #-} + -- | An exactprintable structure for docstrings module GHC.Hs.DocString ( LHsDocString , HsDocString(..) + , HsDocStringGhc , HsDocStringDecorator(..) , HsDocStringChunk(..) , LHsDocStringChunk @@ -23,6 +26,8 @@ module GHC.Hs.DocString import GHC.Prelude +import GHC.Hs.Extension + import GHC.Utils.Binary import GHC.Utils.Encoding import GHC.Utils.Outputable as Outputable hiding ((<>)) @@ -34,9 +39,16 @@ import qualified Data.ByteString as BS import Data.Data import Data.List.NonEmpty (NonEmpty(..)) import Data.List (intercalate) +import Data.Void + +import Language.Haskell.Syntax.Doc +import Language.Haskell.Syntax.Extension + +type LHsDocString pass = Located (HsDocString pass) -type LHsDocString = Located HsDocString +type HsDocStringGhc = HsDocString Void +{- -- | Haskell Documentation String -- -- Rich structure to support exact printing @@ -56,62 +68,81 @@ data HsDocString -- This is because it may contain unbalanced pairs of '{-' and '-}' and -- not form a valid 'NestedDocString' deriving (Eq, Data, Show) +-} -instance Outputable HsDocString where - ppr = text . renderHsDocString +type instance XMultiLineDocString (GhcPass p) = NoExtField +type instance XNestedDocString (GhcPass p) = NoExtField +type instance XGeneratedDocString (GhcPass p) = NoExtField +type instance XXHsDocString (GhcPass p) = DataConCantHappen +{- instance NFData HsDocString where rnf (MultiLineDocString a b) = rnf a `seq` rnf b rnf (NestedDocString a b) = rnf a `seq` rnf b rnf (GeneratedDocString a) = rnf a +-} +deriving stock instance Eq (HsDocString (GhcPass pass)) +-- deriving stock instance Show (HsDocString (GhcPass pass)) --- | Annotate a pretty printed thing with its doc --- The docstring comes after if is 'HsDocStringPrevious' --- Otherwise it comes before. --- Note - we convert MultiLineDocString HsDocStringPrevious to HsDocStringNext --- because we can't control if something else will be pretty printed on the same line -pprWithDocString :: HsDocString -> SDoc -> SDoc -pprWithDocString (MultiLineDocString HsDocStringPrevious ds) sd = pprWithDocString (MultiLineDocString HsDocStringNext ds) sd -pprWithDocString doc@(NestedDocString HsDocStringPrevious _) sd = sd <+> pprHsDocString doc -pprWithDocString doc sd = pprHsDocString doc $+$ sd - - -instance Binary HsDocString where +instance Binary (HsDocString (GhcPass p)) where put_ bh x = case x of - MultiLineDocString dec xs -> do + MultiLineDocString _ dec xs -> do putByte bh 0 put_ bh dec put_ bh $ BinLocated <$> xs - NestedDocString dec x -> do + NestedDocString _ dec x -> do putByte bh 1 put_ bh dec put_ bh $ BinLocated x - GeneratedDocString x -> do + GeneratedDocString _ x -> do putByte bh 2 put_ bh x get bh = do tag <- getByte bh case tag of - 0 -> MultiLineDocString <$> get bh <*> (fmap unBinLocated <$> get bh) - 1 -> NestedDocString <$> get bh <*> (unBinLocated <$> get bh) - 2 -> GeneratedDocString <$> get bh + 0 -> MultiLineDocString NoExtField <$> get bh <*> (fmap unBinLocated <$> get bh) + 1 -> NestedDocString NoExtField <$> get bh <*> (unBinLocated <$> get bh) + 2 -> GeneratedDocString NoExtField <$> get bh t -> fail $ "HsDocString: invalid tag " ++ show t +instance NFData (HsDocString (GhcPass pass)) where + rnf = \case + MultiLineDocString NoExtField a b -> rnf a `seq` rnf b + NestedDocString NoExtField a b -> rnf a `seq` rnf b + GeneratedDocString NoExtField a -> rnf a + +instance Outputable (HsDocString (GhcPass p)) where + ppr = text . renderHsDocString + +-- | Annotate a pretty printed thing with its doc +-- The docstring comes after if is 'HsDocStringPrevious' +-- Otherwise it comes before. +-- Note - we convert MultiLineDocString HsDocStringPrevious to HsDocStringNext +-- because we can't control if something else will be pretty printed on the same line +pprWithDocString :: HsDocString (GhcPass p) -> SDoc -> SDoc +pprWithDocString (MultiLineDocString x HsDocStringPrevious ds) sd = pprWithDocString (MultiLineDocString x HsDocStringNext ds) sd +pprWithDocString doc@(NestedDocString _ HsDocStringPrevious _) sd = sd <+> pprHsDocString doc +pprWithDocString doc sd = pprHsDocString doc $+$ sd + +{- data HsDocStringDecorator = HsDocStringNext -- ^ '|' is the decorator | HsDocStringPrevious -- ^ '^' is the decorator | HsDocStringNamed !String -- ^ '$<string>' is the decorator | HsDocStringGroup !Int -- ^ The decorator is the given number of '*'s deriving (Eq, Ord, Show, Data) +-} instance Outputable HsDocStringDecorator where ppr = text . printDecorator +{- instance NFData HsDocStringDecorator where rnf HsDocStringNext = () rnf HsDocStringPrevious = () rnf (HsDocStringNamed x) = rnf x rnf (HsDocStringGroup x) = rnf x +-} printDecorator :: HsDocStringDecorator -> String printDecorator HsDocStringNext = "|" @@ -134,20 +165,26 @@ instance Binary HsDocStringDecorator where 3 -> HsDocStringGroup <$> get bh t -> fail $ "HsDocStringDecorator: invalid tag " ++ show t +{- type LHsDocStringChunk = Located HsDocStringChunk -- | A contiguous chunk of documentation newtype HsDocStringChunk = HsDocStringChunk ByteString deriving stock (Eq,Ord,Data, Show) deriving newtype (NFData) +-} + +type instance Anno HsDocStringChunk = SrcSpan instance Binary HsDocStringChunk where put_ bh (HsDocStringChunk bs) = put_ bh bs get bh = HsDocStringChunk <$> get bh + instance Outputable HsDocStringChunk where ppr = text . unpackHDSC +{- mkHsDocStringChunk :: String -> HsDocStringChunk mkHsDocStringChunk s = HsDocStringChunk (utf8EncodeByteString s) @@ -163,41 +200,42 @@ nullHDSC (HsDocStringChunk bs) = BS.null bs mkGeneratedHsDocString :: String -> HsDocString mkGeneratedHsDocString = GeneratedDocString . mkHsDocStringChunk +-} -isEmptyDocString :: HsDocString -> Bool -isEmptyDocString (MultiLineDocString _ xs) = all (nullHDSC . unLoc) xs -isEmptyDocString (NestedDocString _ s) = nullHDSC $ unLoc s -isEmptyDocString (GeneratedDocString x) = nullHDSC x +isEmptyDocString :: HsDocString (GhcPass p) -> Bool +isEmptyDocString (MultiLineDocString _ _ xs) = all (nullHDSC . unLoc) xs +isEmptyDocString (NestedDocString _ _ s) = nullHDSC $ unLoc s +isEmptyDocString (GeneratedDocString _ x) = nullHDSC x -docStringChunks :: HsDocString -> [LHsDocStringChunk] -docStringChunks (MultiLineDocString _ (x:|xs)) = x:xs -docStringChunks (NestedDocString _ x) = [x] -docStringChunks (GeneratedDocString x) = [L (UnhelpfulSpan UnhelpfulGenerated) x] +docStringChunks :: HsDocString (GhcPass p) -> [LHsDocStringChunk (GhcPass p)] +docStringChunks (MultiLineDocString _ _ (x:|xs)) = x:xs +docStringChunks (NestedDocString _ _ x) = [x] +docStringChunks (GeneratedDocString _ x) = [L (UnhelpfulSpan UnhelpfulGenerated) x] -- | Pretty print with decorators, exactly as the user wrote it -pprHsDocString :: HsDocString -> SDoc +pprHsDocString :: HsDocString (GhcPass p) -> SDoc pprHsDocString = text . exactPrintHsDocString -pprHsDocStrings :: [HsDocString] -> SDoc +pprHsDocStrings :: [HsDocString (GhcPass p)] -> SDoc pprHsDocStrings = text . intercalate "\n\n" . map exactPrintHsDocString -- | Pretty print with decorators, exactly as the user wrote it -exactPrintHsDocString :: HsDocString -> String -exactPrintHsDocString (MultiLineDocString dec (x :| xs)) +exactPrintHsDocString :: HsDocString (GhcPass p) -> String +exactPrintHsDocString (MultiLineDocString _ dec (x :| xs)) = unlines' $ ("-- " ++ printDecorator dec ++ unpackHDSC (unLoc x)) : map (\x -> "--" ++ unpackHDSC (unLoc x)) xs -exactPrintHsDocString (NestedDocString dec (L _ s)) +exactPrintHsDocString (NestedDocString _ dec (L _ s)) = "{-" ++ printDecorator dec ++ unpackHDSC s ++ "-}" -exactPrintHsDocString (GeneratedDocString x) = case lines (unpackHDSC x) of +exactPrintHsDocString (GeneratedDocString _ x) = case lines (unpackHDSC x) of [] -> "" (x:xs) -> unlines' $ ( "-- |" ++ x) : map (\y -> "--"++y) xs -- | Just get the docstring, without any decorators -renderHsDocString :: HsDocString -> String -renderHsDocString (MultiLineDocString _ (x :| xs)) = unlines' $ map (unpackHDSC . unLoc) (x:xs) -renderHsDocString (NestedDocString _ ds) = unpackHDSC $ unLoc ds -renderHsDocString (GeneratedDocString x) = unpackHDSC x +renderHsDocString :: HsDocString (GhcPass p) -> String +renderHsDocString (MultiLineDocString _ _ (x :| xs)) = unlines' $ map (unpackHDSC . unLoc) (x:xs) +renderHsDocString (NestedDocString _ _ ds) = unpackHDSC $ unLoc ds +renderHsDocString (GeneratedDocString _ x) = unpackHDSC x -- | Don't add a newline to a single string unlines' :: [String] -> String @@ -205,5 +243,5 @@ unlines' = intercalate "\n" -- | Just get the docstring, without any decorators -- Separates docstrings using "\n\n", which is how haddock likes to render them -renderHsDocStrings :: [HsDocString] -> String +renderHsDocStrings :: [HsDocString (GhcPass p)] -> String renderHsDocStrings = intercalate "\n\n" . map renderHsDocString ===================================== compiler/GHC/Hs/Extension.hs ===================================== @@ -21,7 +21,7 @@ import GHC.Types.Var import GHC.Utils.Outputable hiding ((<>)) import GHC.Types.SrcLoc (GenLocated(..), unLoc) import GHC.Utils.Panic -import GHC.Parser.Annotation +--import GHC.Parser.Annotation {- Note [IsPass] @@ -92,16 +92,18 @@ type instance XRec (GhcPass p) a = XRecGhc a -- but pass-independent, source location type XRecGhc a = GenLocated (Anno a) a -type instance Anno RdrName = SrcSpanAnnN -type instance Anno Name = SrcSpanAnnN -type instance Anno Id = SrcSpanAnnN +--type instance Anno RdrName = SrcSpanAnnN +--type instance Anno Name = SrcSpanAnnN +--type instance Anno Id = SrcSpanAnnN type instance Anno (WithUserRdr a) = Anno a +{- type IsSrcSpanAnn p a = ( Anno (IdGhcP p) ~ EpAnn a, Anno (IdOccGhcP p) ~ EpAnn a, NoAnn a, IsPass p) +-} instance UnXRec (GhcPass p) where unXRec = unLoc ===================================== compiler/GHC/Hs/ImpExp.hs ===================================== @@ -17,6 +17,7 @@ module GHC.Hs.ImpExp , module GHC.Hs.ImpExp ) where +import Language.Haskell.Syntax.Doc import Language.Haskell.Syntax.Extension import Language.Haskell.Syntax.Module.Name import Language.Haskell.Syntax.ImpExp @@ -39,7 +40,6 @@ import GHC.Unit.Module.Warnings import Data.Data import Data.Maybe -import GHC.Hs.Doc (LHsDoc) {- @@ -144,6 +144,10 @@ simpleImportDecl mn = ImportDecl { } instance (OutputableBndrId p + , Outputable + (GenLocated + (Anno (WithHsDocIdentifiers (HsDocString (GhcPass p)) (GhcPass p))) + (WithHsDocIdentifiers (HsDocString (GhcPass p)) (GhcPass p))) , Outputable (Anno (IE (GhcPass p))) , Outputable (ImportDeclPkgQual (GhcPass p))) => Outputable (ImportDecl (GhcPass p)) where @@ -353,10 +357,10 @@ replaceWrappedName (IEData r (L l _)) n = IEData r (L l n) replaceLWrappedName :: LIEWrappedName GhcPs -> IdP GhcRn -> LIEWrappedName GhcRn replaceLWrappedName (L l n) n' = L l (replaceWrappedName n n') -exportDocstring :: LHsDoc pass -> SDoc +exportDocstring :: Outputable (LHsDoc (GhcPass p)) => LHsDoc (GhcPass p) -> SDoc exportDocstring doc = braces (text "docstring: " <> ppr doc) -instance OutputableBndrId p => Outputable (IE (GhcPass p)) where +instance (OutputableBndrId p, Outputable (LHsDoc (GhcPass p))) => Outputable (IE (GhcPass p)) where ppr ie@(IEVar _ var doc) = sep $ catMaybes [ ppr <$> ieDeprecation ie , Just $ ppr (unLoc var) ===================================== compiler/GHC/Hs/Instances.hs ===================================== @@ -35,6 +35,7 @@ import GHC.Data.BooleanFormula (BooleanFormula(..)) import Language.Haskell.Syntax.Decls import Language.Haskell.Syntax.Decls.Foreign (CType(..), Header(..)) import Language.Haskell.Syntax.Decls.Overlap (OverlapMode(..)) +import Language.Haskell.Syntax.Doc (HsDocString(..), WithHsDocIdentifiers(..)) import Language.Haskell.Syntax.Extension (Anno) import Language.Haskell.Syntax.Binds.InlinePragma (ActivationX(..), InlinePragma(..)) @@ -629,9 +630,9 @@ deriving instance Eq (IEWholeNamespaceExt GhcRn) deriving instance Eq (IEWholeNamespaceExt GhcTc) -- deriving instance (DataId name) => Data (IE name) -deriving instance Data (IE GhcPs) -deriving instance Data (IE GhcRn) -deriving instance Data (IE GhcTc) +deriving instance Data (Anno (WithHsDocIdentifiers (HsDocString GhcPs) GhcPs)) => Data (IE GhcPs) +deriving instance Data (Anno (WithHsDocIdentifiers (HsDocString GhcRn) GhcRn)) => Data (IE GhcRn) +deriving instance Data (Anno (WithHsDocIdentifiers (HsDocString GhcTc) GhcTc)) => Data (IE GhcTc) -- deriving instance (Eq name, Eq (IdP name)) => Eq (IE name) deriving instance Eq (IE GhcPs) @@ -669,3 +670,13 @@ deriving instance Data (InlinePragma GhcTc) deriving instance Data (OverlapMode GhcPs) deriving instance Data (OverlapMode GhcRn) deriving instance Data (OverlapMode GhcTc) + + +-- deriving instance Data (HsDocString p) +deriving instance Data (HsDocString GhcPs) +deriving instance Data (HsDocString GhcRn) +deriving instance Data (HsDocString GhcTc) + +deriving instance Data a => Data (WithHsDocIdentifiers a GhcPs) +deriving instance Data a => Data (WithHsDocIdentifiers a GhcRn) +deriving instance Data a => Data (WithHsDocIdentifiers a GhcTc) ===================================== compiler/GHC/Hs/Lit.hs ===================================== @@ -26,6 +26,7 @@ import GHC.Types.Basic (PprPrec(..), topPrec ) import GHC.Core.Ppr ( {- instance OutputableBndr TyVar -} ) import GHC.Types.SourceText import GHC.Core.Type +import GHC.Parser.Annotation ( {- type instance Anno Id -} ) import GHC.Utils.Misc (split) import GHC.Utils.Outputable import GHC.Utils.Panic (panic) ===================================== compiler/GHC/Iface/Syntax.hs ===================================== @@ -668,7 +668,7 @@ fromIfaceWarningTxt = \case IfDeprecatedTxt src strs -> DeprecatedTxt src (noLocA <$> map fromIfaceStringLiteralWithNames strs) fromIfaceStringLiteralWithNames :: (IfaceStringLiteral, [IfExtName]) -> WithHsDocIdentifiers StringLiteral GhcRn -fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLoc names) +fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLocA names) fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral fromIfaceStringLiteral (IfStringLiteral st fs) = StringLiteral st fs Nothing ===================================== compiler/GHC/Parser/Annotation.hs ===================================== @@ -1,3 +1,5 @@ +{-# LANGUAGE TypeFamilies #-} + module GHC.Parser.Annotation ( -- * Core Exact Print Annotation types EpToken(..), EpUniToken(..), @@ -32,6 +34,7 @@ module GHC.Parser.Annotation ( SrcSpanAnnA, SrcSpanAnnL, SrcSpanAnnP, SrcSpanAnnC, SrcSpanAnnN, SrcSpanAnnLC, SrcSpanAnnLW, SrcSpanAnnLS, SrcSpanAnnLI, LocatedE, + IsSrcSpanAnn, -- ** Annotation data types used in 'GenLocated' @@ -94,17 +97,34 @@ import Data.Data import Data.Function (on) import Data.List (sortBy) import Data.Semigroup +import Data.Void import GHC.Data.FastString import GHC.TypeLits (Symbol, KnownSymbol, symbolVal) import GHC.Types.Name +import GHC.Types.Name.Reader (RdrName) import GHC.Types.SrcLoc -import GHC.Hs.DocString +--import GHC.Hs.DocString +import GHC.Types.Var (Id) import GHC.Utils.Misc import GHC.Utils.Outputable hiding ( (<>) ) import GHC.Utils.Panic import qualified GHC.Data.Strict as Strict import GHC.Types.SourceText (SourceText (NoSourceText)) +import GHC.Hs.Extension + +import Language.Haskell.Syntax.Doc +import Language.Haskell.Syntax.Extension (Anno) + +type instance Anno Id = SrcSpanAnnN +type instance Anno Name = SrcSpanAnnN +type instance Anno RdrName = SrcSpanAnnN + +type IsSrcSpanAnn p a = ( Anno (IdGhcP p) ~ EpAnn a, + Anno (IdOccGhcP p) ~ EpAnn a, + NoAnn a, + IsPass p) + {- Note [exact print annotations] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -308,18 +328,46 @@ data EpaComment = -- and the start of this location is used for the spacing when -- exact printing the comment. } - deriving (Eq, Data, Show) + deriving (Eq, Show) + +instance Data EpaComment where + gunfold _ _ _ = undefined + toConstr = undefined + dataTypeOf = undefined data EpaCommentTok = -- Documentation annotations - EpaDocComment HsDocString -- ^ a docstring that can be pretty printed using pprHsDocString + EpaDocComment (HsDocString Void) -- ^ a docstring that can be pretty printed using pprHsDocString | EpaDocOptions String -- ^ doc options (prune, ignore-exports, etc) | EpaLineComment String -- ^ comment starting by "--" | EpaBlockComment String -- ^ comment in {- -} - deriving (Eq, Data, Show) + deriving (Eq, Show) + -- TODO: add back the Data and Show instance -- Note: these are based on the Token versions, but the Token type is -- defined in GHC.Parser.Lexer and bringing it in here would create a loop +instance {-# OVERLAPPING #-} Eq (HsDocString Void) where + (==) = \case + MultiLineDocString _ a1 b1 -> \case + MultiLineDocString _ a2 b2 -> a1 == a2 && length b1 == length b2 + _ -> False + NestedDocString _ a1 b1 -> \case + NestedDocString _ a2 b2 -> a1 == a2 + _ -> False + GeneratedDocString _ a1 -> \case + GeneratedDocString _ a2 -> a1 == a2 + _ -> False + XHsDocString _ -> \case + XHsDocString _ -> True + _ -> False + +instance {-# OVERLAPPING #-} Show (HsDocString Void) where + show = \case + MultiLineDocString _ a b -> unwords ["MultiLineDocString", show a ] + NestedDocString _ a b -> unwords ["NestedDocString" , show a ] + GeneratedDocString _ a -> unwords ["GeneratedDocString", show a ] + XHsDocString _ -> "XHsDocString" + instance Outputable EpaComment where ppr x = text (show x) @@ -390,7 +438,6 @@ data EpAnn ann deriving (Data, Eq, Functor) -- See Note [XRec and Anno in the AST] - spanAsAnchor :: SrcSpan -> (EpaLocation' a) spanAsAnchor ss = EpaSpan ss @@ -537,7 +584,7 @@ data AnnList a al_trailing :: ![TrailingAnn] -- ^ items appearing after the -- list, such as '=>' for a -- context - } deriving (Data,Eq) + } deriving (Data, Eq) data AnnListBrackets = ListParens (EpToken "(") (EpToken ")") @@ -570,7 +617,6 @@ data AnnContext ac_close :: [EpToken ")"] -- ^ zero or more closing parentheses. } deriving (Data) - -- --------------------------------------------------------------------- -- Annotations for names -- --------------------------------------------------------------------- @@ -648,7 +694,7 @@ data AnnPragma apr_loc2 :: EpaLocation, apr_type :: EpToken "type", apr_module :: EpToken "module" - } deriving (Data,Eq) + } deriving (Data, Eq) -- --------------------------------------------------------------------- ===================================== compiler/GHC/Types/Name/Reader.hs ===================================== @@ -150,6 +150,10 @@ import qualified Data.Map.Strict as Map import qualified Data.Semigroup as S import System.IO.Unsafe ( unsafePerformIO ) +import Language.Haskell.Syntax.Extension + + + {- ************************************************************************ * * ===================================== compiler/GHC/Utils/Binary.hs ===================================== @@ -103,7 +103,7 @@ module GHC.Utils.Binary getGenericSymtab, putGenericSymTab, getGenericSymbolTable, putGenericSymbolTable, -- * Newtype wrappers - BinSpan(..), BinSrcSpan(..), BinLocated(..), + BinSpan(..), BinSrcSpan(..), BinLocated(..), BinGenLocated(..), -- * Newtypes for types that have canonically more than one valid encoding BindingName(..), simpleBindingNameWriter, @@ -121,6 +121,7 @@ import Language.Haskell.Syntax.Basic import Language.Haskell.Syntax.Binds.InlinePragma import Language.Haskell.Syntax.Module.Name (ModuleName(..)) import Language.Haskell.Syntax.ImpExp.IsBoot (IsBootInterface(..)) +import Language.Haskell.Syntax.UTF8 import {-# SOURCE #-} GHC.Types.Name (Name) import GHC.Data.FastString @@ -1905,6 +1906,18 @@ instance Binary a => Binary (BinLocated a) where x <- get bh return $ BinLocated (L l x) +newtype BinGenLocated l a = BinGenLocated { unBinGenLocated :: GenLocated l a } + +instance (Binary a, Binary l) => Binary (BinGenLocated l a) where + put_ bh (BinGenLocated (L l x)) = do + put_ bh l + put_ bh x + + get bh = do + l <- get bh + x <- get bh + return $ BinGenLocated (L l x) + newtype BinSpan = BinSpan { unBinSpan :: RealSrcSpan } -- See Note [Source Location Wrappers] @@ -2097,3 +2110,8 @@ instance Binary RuleMatchInfo where h <- getByte bh if h == 1 then pure ConLike else pure FunLike + +instance Binary TextUTF8 where + put_ bh = putSBS bh . bytesUTF8 + + get = fmap unsafeFromShortByteString . getSBS ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -116,6 +116,7 @@ import Language.Haskell.Syntax.Basic import Language.Haskell.Syntax.Binds.InlinePragma import Language.Haskell.Syntax.Decls.Overlap ( OverlapMode(..) ) import Language.Haskell.Syntax.Module.Name ( ModuleName(..) ) +import Language.Haskell.Syntax.UTF8 import GHC.Prelude.Basic @@ -2036,3 +2037,6 @@ instance Outputable (OverlapMode p) where ppr (Incoherent _) = text "[incoherent]" ppr (NonCanonical _) = text "[noncanonical]" ppr (XOverlapMode _) = text "[user TTG extension]" + +instance Outputable TextUTF8 where + ppr = text . decodeUTF8 ===================================== compiler/Language/Haskell/Syntax/Decls.hs ===================================== @@ -1410,7 +1410,7 @@ data DocDecl pass | DocCommentNamed String (LHsDoc pass) | DocGroup Int (LHsDoc pass) -deriving instance (Data pass, Data (IdP pass)) => Data (DocDecl pass) +--deriving instance (Data pass, Data (IdP pass)) => Data (DocDecl pass) docDeclDoc :: DocDecl pass -> LHsDoc pass docDeclDoc (DocCommentNext d) = d ===================================== compiler/Language/Haskell/Syntax/Doc.hs ===================================== @@ -0,0 +1,172 @@ +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE UndecidableInstances #-} -- Eq XOverlapMode, NFData OverlapMode + +{- +## Migrate and restructure `LHsDoc` + +[X] 1. Create a new **`L.H.S.Doc`** module and move the following into it. +[X] 2. Move `HsDoc` *(no change)* +[X] 3. Move `HsDocStringChunk` *(no change)* +[X] 4. Move `HsDocStringDecorator` *(no change)* +[_] 5. Move `LHsDoc p` as `XRec p (HsDoc p)` +[X] 6. Move `WithHsDocIdentifiers p` as `Located (IdP p) as LIdP p` +[_] 7. Move `HsDocString`, adding TTG parameter and extension point +[X] 8. Move `LHsDocStringChunk = Located HsDocStringChunk` as `type LHsDocStringChunk pass = XRec pass HsDocStringChunk` +[ ] 9. Add `type instance Anno HsDocStringChunk = SrcSpan` +-} + +{- | +Data-types describing the raw and lexical docstrings of +the Haskell programming language. +-} +module Language.Haskell.Syntax.Doc + ( HsDoc + , WithHsDocIdentifiers(..) + + , HsDocString(..) + -- ** Construcction + , mkGeneratedHsDocString + + , HsDocStringChunk(..) + -- ** Construction + , mkHsDocStringChunk + , mkHsDocStringChunkUtf8ByteString + -- ** Deconstruction + , unpackHDSC + -- ** Query + , nullHDSC + + , HsDocStringDecorator(..) + , LHsDoc + , LHsDocStringChunk + ) where + +import Control.DeepSeq +import Data.ByteString (ByteString) +import qualified Data.ByteString.Short as SBS +import Data.Data +import Data.Kind (Type) +import Data.Eq +import Data.List.NonEmpty (NonEmpty(..)) +import Data.Function +import Prelude +import Language.Haskell.Syntax.Extension +import Language.Haskell.Syntax.UTF8 + +-- | A docstring with the (probable) identifiers found in it. +type HsDoc (pass :: Type) = WithHsDocIdentifiers (HsDocString pass) pass + +-- | Haskell Documentation String +-- +-- Rich structure to support exact printing +-- The location around each chunk doesn't include the decorators +data HsDocString pass + = MultiLineDocString + !(XMultiLineDocString pass) + !HsDocStringDecorator + !(NonEmpty (LHsDocStringChunk pass)) + -- ^ The first chunk is preceded by "-- <decorator>" and each following chunk is preceded by "--" + -- Example: -- | This is a docstring for 'foo'. It is the line with the decorator '|' and is always included + -- -- This continues that docstring and is the second element in the NonEmpty list + -- foo :: a -> a + | NestedDocString + !(XNestedDocString pass) + !HsDocStringDecorator + (LHsDocStringChunk pass) + -- ^ The docstring is preceded by "{-<decorator>" and followed by "-}" + -- The chunk contains balanced pairs of '{-' and '-}' + | GeneratedDocString + !(XGeneratedDocString pass) + HsDocStringChunk + -- ^ A docstring generated either internally or via TH + -- Pretty printed with the '-- |' decorator + -- This is because it may contain unbalanced pairs of '{-' and '-}' and + -- not form a valid 'NestedDocString' + | XHsDocString + !(XXHsDocString pass) +{- +deriving stock instance ( + Eq (XMultiLineDocString pass), + Eq (XNestedDocString pass), + Eq (XGeneratedDocString pass), + Eq (XXHsDocString pass), + Eq (XRec pass HsDocStringChunk), + Typeable pass + ) => Eq (HsDocString pass) + +deriving stock instance ( + Show (XMultiLineDocString pass), + Show (XNestedDocString pass), + Show (XGeneratedDocString pass), + Show (XXHsDocString pass), + Show (XRec pass HsDocStringChunk), + Typeable pass + ) => Show (HsDocString pass) + +instance {-# OVERLAPPABLE #-} ( + NFData (XMultiLineDocString pass), + NFData (XNestedDocString pass), + NFData (XGeneratedDocString pass), + NFData (XXHsDocString pass), + NFData (XRec pass HsDocStringChunk) + ) => NFData (HsDocString pass) where + rnf = \case + MultiLineDocString x a b -> rnf x `seq` rnf a `seq` rnf b + NestedDocString x a b -> rnf x `seq` rnf a `seq` rnf b + GeneratedDocString x a -> rnf x `seq` rnf a + XHsDocString x -> rnf x +-} +mkGeneratedHsDocString :: XGeneratedDocString p -> String -> HsDocString p +mkGeneratedHsDocString x = GeneratedDocString x . mkHsDocStringChunk + +type LHsDoc pass = XRec pass (HsDoc pass) +--type LHsDoc pass = Located (HsDoc pass) +--type LIdP p = XRec p (IdP p) + +type LHsDocStringChunk pass = XRec pass HsDocStringChunk + +-- | A contiguous chunk of documentation +newtype HsDocStringChunk = HsDocStringChunk TextUTF8 + deriving stock (Eq,Ord,Data, Show) + deriving newtype (NFData) + +mkHsDocStringChunk :: String -> HsDocStringChunk +mkHsDocStringChunk = HsDocStringChunk . encodeUTF8 + +mkHsDocStringChunkUtf8ByteString :: ByteString -> HsDocStringChunk +mkHsDocStringChunkUtf8ByteString = + HsDocStringChunk . unsafeFromShortByteString . SBS.toShort + +unpackHDSC :: HsDocStringChunk -> String +unpackHDSC (HsDocStringChunk bs) = decodeUTF8 bs + +nullHDSC :: HsDocStringChunk -> Bool +nullHDSC (HsDocStringChunk bs) = headUTF8 bs == Nothing + +data HsDocStringDecorator + = HsDocStringNext -- ^ '|' is the decorator + | HsDocStringPrevious -- ^ '^' is the decorator + | HsDocStringNamed !String -- ^ '$<string>' is the decorator + | HsDocStringGroup !Int -- ^ The decorator is the given number of '*'s + deriving (Eq, Ord, Show, Data) + +instance NFData HsDocStringDecorator where + rnf HsDocStringNext = () + rnf HsDocStringPrevious = () + rnf (HsDocStringNamed x) = rnf x + rnf (HsDocStringGroup x) = rnf x + +-- | Annotate a value with the probable identifiers found in it +-- These will be used by haddock to generate links. +-- +-- The identifiers are bundled along with their location in the source file. +-- This is useful for tooling to know exactly where they originate. +-- +-- This type is currently used in two places - for regular documentation comments, +-- with 'a' set to 'HsDocString', and for adding identifier information to +-- warnings, where 'a' is 'StringLiteral' +data WithHsDocIdentifiers a pass = WithHsDocIdentifiers + { hsDocString :: !a + , hsDocIdentifiers :: ![LIdP pass] + } ===================================== compiler/Language/Haskell/Syntax/Extension.hs ===================================== @@ -646,6 +646,13 @@ type family XXLit x type family XOverLit x type family XXOverLit x +-- ------------------------------------- +-- Type families for the HsDocString extension points +type family XMultiLineDocString x +type family XNestedDocString x +type family XGeneratedDocString x +type family XXHsDocString x + -- ===================================================================== -- Type families for the HsPat extension points ===================================== compiler/Language/Haskell/Syntax/ImpExp.hs ===================================== @@ -1,6 +1,7 @@ {-# LANGUAGE TypeFamilies #-} module Language.Haskell.Syntax.ImpExp ( module Language.Haskell.Syntax.ImpExp, IsBootInterface(..) ) where +import Language.Haskell.Syntax.Doc import Language.Haskell.Syntax.Extension import Language.Haskell.Syntax.Module.Name import Language.Haskell.Syntax.ImpExp.IsBoot ( IsBootInterface(..) ) @@ -13,7 +14,7 @@ import Data.String (String) import Data.Int (Int) import Control.DeepSeq -import {-# SOURCE #-} GHC.Hs.Doc (LHsDoc) -- ROMES:TODO Discuss in #21592 whether this is parsed AST or base AST +--import {-# SOURCE #-} GHC.Hs.Doc (LHsDoc) -- ROMES:TODO Discuss in #21592 whether this is parsed AST or base AST {- ************************************************************************ ===================================== compiler/Language/Haskell/Syntax/UTF8.hs ===================================== @@ -0,0 +1,130 @@ +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE UnboxedTuples #-} + +{- | +Represents a small chunk of UTF8 text from a source code file. +-} +module Language.Haskell.Syntax.UTF8 + ( + -- * Data-type + TextUTF8() + -- ** Construction + , encodeUTF8 + , unsafeFromShortByteString + -- ** Deconstruction + , bytesUTF8 + , byteStringUTF8 + , decodeUTF8 + , headUTF8 + -- ** Transformation + , linesUTF8 + , unlinesUTF8 + ) where + + +import Prelude + +import Control.DeepSeq +import Data.ByteString (StrictByteString) +import Data.ByteString.Short (ShortByteString(..)) +import qualified Data.ByteString.Short as SBS +import Data.Data +import Data.Foldable (toList) +import Data.String (IsString(..)) +import Data.Word (Word8) + +-- These is a modules are components of the @base@ package, +-- hence they do not directly couple the library to GHC. +import GHC.Base (Char(C#)) +import GHC.Encoding.UTF8 + +{- | +A UTF8 encoded ShortByteString representing the textual snippet of code +associated with a given element of the abstract syntax tree. +-} +newtype TextUTF8 = TextUTF8 { bytesUTF8 :: ShortByteString } + deriving (Data, Eq, Ord) + +instance IsString TextUTF8 where + fromString = encodeUTF8 + +instance NFData TextUTF8 where + rnf (TextUTF8 !sbs) = rnf sbs + +instance Semigroup TextUTF8 where + (TextUTF8 x) <> (TextUTF8 y) = TextUTF8 $ x <> y + +instance Monoid TextUTF8 where + mempty = TextUTF8 mempty + +instance Show TextUTF8 where + show (TextUTF8 sbs) = utf8DecodeShortByteString sbs + +{- | +Convert the UTF8 chunk of text to a 'ByteString'. + +_Time:_ $\mathcal{O}\left( n \right )$ +-} +byteStringUTF8 :: TextUTF8 -> StrictByteString +byteStringUTF8 (TextUTF8 sbs) = SBS.fromShort sbs + +{- | +Decode a UTF8 chunk of text to a 'String'. +-} +{-# INLINE decodeUTF8 #-} +decodeUTF8 :: TextUTF8 -> String +decodeUTF8 = utf8DecodeShortByteString . bytesUTF8 + +{- | +Encode a 'String' as a UTF8 chunk of text. +-} +{-# INLINE encodeUTF8 #-} +encodeUTF8 :: String -> TextUTF8 +encodeUTF8 = TextUTF8 . utf8EncodeShortByteString + +{- | +Extract the first code point from the UTF8 check of text. + +_Time:_ $\mathcal{O}\left( 1 \right )$ +-} +headUTF8 :: TextUTF8 -> Maybe Char +headUTF8 (TextUTF8 sbs@(SBS ba#)) + | SBS.length sbs == 0 = Nothing + | otherwise = + let !(# c#, _ #) = utf8DecodeCharByteArray# ba# 0# + in Just $ C# c# + +{- | +Split a UTF8 fragment of text on newline characters (@'\n'@). +-} +linesUTF8 :: TextUTF8 -> [TextUTF8] +linesUTF8 = fmap TextUTF8 . SBS.split newlineByte . bytesUTF8 + +{- | +Join a collection of UTF8 text fragments with newline characters (@'\n'@). +-} +unlinesUTF8 :: Foldable f => f TextUTF8 -> TextUTF8 +unlinesUTF8 = + TextUTF8 . SBS.intercalate (SBS.singleton newlineByte) . fmap bytesUTF8 . toList + +{- | +Assumes that the shortByteString is already UTF8 encoded. + +/This precondition is not checked!/ +-} +{-# INLINE unsafeFromShortByteString #-} +unsafeFromShortByteString :: ShortByteString -> TextUTF8 +unsafeFromShortByteString = TextUTF8 + +-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +-- Internal Functionality +-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + +newlineByte :: Word8 +newlineByte = 0x0A -- 0x0A (10) is the new line character (\n) + +utf8DecodeShortByteString :: ShortByteString -> [Char] +utf8DecodeShortByteString (SBS ba#) = utf8DecodeByteArray# ba# + +utf8EncodeShortByteString :: String -> ShortByteString +utf8EncodeShortByteString str = SBS (utf8EncodeByteArray# str) ===================================== compiler/ghc.cabal.in ===================================== @@ -1028,6 +1028,7 @@ Library Language.Haskell.Syntax.Decls Language.Haskell.Syntax.Decls.Foreign Language.Haskell.Syntax.Decls.Overlap + Language.Haskell.Syntax.Doc Language.Haskell.Syntax.Expr Language.Haskell.Syntax.Extension Language.Haskell.Syntax.ImpExp @@ -1037,6 +1038,7 @@ Library Language.Haskell.Syntax.Pat Language.Haskell.Syntax.Specificity Language.Haskell.Syntax.Type + Language.Haskell.Syntax.UTF8 autogen-modules: GHC.Platform.Constants GHC.Settings.Config View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/273fba40c02500253e25b1f32da5488… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/273fba40c02500253e25b1f32da5488… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-26971
by recursion-ninja (＠recursion-ninja) 02 Mar '26

02 Mar '26

recursion-ninja pushed new branch wip/fix-26971 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-26971 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/longpath-aware-manifest] 14 commits: ghc-internal: avoid depending on GHC.Internal.Control.Monad.Fix
by Hannes Siebenhandl (＠fendor) 02 Mar '26

02 Mar '26

Hannes Siebenhandl pushed to branch wip/fendor/longpath-aware-manifest at Glasgow Haskell Compiler / GHC Commits: 17839248 by Teo Camarasu at 2026-02-24T08:36:03-05:00 ghc-internal: avoid depending on GHC.Internal.Control.Monad.Fix This module contains the definition of MonadFix, since we want an instance for IO, that instance requires a lot of machinery and we want to avoid an orphan instance, this will naturally be quite high up in the dependency graph. So we want to avoid other modules depending on it as far as possible. On Windows, the IO manager depends on the RTSFlags type, which transtively depends on MonadFix. We refactor things to avoid this dependency, which would have caused a regression. Resolves #26875 Metric Decrease: T12227 - - - - - fa88d09a by Wolfgang Jeltsch at 2026-02-24T08:36:47-05:00 Refine the imports of `System.IO.OS` Commit 68bd08055594b8cbf6148a72d108786deb6c12a1 replaced the `GHC.Internal.Data.Bool` import by a `GHC.Internal.Base` import. However, while the `GHC.Internal.Data.Bool` import was conditional and partial, the `GHC.Internal.Base` import is unconditional and total. As a result, the import list is not tuned to import only the necessary bits anymore, and furthermore GHC emits a lot of warnings about redundant imports. This commit makes the `GHC.Internal.Base` import conditional and partial in the same way that the `GHC.Internal.Data.Bool` import was. - - - - - c951fef1 by Cheng Shao at 2026-02-25T20:58:28+00:00 wasm: add /assets endpoint to serve user-specified assets This patch adds an `/assets` endpoint to the wasm dyld http server, so that users can also fetch assets from the same host with sensible default MIME types, without needing a separate http server for assets that also introduces CORS headaches: - A `-fghci-browser-assets-dir` driver flag is added to specify the assets root directory (defaults to `$PWD`) - The dyld http server fetches `mime-db` on demand and uses it as source of truth for mime types. Closes #26951. - - - - - dde22f97 by Sylvain Henry at 2026-02-26T13:14:03-05:00 Fix -fcheck-prim-bounds for non constant args (#26958) Previously we were only checking bounds for constant (literal) arguments! I've refactored the code to simplify the generation of out-of-line Cmm code for the primop composed of some inline code + some call to an external Cmm function. - - - - - bd3eba86 by Vladislav Zavialov at 2026-02-27T05:48:01-05:00 Check for negative type literals in the type checker (#26861) GHC disallows negative type literals (e.g., -1), as tested by T8306 and T8412. This check is currently performed in the renamer: rnHsTyLit tyLit@(HsNumTy x i) = do when (i < 0) $ addErr $ TcRnNegativeNumTypeLiteral tyLit However, this check can be bypassed using RequiredTypeArguments (see the new test case T26861). Prior to this patch, such programs caused the compiler to hang instead of reporting a proper error. This patch addresses the issue by adding an equivalent check in the type checker, namely in tcHsType. The diff is deliberately minimal to facilitate backporting. A more comprehensive rework of HsTyLit is planned for a separate commit. - - - - - faf14e0c by Vladislav Zavialov at 2026-02-27T05:48:45-05:00 Consistent pretty-printing of HsString, HsIsString, HsStrTy Factor out a helper to pretty-print string literals, thus fixing newline handling for overloaded string literals and type literals. Test cases: T26860ppr T26860ppr_overloaded T26860ppr_tylit Follow up to ddf1434ff9bb08cfef3c93f23de6b83ec698aa27 - - - - - f108a972 by Arnaud Spiwack at 2026-02-27T12:53:01-05:00 Make list comprehension completely non-linear Fixes #25081 From the note: The usefulness of list comprehension in conjunction with linear types is dubious. After all, statements are made to be run many times, for instance in ```haskell [u | y <- [0,1], stmts] ``` both `u` and `stmts` are going to be run several times. In principle, though, there are some position in a monad comprehension expression which could be considered linear. We could try and make it so that these positions are considered linear by the typechecker, but in practice the desugarer doesn't take enough care to ensure that these are indeed desugared to linear sites. We tried in the past, and it turned out that we'd miss a desugaring corner case (#25772). Until there's a demand for this very specific improvement, let's instead be conservative, and consider list comprehension to be completely non-linear. - - - - - ae799cab by Simon Jakobi at 2026-02-27T12:53:54-05:00 PmAltConSet: Use Data.Set instead of Data.Map ...to store `PmLit`s. The Map was only used to map keys to themselves. Changing the Map to a Set saves a Word of memory per entry. Resolves #26756. - - - - - dcd7819c by Vladislav Zavialov at 2026-02-27T18:46:03-05:00 Drop HsTyLit in favor of HsLit (#26862, #25121) This patch is a small step towards unification of HsExpr and HsType, taking care of literals (HsLit) and type literals (HsTyLit). Additionally, it improves error messages for unsupported type literals, such as unboxed or fractional literals (test cases: T26862, T26862_th). Changes to the AST: * Use HsLit where HsTyLit was previously used * Use HsChar where HsCharTy was previously used * Use HsString where HsStrTy was previously used * Use HsNatural (NEW) where HsNumTy was previously used * Use HsDouble (NEW) to represent unsupported fractional type literals Changes to logic: * Parse unboxed and fractional type literals (to be rejected later) * Drop the check for negative literals in the renamer (rnHsTyLit) in favor of checking in the type checker (tc_hs_lit_ty) * Check for invalid type literals in TH (repTyLit) and report unrepresentable literals with ThUnsupportedTyLit * Allow negative type literals in TH (numTyLit). This is fine as these will be taken care of at splice time (test case: T8306_th) - - - - - c927954f by Vladislav Zavialov at 2026-02-27T18:46:50-05:00 Increase test coverage of diagnostics Add test cases for the previously untested diagnostics: [GHC-01239] PsErrIfInFunAppExpr [GHC-04807] PsErrProcInFunAppExpr [GHC-08195] PsErrInvalidRecordCon [GHC-16863] PsErrUnsupportedBoxedSumPat [GHC-18910] PsErrSemiColonsInCondCmd [GHC-24737] PsErrInvalidWhereBindInPatSynDecl [GHC-25037] PsErrCaseInFunAppExpr [GHC-25078] PsErrPrecedenceOutOfRange [GHC-28021] PsErrRecordSyntaxInPatSynDecl [GHC-35827] TcRnNonOverloadedSpecialisePragma [GHC-40845] PsErrUnpackDataCon [GHC-45106] PsErrInvalidInfixHole [GHC-50396] PsErrInvalidRuleActivationMarker [GHC-63930] MultiWayIfWithoutAlts [GHC-65536] PsErrNoSingleWhereBindInPatSynDecl [GHC-67630] PsErrMDoInFunAppExpr [GHC-70526] PsErrLetCmdInFunAppCmd [GHC-77808] PsErrDoCmdInFunAppCmd [GHC-86934] ClassPE [GHC-90355] PsErrLetInFunAppExpr [GHC-91745] CasesExprWithoutAlts [GHC-92971] PsErrCaseCmdInFunAppCmd [GHC-95644] PsErrBangPatWithoutSpace [GHC-97005] PsErrIfCmdInFunAppCmd Remove unused error constructors: [GHC-44524] PsErrExpectedHyphen [GHC-91382] TcRnIllegalKindSignature - - - - - 3a9470fd by Torsten Schmits at 2026-02-27T18:47:34-05:00 Avoid expensive computation for debug logging in `mergeDatabases` when log level is low This computed and traversed a set intersection for every single dependency unconditionally. - - - - - ea4c2cbd by Brandon Chinn at 2026-02-27T16:22:38-08:00 Implement QualifiedStrings (#26503) See Note [Implementation of QualifiedStrings] - - - - - 08bc245b by sheaf at 2026-03-01T11:11:54-05:00 Clean up join points, casts & ticks This commit shores up the logic dealing with casts and ticks occurring in between a join point binding and a jump. Fixes #26642 #26929 #26693 Makes progress on #14610 #26157 #26422 Changes: - Remove 'GHC.Types.Tickish.TickishScoping' in favour of simpler predicates 'tickishHasNoScope'/'tickishHasSoftScope', as things were before commit 993975d3. This makes the code easier to read and document (fewer indirections). - Introduce 'canCollectArgsThroughTick' for consistent handling of ticks around PrimOps and other 'Id's that cannot be eta-reduced. See overhauled Note [Ticks and mandatory eta expansion]. - New Note [JoinId vs TailCallInfo] in GHC.Core.SimpleOpt that explains robustness of JoinId vs fragility of TailCallInfo. - Allow casts/non-soft-scoped ticks to occur in between a join point binder and a jump, but only in Core Prep. See Note [Join points, casts, and ticks] and Note [Join points, casts, and ticks... in Core Prep] in GHC.Core.Opt.Simplify.Iteration. Also update Core Lint to account for this. See Note [Linting join points with casts or ticks] in GHC.Core.Lint. - Update 'GHC.Core.Utils.mergeCaseAlts' to avoid pushing a cast in between a join point binding and its jumps. This fixes #26642. See the new (MC5) and (MC6) in Note [Merge Nested Cases]. - Update float out to properly handle source note ticks. They are now properly floated out instead of being discarded. This increases the number of ticks in certain tests with -g. Test cases: T26642 and TrickyJoins. Metric increase due to more source note ticks with -g: ------------------------- Metric Increase: libdir size_hello_artifact size_hello_unicode ------------------------- - - - - - 0da8a5d0 by Fendor at 2026-03-02T12:31:32+01:00 Add `-fwin-aware-long-paths` to support ling paths on Windows While Windows supports file paths longer than the MAX_PATH restriction, it is opt-in, and not enabled by default. By declaring the binary to be long path aware in the manifest of the windows executable, the binary opts-in to the new behaviour. It is up to the developer to make sure they use UNC paths and Win.h specific functions for filesystem operations to use long paths in their application. See https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-li… and https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests for the documentation on the application manifest and long path option. - - - - - 209 changed files: - compiler/GHC/Builtin/Names.hs - compiler/GHC/Builtin/Types.hs - compiler/GHC/Cmm/Node.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/Config/Core/Lint.hs - compiler/GHC/Driver/Config/Interpreter.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Syn/Type.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Errors/Types.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Linker/Windows.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/String.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - + compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Runtime/Interpreter/Types.hs - compiler/GHC/Runtime/Interpreter/Wasm.hs - compiler/GHC/StgToCmm/Expr.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Match.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Id/Info.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Unit/State.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - compiler/ghc.cabal.in - docs/users_guide/9.16.1-notes.rst - + docs/users_guide/exts/qualified_strings.rst - docs/users_guide/phases.rst - docs/users_guide/wasm.rst - libraries/base/src/Control/Arrow.hs - libraries/base/src/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/Control/Arrow.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Lazy/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows/ManagedThreadPool.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags/Test.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs - libraries/ghc-internal/src/GHC/Internal/TH/Monad.hs - testsuite/tests/codeGen/should_compile/debug.stdout - + testsuite/tests/codeGen/should_fail/T26958.hs - testsuite/tests/codeGen/should_fail/all.T - + testsuite/tests/dependent/should_fail/SelfDepCls.hs - + testsuite/tests/dependent/should_fail/SelfDepCls.stderr - testsuite/tests/dependent/should_fail/all.T - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/driver/T4437.hs - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghci/scripts/ListTuplePunsPpr.stdout - testsuite/tests/ghci/scripts/T10963.stderr - testsuite/tests/ghci/scripts/T4175.stdout - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/interface-stability/template-haskell-exports.stdout - − testsuite/tests/linear/should_compile/LinearListComprehension.hs - testsuite/tests/linear/should_compile/all.T - testsuite/tests/linear/should_fail/T25081.hs - testsuite/tests/linear/should_fail/T25081.stderr - testsuite/tests/mdo/should_fail/mdofail006.stderr - testsuite/tests/module/all.T - + testsuite/tests/module/mod70b.hs - + testsuite/tests/module/mod70b.stderr - + testsuite/tests/parser/should_fail/NoBlockArgumentsFail4.hs - + testsuite/tests/parser/should_fail/NoBlockArgumentsFail4.stderr - testsuite/tests/parser/should_fail/NoBlockArgumentsFailArrowCmds.hs - testsuite/tests/parser/should_fail/NoBlockArgumentsFailArrowCmds.stderr - + testsuite/tests/parser/should_fail/NoDoAndIfThenElseArrowCmds.hs - + testsuite/tests/parser/should_fail/NoDoAndIfThenElseArrowCmds.stderr - + testsuite/tests/parser/should_fail/T26860ppr_overloaded.hs - + testsuite/tests/parser/should_fail/T26860ppr_overloaded.stderr - + testsuite/tests/parser/should_fail/T26860ppr_tylit.hs - + testsuite/tests/parser/should_fail/T26860ppr_tylit.stderr - testsuite/tests/parser/should_fail/all.T - + testsuite/tests/parser/should_fail/badRuleMarker.hs - + testsuite/tests/parser/should_fail/badRuleMarker.stderr - + testsuite/tests/parser/should_fail/patFail010.hs - + testsuite/tests/parser/should_fail/patFail010.stderr - + testsuite/tests/parser/should_fail/patFail011.hs - + testsuite/tests/parser/should_fail/patFail011.stderr - + testsuite/tests/parser/should_fail/precOutOfRange.hs - + testsuite/tests/parser/should_fail/precOutOfRange.stderr - + testsuite/tests/parser/should_fail/unpack_data_con.hs - + testsuite/tests/parser/should_fail/unpack_data_con.stderr - testsuite/tests/patsyn/should_fail/T10426.stderr - testsuite/tests/patsyn/should_fail/all.T - + testsuite/tests/patsyn/should_fail/patsyn_where_fail1.hs - + testsuite/tests/patsyn/should_fail/patsyn_where_fail1.stderr - + testsuite/tests/patsyn/should_fail/patsyn_where_fail2.hs - + testsuite/tests/patsyn/should_fail/patsyn_where_fail2.stderr - + testsuite/tests/patsyn/should_fail/patsyn_where_fail3.hs - + testsuite/tests/patsyn/should_fail/patsyn_where_fail3.stderr - + testsuite/tests/patsyn/should_fail/patsyn_where_fail4.hs - + testsuite/tests/patsyn/should_fail/patsyn_where_fail4.stderr - + testsuite/tests/qualified-strings/Makefile - + testsuite/tests/qualified-strings/should_compile/Example/Length.hs - + testsuite/tests/qualified-strings/should_compile/all.T - + testsuite/tests/qualified-strings/should_compile/qstrings_redundant_pattern.hs - + testsuite/tests/qualified-strings/should_compile/qstrings_redundant_pattern.stderr - + testsuite/tests/qualified-strings/should_fail/Example/Length.hs - + testsuite/tests/qualified-strings/should_fail/Makefile - + testsuite/tests/qualified-strings/should_fail/all.T - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_expr.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_expr.stderr - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_pat.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_bad_pat.stderr - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.stderr - + testsuite/tests/qualified-strings/should_run/Example/ByteStringAscii.hs - + testsuite/tests/qualified-strings/should_run/Example/ByteStringUtf8.hs - + testsuite/tests/qualified-strings/should_run/Example/Text.hs - + testsuite/tests/qualified-strings/should_run/Makefile - + testsuite/tests/qualified-strings/should_run/all.T - + testsuite/tests/qualified-strings/should_run/qstrings_expr.hs - + testsuite/tests/qualified-strings/should_run/qstrings_expr.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_pat.hs - + testsuite/tests/qualified-strings/should_run/qstrings_pat.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_th.hs - + testsuite/tests/qualified-strings/should_run/qstrings_th.stdout - + testsuite/tests/simplCore/should_compile/T26642.hs - + testsuite/tests/simplCore/should_compile/TrickyJoins.hs - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/th/T26862_th.script - + testsuite/tests/th/T26862_th.stderr - + testsuite/tests/th/T8306_th.script - + testsuite/tests/th/T8306_th.stderr - + testsuite/tests/th/T8306_th.stdout - testsuite/tests/th/T8412.stderr - + testsuite/tests/th/TH_EmptyLamCases.hs - + testsuite/tests/th/TH_EmptyLamCases.stderr - + testsuite/tests/th/TH_EmptyMultiIf.hs - + testsuite/tests/th/TH_EmptyMultiIf.stderr - testsuite/tests/th/all.T - + testsuite/tests/typecheck/should_fail/T26861.hs - + testsuite/tests/typecheck/should_fail/T26861.stderr - + testsuite/tests/typecheck/should_fail/T26862.hs - + testsuite/tests/typecheck/should_fail/T26862.stderr - testsuite/tests/typecheck/should_fail/T8306.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/unboxedsums/all.T - + testsuite/tests/unboxedsums/unboxedsums4p.hs - + testsuite/tests/unboxedsums/unboxedsums4p.stderr - + testsuite/tests/warnings/should_compile/SpecMultipleTysMono.hs - + testsuite/tests/warnings/should_compile/SpecMultipleTysMono.stderr - testsuite/tests/warnings/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5075477ca5ac4f2a68fe80533314b5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5075477ca5ac4f2a68fe80533314b5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/backports-9.12.4] Prepare release 9.12.4
by Zubin (＠wz1000) 02 Mar '26

02 Mar '26

Zubin pushed to branch wip/backports-9.12.4 at Glasgow Haskell Compiler / GHC Commits: 45bc79ab by Zubin Duggal at 2026-03-02T16:47:45+05:30 Prepare release 9.12.4 - - - - - 3 changed files: - docs/users_guide/release-notes.rst - libraries/base/base.cabal.in - libraries/base/changelog.md Changes: ===================================== docs/users_guide/release-notes.rst ===================================== @@ -7,3 +7,4 @@ Release notes 9.12.1-notes 9.12.2-notes 9.12.3-notes + 9.12.4-notes ===================================== libraries/base/base.cabal.in ===================================== @@ -4,7 +4,7 @@ cabal-version: 3.0 -- Make sure you are editing ghc-experimental.cabal.in, not ghc-experimental.cabal name: base -version: 4.21.1.0 +version: 4.21.2.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause ===================================== libraries/base/changelog.md ===================================== @@ -1,7 +1,9 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) ## 4.21.2.0 *TBA* - * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) + * Expose `Backtraces` constructor and fields ([CLC proposal #199](https://github.com/haskell/core-libraries-committee/issues/199), [#26049](https://gitlab.haskell.org/ghc/ghc/-/issues/26049)) + * Store `StackTrace` and `StackSnapshot` in `Backtraces`, deferring decoding until display + * Evaluate backtraces for "error" exceptions at the moment they are thrown ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383), [#26751](https://gitlab.haskell.org/ghc/ghc/-/issues/26751)) ## 4.21.1.0 *Sept 2024* * Fix incorrect results of `integerPowMod` when the base is 0 and the exponent is negative, and `integerRecipMod` when the modulus is zero ([#26017](https://gitlab.haskell.org/ghc/ghc/-/issues/26017)). View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/45bc79ab3c196a90297cad2368983da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/45bc79ab3c196a90297cad2368983da… You're receiving this email because of your account on gitlab.haskell.org.

1 0