- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/T26834] 6 commits: Refine import of Conc.IO
by Teo Camarasu (＠teo) 31 Jan '26

31 Jan '26

Teo Camarasu pushed to branch wip/T26834 at Glasgow Haskell Compiler / GHC Commits: ce4b8e28 by Teo Camarasu at 2026-01-31T11:56:52+00:00 Refine import of Conc.IO - - - - - 2d986e7c by Teo Camarasu at 2026-01-31T12:09:47+00:00 Move IO instance into MonadFix Revert "Move MonadFix instance of Q into MonadFix" This reverts commit e14fec2ddd5f3896a71aa9cbfb427523e8f6cdb2. - - - - - 49ef6c22 by Teo Camarasu at 2026-01-31T12:29:07+00:00 Avoid depending on Conc.Sync for re-exports - - - - - 77e0944d by Teo Camarasu at 2026-01-31T12:55:52+00:00 Invert some Read instances - - - - - d016d9c3 by Teo Camarasu at 2026-01-31T12:57:24+00:00 Explicit import - - - - - 52a9e6a0 by Teo Camarasu at 2026-01-31T13:09:21+00:00 HMMM Don't import Signal? - - - - - 18 changed files: - libraries/base/src/Control/Exception.hs - libraries/base/src/Control/Exception/Base.hs - libraries/base/src/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Bound.hs - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/Control/Exception.hs - libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs - libraries/ghc-internal/src/GHC/Internal/Data/Either.hs - libraries/ghc-internal/src/GHC/Internal/Data/Proxy.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Coercion.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Equality.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/IO/Device.hs - libraries/ghc-internal/src/GHC/Internal/IO/FD.hs - libraries/ghc-internal/src/GHC/Internal/Read.hs - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/TopHandler.hs Changes: ===================================== libraries/base/src/Control/Exception.hs ===================================== @@ -124,6 +124,7 @@ module Control.Exception import GHC.Internal.Control.Exception import GHC.Internal.Exception.Type +import GHC.Internal.Conc.Sync {- $catching ===================================== libraries/base/src/Control/Exception/Base.hs ===================================== @@ -1,4 +1,4 @@ -{-# LANGUAGE Safe #-} +{-# LANGUAGE Trustworthy #-} -- | -- @@ -91,3 +91,4 @@ module Control.Exception.Base ) where import GHC.Internal.Control.Exception.Base +import GHC.Internal.Conc.Sync (throwTo) ===================================== libraries/base/src/System/IO.hs ===================================== @@ -185,6 +185,7 @@ module System.IO ) where import GHC.Internal.System.IO +import GHC.Internal.Control.Monad.Fix (fixIO) -- $locking -- Implementations should enforce as far as possible, at least locally to the ===================================== libraries/ghc-internal/src/GHC/Internal/Conc/Bound.hs ===================================== @@ -66,6 +66,7 @@ import GHC.Internal.Foreign.C.Types import GHC.Internal.Control.Monad.Fail import GHC.Internal.Data.Either import qualified GHC.Internal.Control.Exception.Base as Exception +import qualified GHC.Internal.Conc.Sync as Exception import GHC.Internal.Base import GHC.Internal.Conc.Sync import GHC.Internal.IO ===================================== libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc ===================================== @@ -48,7 +48,7 @@ import GHC.Internal.Foreign.Marshal.Alloc import GHC.Internal.Foreign.Ptr import GHC.Internal.Foreign.Storable import GHC.Internal.Stable -import GHC.Internal.Conc.IO +import GHC.Internal.Event.Thread import GHC.Internal.Control.Concurrent.MVar data Handler ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Exception.hs ===================================== @@ -64,7 +64,6 @@ module GHC.Internal.Control.Exception ( throwIO, rethrowIO, ioError, - throwTo, -- ** The @catch@ functions catch, ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs ===================================== @@ -49,7 +49,6 @@ module GHC.Internal.Control.Exception.Base ( rethrowIO, throw, ioError, - throwTo, -- * Catching Exceptions @@ -118,7 +117,6 @@ import GHC.Internal.IO.Exception import GHC.Internal.Exception.Type import GHC.Internal.Show -- import GHC.Internal.Exception hiding ( Exception ) -import GHC.Internal.Conc.Sync import GHC.Internal.Data.Either ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs ===================================== @@ -24,7 +24,8 @@ module GHC.Internal.Control.Monad.Fix ( MonadFix(mfix), - fix + fix, + fixIO ) where import GHC.Internal.Data.Either @@ -34,12 +35,15 @@ import GHC.Internal.Data.Monoid ( Monoid, Dual(..), Sum(..), Product(..) , First(..), Last(..), Alt(..), Ap(..) ) import GHC.Internal.Data.NonEmpty ( NonEmpty(..) ) import GHC.Internal.Data.Tuple ( Solo(..), snd ) -import GHC.Internal.Base ( Monad, errorWithoutStackTrace, (.) ) +import GHC.Internal.Base ( Monad, errorWithoutStackTrace, (.), return ) import GHC.Internal.List ( head, drop ) import GHC.Internal.Control.Monad.ST -import GHC.Internal.System.IO import GHC.Internal.Data.Functor.Identity (Identity(..)) import GHC.Internal.Generics +import GHC.Internal.IO +import GHC.Internal.IO.Exception +import GHC.Internal.IO.Unsafe () +import GHC.Internal.MVar -- | Monads having fixed points with a \'knot-tying\' semantics. -- Instances of 'MonadFix' should satisfy the following laws: @@ -98,6 +102,86 @@ instance MonadFix NonEmpty where neHead ~(a :| _) = a neTail ~(_ :| as) = as +-- --------------------------------------------------------------------------- +-- fixIO + +-- | The implementation of 'Control.Monad.Fix.mfix' for 'IO'. +-- +-- This operation may fail with: +-- +-- * 'FixIOException' if the function passed to 'fixIO' inspects its argument. +-- +-- ==== __Examples__ +-- +-- the IO-action is only executed once. The recursion is only on the values. +-- +-- >>> take 3 <$> fixIO (\x -> putStr ":D" >> (:x) <$> readLn @Int) +-- :D +-- 2 +-- [2,2,2] +-- +-- If we are strict in the value, just as with 'Data.Function.fix', we do not get termination: +-- +-- >>> fixIO (\x -> putStr x >> pure ('x' : x)) +-- * hangs forever * +-- +-- We can tie the knot of a structure within 'IO' using 'fixIO': +-- +-- @ +-- data Node = MkNode Int (IORef Node) +-- +-- foo :: IO () +-- foo = do +-- p \<- fixIO (\p -> newIORef (MkNode 0 p)) +-- q <- output p +-- r <- output q +-- _ <- output r +-- pure () +-- +-- output :: IORef Node -> IO (IORef Node) +-- output ref = do +-- MkNode x p <- readIORef ref +-- print x +-- pure p +-- @ +-- +-- >>> foo +-- 0 +-- 0 +-- 0 +fixIO :: (a -> IO a) -> IO a +fixIO k = do + m <- newEmptyMVar + ans <- unsafeDupableInterleaveIO + (readMVar m `catch` \BlockedIndefinitelyOnMVar -> + throwIO FixIOException) + result <- k ans + putMVar m result + return result + +-- Note [Blackholing in fixIO] +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- We do our own explicit black holing here, because GHC's lazy +-- blackholing isn't enough. In an infinite loop, GHC may run the IO +-- computation a few times before it notices the loop, which is wrong. +-- +-- NOTE2: the explicit black-holing with an IORef ran into trouble +-- with multiple threads (see #5421), so now we use an MVar. We used +-- to use takeMVar with unsafeInterleaveIO. This, however, uses noDuplicate#, +-- which is not particularly cheap. Better to use readMVar, which can be +-- performed in multiple threads safely, and to use unsafeDupableInterleaveIO +-- to avoid the noDuplicate cost. +-- +-- What we'd ideally want is probably an IVar, but we don't quite have those. +-- STM TVars look like an option at first, but I don't think they are: +-- we'd need to be able to write to the variable in an IO context, which can +-- only be done using 'atomically', and 'atomically' is not allowed within +-- unsafePerformIO. We can't know if someone will try to use the result +-- of fixIO with unsafePerformIO! +-- +-- See also System.IO.Unsafe.unsafeFixIO. +-- + -- | @since base-2.01 instance MonadFix IO where mfix = fixIO ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Either.hs ===================================== @@ -34,7 +34,6 @@ module GHC.Internal.Data.Either ( import GHC.Internal.Base import GHC.Internal.Show -import GHC.Internal.Read -- $setup -- Allow the use of some Prelude functions in doctests. @@ -127,7 +126,6 @@ Left "parse error" data Either a b = Left a | Right b deriving ( Eq -- ^ @since base-2.01 , Ord -- ^ @since base-2.01 - , Read -- ^ @since base-3.0 , Show -- ^ @since base-3.0 ) ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Proxy.hs ===================================== @@ -24,7 +24,6 @@ module GHC.Internal.Data.Proxy import GHC.Internal.Base import GHC.Internal.Show -import GHC.Internal.Read import GHC.Internal.Enum import GHC.Internal.Arr @@ -54,7 +53,6 @@ import GHC.Internal.Arr -- >>> Proxy :: Proxy complicatedStructure -- Proxy data Proxy t = Proxy deriving ( Bounded -- ^ @since base-4.7.0.0 - , Read -- ^ @since base-4.7.0.0 ) -- | A concrete, promotable proxy type, for use at the kind level. ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Coercion.hs ===================================== @@ -36,7 +36,6 @@ import qualified GHC.Internal.Data.Type.Equality as Eq import GHC.Internal.Data.Maybe import GHC.Internal.Enum import GHC.Internal.Show -import GHC.Internal.Read import GHC.Internal.Base -- | Representational equality. If @Coercion a b@ is inhabited by some terminating @@ -84,9 +83,6 @@ deriving instance Show (Coercion a b) -- | @since base-4.7.0.0 deriving instance Ord (Coercion a b) --- | @since base-4.7.0.0 -deriving instance Coercible a b => Read (Coercion a b) - -- | @since base-4.7.0.0 instance Coercible a b => Enum (Coercion a b) where toEnum 0 = Coercion ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Equality.hs ===================================== @@ -49,7 +49,6 @@ module GHC.Internal.Data.Type.Equality ( import GHC.Internal.Data.Maybe import GHC.Internal.Enum import GHC.Internal.Show -import GHC.Internal.Read import GHC.Internal.Base import GHC.Internal.Data.Type.Bool @@ -105,9 +104,6 @@ deriving instance Show (a :~: b) -- | @since base-4.7.0.0 deriving instance Ord (a :~: b) --- | @since base-4.7.0.0 -deriving instance a ~ b => Read (a :~: b) - -- | @since base-4.7.0.0 instance a ~ b => Enum (a :~: b) where toEnum 0 = Refl @@ -133,9 +129,6 @@ deriving instance Show (a :~~: b) -- | @since base-4.10.0.0 deriving instance Ord (a :~~: b) --- | @since base-4.10.0.0 -deriving instance a ~~ b => Read (a :~~: b) - -- | @since base-4.10.0.0 instance a ~~ b => Enum (a :~~: b) where toEnum 0 = HRefl ===================================== libraries/ghc-internal/src/GHC/Internal/Event/Control.hs ===================================== @@ -8,8 +8,7 @@ module GHC.Internal.Event.Control ( -- * Managing the IO manager - Signal - , ControlMessage(..) + ControlMessage(..) , Control , newControl , closeControl @@ -31,7 +30,6 @@ module GHC.Internal.Event.Control import GHC.Internal.Base import GHC.Internal.IORef -import GHC.Internal.Conc.Signal (Signal) import GHC.Internal.Real (fromIntegral) import GHC.Internal.Show (Show) import GHC.Internal.Word (Word8) @@ -56,7 +54,7 @@ import GHC.Internal.Foreign.C.Error (eAGAIN, eWOULDBLOCK, eBADF) data ControlMessage = CMsgWakeup | CMsgDie | CMsgSignal {-# UNPACK #-} !(ForeignPtr Word8) - {-# UNPACK #-} !Signal + {-# UNPACK #-} !CInt -- type Signal = CInt deriving ( Eq -- ^ @since base-4.4.0.0 , Show -- ^ @since base-4.4.0.0 ) ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Device.hs ===================================== @@ -35,7 +35,7 @@ import GHC.Internal.Read import GHC.Internal.Show import GHC.Internal.Ptr import GHC.Internal.Num -import GHC.Internal.IO +import GHC.Internal.IO (throwIO) import {-# SOURCE #-} GHC.Internal.IO.Exception ( unsupportedOperation ) -- | A low-level I/O provider where the data is bytes in memory. ===================================== libraries/ghc-internal/src/GHC/Internal/IO/FD.hs ===================================== @@ -45,7 +45,7 @@ import GHC.Internal.IO.Buffer import GHC.Internal.IO.BufferedIO import qualified GHC.Internal.IO.Device import GHC.Internal.IO.Device (SeekMode(..), IODeviceType(..)) -import GHC.Internal.Conc.IO +import GHC.Internal.Event.Thread import GHC.Internal.IO.Exception #if defined(mingw32_HOST_OS) import GHC.Internal.Windows ===================================== libraries/ghc-internal/src/GHC/Internal/Read.hs ===================================== @@ -1,5 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CPP, NoImplicitPrelude, StandaloneDeriving, ScopedTypeVariables #-} +{-# LANGUAGE CPP, NoImplicitPrelude, StandaloneDeriving, ScopedTypeVariables, TypeOperators #-} {-# OPTIONS_HADDOCK not-home #-} ----------------------------------------------------------------------------- @@ -74,6 +74,10 @@ import GHC.Internal.Arr import GHC.Internal.Word import GHC.Internal.List (filter) import GHC.Internal.Tuple (Solo (..)) +import GHC.Internal.Data.Type.Equality +import GHC.Internal.Data.Type.Coercion +import GHC.Internal.Data.Either +import GHC.Internal.Data.Proxy -- | @'readParen' 'True' p@ parses what @p@ parses, but surrounded with @@ -833,3 +837,20 @@ instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h, ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) }) readListPrec = readListPrecDefault readList = readListDefault + + +-- | @since base-4.7.0.0 +deriving instance a ~ b => Read (a :~: b) + +-- | @since base-4.10.0.0 +deriving instance a ~~ b => Read (a :~~: b) + +-- | @since base-4.7.0.0 +deriving instance Coercible a b => Read (Coercion a b) + + +-- | @since base-3.0 +deriving instance (Read a, Read b) => Read (Either a b) + +-- | @since base-4.7.0.0 +deriving instance Read (Proxy s) ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO.hs ===================================== @@ -20,7 +20,6 @@ module GHC.Internal.System.IO ( -- * The IO monad IO, - fixIO, -- * Files and handles @@ -258,7 +257,6 @@ import GHC.Internal.IO.Encoding import GHC.Internal.Text.Read import GHC.Internal.IO.StdHandles import GHC.Internal.Show -import GHC.Internal.MVar ----------------------------------------------------------------------------- -- Standard IO @@ -602,87 +600,6 @@ hReady h = hWaitForInput h 0 hPrint :: Show a => Handle -> a -> IO () hPrint hdl = hPutStrLn hdl . show - --- --------------------------------------------------------------------------- --- fixIO - --- | The implementation of 'Control.Monad.Fix.mfix' for 'IO'. --- --- This operation may fail with: --- --- * 'FixIOException' if the function passed to 'fixIO' inspects its argument. --- --- ==== __Examples__ --- --- the IO-action is only executed once. The recursion is only on the values. --- --- >>> take 3 <$> fixIO (\x -> putStr ":D" >> (:x) <$> readLn @Int) --- :D --- 2 --- [2,2,2] --- --- If we are strict in the value, just as with 'Data.Function.fix', we do not get termination: --- --- >>> fixIO (\x -> putStr x >> pure ('x' : x)) --- * hangs forever * --- --- We can tie the knot of a structure within 'IO' using 'fixIO': --- --- @ --- data Node = MkNode Int (IORef Node) --- --- foo :: IO () --- foo = do --- p \<- fixIO (\p -> newIORef (MkNode 0 p)) --- q <- output p --- r <- output q --- _ <- output r --- pure () --- --- output :: IORef Node -> IO (IORef Node) --- output ref = do --- MkNode x p <- readIORef ref --- print x --- pure p --- @ --- --- >>> foo --- 0 --- 0 --- 0 -fixIO :: (a -> IO a) -> IO a -fixIO k = do - m <- newEmptyMVar - ans <- unsafeDupableInterleaveIO - (readMVar m `catch` \BlockedIndefinitelyOnMVar -> - throwIO FixIOException) - result <- k ans - putMVar m result - return result - --- Note [Blackholing in fixIO] --- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- We do our own explicit black holing here, because GHC's lazy --- blackholing isn't enough. In an infinite loop, GHC may run the IO --- computation a few times before it notices the loop, which is wrong. --- --- NOTE2: the explicit black-holing with an IORef ran into trouble --- with multiple threads (see #5421), so now we use an MVar. We used --- to use takeMVar with unsafeInterleaveIO. This, however, uses noDuplicate#, --- which is not particularly cheap. Better to use readMVar, which can be --- performed in multiple threads safely, and to use unsafeDupableInterleaveIO --- to avoid the noDuplicate cost. --- --- What we'd ideally want is probably an IVar, but we don't quite have those. --- STM TVars look like an option at first, but I don't think they are: --- we'd need to be able to write to the variable in an IO context, which can --- only be done using 'atomically', and 'atomically' is not allowed within --- unsafePerformIO. We can't know if someone will try to use the result --- of fixIO with unsafePerformIO! --- --- See also System.IO.Unsafe.unsafeFixIO. --- - -- | The function creates a temporary file in ReadWrite mode. -- The created file isn\'t deleted automatically, so you need to delete it manually. -- ===================================== libraries/ghc-internal/src/GHC/Internal/TopHandler.hs ===================================== @@ -37,6 +37,7 @@ module GHC.Internal.TopHandler ( #include "HsBaseConfig.h" import GHC.Internal.Control.Exception +import GHC.Internal.Conc.Sync (throwTo) import GHC.Internal.Data.Maybe import GHC.Internal.Foreign.C.Error View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e14fec2ddd5f3896a71aa9cbfb4275… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e14fec2ddd5f3896a71aa9cbfb4275… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/int-index/drop-tylit
by Vladislav Zavialov (＠int-index) 31 Jan '26

31 Jan '26

Vladislav Zavialov pushed new branch wip/int-index/drop-tylit at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/int-index/drop-tylit You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/no-multiline] Refactor: merge HsMultilineString into HsString (#26860)
by Vladislav Zavialov (＠int-index) 31 Jan '26

31 Jan '26

Vladislav Zavialov pushed to branch wip/int-index/no-multiline at Glasgow Haskell Compiler / GHC Commits: 2aeefaee by Vladislav Zavialov at 2026-01-31T15:56:45+03:00 Refactor: merge HsMultilineString into HsString (#26860) Before this patch, HsLit defined two separate constructors to represent single-line and multi-line strings: data HsLit x ... | HsString (XHsString x) FastString | HsMultilineString (XHsMultilineString x) FastString I found this to be an unnecessary complication and an obstacle to unifying HsLit with HsTyLit. Now we use HsString for both kinds of literals. One user-facing change here is `ppr (HsString st s)` behaving differently for single-line strings containing newlines: x = "first line \ \asdf\n\ \second line" Previously, the literal was fed to `ftext` with its newlines, producing an ill-formed SDoc. This issue is now addressed by using `split` for both single-line and multi-line strings: vcat $ map text $ split '\n' (unpackFS src) See the parser/should_fail/T26860ppr test. In addition (and unrelatedly to the main payload of this patch), drop the unused pmPprHsLit helper. - - - - - 14 changed files: - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Syn/Type.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/String.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - + testsuite/tests/parser/should_fail/T26860ppr.hs - + testsuite/tests/parser/should_fail/T26860ppr.stderr - testsuite/tests/parser/should_fail/all.T - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Hs/Lit.hs ===================================== @@ -45,7 +45,6 @@ import Language.Haskell.Syntax.Lit type instance XHsChar (GhcPass _) = SourceText type instance XHsCharPrim (GhcPass _) = SourceText type instance XHsString (GhcPass _) = SourceText -type instance XHsMultilineString (GhcPass _) = SourceText type instance XHsStringPrim (GhcPass _) = SourceText type instance XHsInt (GhcPass _) = NoExtField type instance XHsIntPrim (GhcPass _) = SourceText @@ -147,7 +146,6 @@ hsLitNeedsParens p = go go (HsChar {}) = False go (HsCharPrim {}) = False go (HsString {}) = False - go (HsMultilineString {}) = False go (HsStringPrim {}) = False go (HsInt _ x) = p > topPrec && il_neg x go (HsFloatPrim {}) = False @@ -177,7 +175,6 @@ convertLit :: XXLit (GhcPass p)~DataConCantHappen => HsLit (GhcPass p) -> HsLit convertLit (HsChar a x) = HsChar a x convertLit (HsCharPrim a x) = HsCharPrim a x convertLit (HsString a x) = HsString a x -convertLit (HsMultilineString a x) = HsMultilineString a x convertLit (HsStringPrim a x) = HsStringPrim a x convertLit (HsInt a x) = HsInt a x convertLit (HsIntPrim a x) = HsIntPrim a x @@ -212,8 +209,7 @@ Equivalently it's True if instance IsPass p => Outputable (HsLit (GhcPass p)) where ppr (HsChar st c) = pprWithSourceText st (pprHsChar c) ppr (HsCharPrim st c) = pprWithSourceText st (pprPrimChar c) - ppr (HsString st s) = pprWithSourceText st (pprHsString s) - ppr (HsMultilineString st s) = + ppr (HsString st s) = case st of NoSourceText -> pprHsString s SourceText src -> vcat $ map text $ split '\n' (unpackFS src) @@ -248,36 +244,6 @@ instance Outputable OverLitVal where ppr (HsFractional f) = ppr f ppr (HsIsString st s) = pprWithSourceText st (pprHsString s) --- | pmPprHsLit pretty prints literals and is used when pretty printing pattern --- match warnings. All are printed the same (i.e., without hashes if they are --- primitive and not wrapped in constructors if they are boxed). This happens --- mainly for too reasons: --- * We do not want to expose their internal representation --- * The warnings become too messy -pmPprHsLit :: forall p. IsPass p => HsLit (GhcPass p) -> SDoc -pmPprHsLit (HsChar _ c) = pprHsChar c -pmPprHsLit (HsCharPrim _ c) = pprHsChar c -pmPprHsLit (HsString st s) = pprWithSourceText st (pprHsString s) -pmPprHsLit (HsMultilineString st s) = pprWithSourceText st (pprHsString s) -pmPprHsLit (HsStringPrim _ s) = pprHsBytes s -pmPprHsLit (HsInt _ i) = integer (il_value i) -pmPprHsLit (HsIntPrim _ i) = integer i -pmPprHsLit (HsWordPrim _ w) = integer w -pmPprHsLit (HsInt8Prim _ i) = integer i -pmPprHsLit (HsInt16Prim _ i) = integer i -pmPprHsLit (HsInt32Prim _ i) = integer i -pmPprHsLit (HsInt64Prim _ i) = integer i -pmPprHsLit (HsWord8Prim _ w) = integer w -pmPprHsLit (HsWord16Prim _ w) = integer w -pmPprHsLit (HsWord32Prim _ w) = integer w -pmPprHsLit (HsWord64Prim _ w) = integer w -pmPprHsLit (HsFloatPrim _ f) = ppr f -pmPprHsLit (HsDoublePrim _ d) = ppr d -pmPprHsLit (XLit x) = case ghcPass @p of - GhcTc -> case x of - (HsInteger _ i _) -> integer i - (HsRat f _) -> ppr f - negateOverLitVal :: OverLitVal -> OverLitVal negateOverLitVal (HsIntegral i) = HsIntegral (negateIntegralLit i) negateOverLitVal (HsFractional f) = HsFractional (negateFractionalLit f) ===================================== compiler/GHC/Hs/Syn/Type.hs ===================================== @@ -75,7 +75,6 @@ hsLitType :: forall p. IsPass p => HsLit (GhcPass p) -> Type hsLitType (HsChar _ _) = charTy hsLitType (HsCharPrim _ _) = charPrimTy hsLitType (HsString _ _) = stringTy -hsLitType (HsMultilineString _ _) = stringTy hsLitType (HsStringPrim _ _) = addrPrimTy hsLitType (HsInt _ _) = intTy hsLitType (HsIntPrim _ _) = intPrimTy ===================================== compiler/GHC/HsToCore/Match/Literal.hs ===================================== @@ -117,7 +117,6 @@ dsLit l = do HsDoublePrim _ fl -> return (Lit (LitDouble (rationalFromFractionalLit fl))) HsChar _ c -> return (mkCharExpr c) HsString _ str -> mkStringExprFS str - HsMultilineString _ str -> mkStringExprFS str HsInt _ i -> return (mkIntExpr platform (il_value i)) XLit x -> case ghcPass @p of GhcTc -> case x of @@ -463,7 +462,6 @@ getSimpleIntegralLit (XLit (HsInteger _ i ty)) = Just (i, ty) getSimpleIntegralLit HsChar{} = Nothing getSimpleIntegralLit HsCharPrim{} = Nothing getSimpleIntegralLit HsString{} = Nothing -getSimpleIntegralLit HsMultilineString{} = Nothing getSimpleIntegralLit HsStringPrim{} = Nothing getSimpleIntegralLit (XLit (HsRat{})) = Nothing getSimpleIntegralLit HsFloatPrim{} = Nothing ===================================== compiler/GHC/HsToCore/Quote.hs ===================================== @@ -3077,7 +3077,6 @@ repLiteral lit HsChar _ _ -> Just charLName HsCharPrim _ _ -> Just charPrimLName HsString _ _ -> Just stringLName - HsMultilineString _ _ -> Just stringLName _ -> Nothing mk_integer :: Integer -> MetaM (HsLit GhcTc) ===================================== compiler/GHC/Parser.y ===================================== @@ -4130,7 +4130,7 @@ literal :: { Located (HsLit GhcPs) } : CHAR { sL1 $1 $ HsChar (getCHARs $1) $ getCHAR $1 } | STRING { sL1 $1 $ HsString (getSTRINGs $1) $ getSTRING $1 } - | STRING_MULTI { sL1 $1 $ HsMultilineString (getSTRINGMULTIs $1) + | STRING_MULTI { sL1 $1 $ HsString (getSTRINGMULTIs $1) $ getSTRINGMULTI $1 } | PRIMINTEGER { sL1 $1 $ HsIntPrim (getPRIMINTEGERs $1) $ getPRIMINTEGER $1 } ===================================== compiler/GHC/Parser/String.hs ===================================== @@ -392,9 +392,9 @@ proposal: https://github.com/ghc-proposals/ghc-proposals/pull/569 Multiline string literals are syntax sugar for normal string literals, with an extra post processing step. This all happens in the Lexer; that -is, HsMultilineString will contain the post-processed string. This matches -the same behavior as HsString, which contains the normalized string -(see Note [Literal source text]). +is, the multi-line HsString will contain the post-processed string. +This matches the behavior of the single-line HsString, which contains +the normalized string too (see Note [Literal source text]). The canonical steps for post processing a multiline string are: 1. Collapse string gaps ===================================== compiler/GHC/Rename/Expr.hs ===================================== @@ -352,18 +352,13 @@ rnExpr (HsOverLabel src v) hs_ty_arg = mkEmptyWildCardBndrs $ wrapGenSpan $ HsTyLit noExtField (HsStrTy NoSourceText v) -rnExpr (HsLit x lit) | Just (src, s) <- stringLike lit +rnExpr (HsLit x lit) | HsString src s <- lit = do { opt_OverloadedStrings <- xoptM LangExt.OverloadedStrings ; if opt_OverloadedStrings then rnExpr (HsOverLit x (mkHsIsString src s)) else do { ; rnLit lit ; return (HsLit x (convertLit lit), emptyFVs) } } - where - stringLike = \case - HsString src s -> Just (src, s) - HsMultilineString src s -> Just (src, s) - _ -> Nothing rnExpr (HsLit x lit) = do { rnLit lit ===================================== compiler/GHC/Tc/Gen/HsType.hs ===================================== @@ -4786,7 +4786,6 @@ promotionErr name err tyLitFromLit :: HsLit GhcRn -> Maybe (HsTyLit GhcRn) tyLitFromLit (HsString x str) = Just (HsStrTy x str) -tyLitFromLit (HsMultilineString x str) = Just (HsStrTy x str) tyLitFromLit (HsChar x char) = Just (HsCharTy x char) tyLitFromLit _ = Nothing ===================================== compiler/Language/Haskell/Syntax/Extension.hs ===================================== @@ -604,7 +604,6 @@ type family XXParStmtBlock x x' type family XHsChar x type family XHsCharPrim x type family XHsString x -type family XHsMultilineString x type family XHsStringPrim x type family XHsInt x type family XHsIntPrim x ===================================== compiler/Language/Haskell/Syntax/Lit.hs ===================================== @@ -47,8 +47,6 @@ data HsLit x -- ^ Unboxed character | HsString (XHsString x) {- SourceText -} FastString -- ^ String - | HsMultilineString (XHsMultilineString x) {- SourceText -} FastString - -- ^ String | HsStringPrim (XHsStringPrim x) {- SourceText -} !ByteString -- ^ Packed bytes | HsInt (XHsInt x) IntegralLit ===================================== testsuite/tests/parser/should_fail/T26860ppr.hs ===================================== @@ -0,0 +1,11 @@ +{-# LANGUAGE NoOverloadedStrings #-} + +module T26860ppr where + +-- Test that the error message containing the string literal is well-formatted. +-- See also: parser/should_fail/MultilineStringsError +x :: Int +x = "first line \ + \asdf\n\ + \second line" + ===================================== testsuite/tests/parser/should_fail/T26860ppr.stderr ===================================== @@ -0,0 +1,13 @@ +T26860ppr.hs:8:5: error: [GHC-83865] + • Couldn't match type ‘[Char]’ with ‘Int’ + Expected: Int + Actual: String + • In the expression: + "first line \ + \asdf\n\ + \second line" + In an equation for ‘x’: + x = "first line \ + \asdf\n\ + \second line" + ===================================== testsuite/tests/parser/should_fail/all.T ===================================== @@ -244,3 +244,4 @@ test('T25530', normal, compile_fail, ['']) test('T26418', normal, compile_fail, ['']) test('T12488c', normal, compile_fail, ['']) test('T12488d', normal, compile_fail, ['']) +test('T26860ppr', normal, compile_fail, ['']) ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -4794,7 +4794,6 @@ hsLit2String lit = HsChar src v -> toSourceTextWithSuffix src v "" HsCharPrim src p -> toSourceTextWithSuffix src p "" HsString src v -> toSourceTextWithSuffix src v "" - HsMultilineString src v -> toSourceTextWithSuffix src v "" HsStringPrim src v -> toSourceTextWithSuffix src v "" HsInt _ (IL src _ v) -> toSourceTextWithSuffix src v "" HsIntPrim src v -> toSourceTextWithSuffix src v "" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2aeefaee539e7cba900d1722d559c28… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2aeefaee539e7cba900d1722d559c28… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26834] 12 commits: Invert Identity/Const Traversable instances
by Teo Camarasu (＠teo) 31 Jan '26

31 Jan '26

Teo Camarasu pushed to branch wip/T26834 at Glasgow Haskell Compiler / GHC Commits: d99c7b3a by Teo Camarasu at 2026-01-31T11:37:17+00:00 Invert Identity/Const Traversable instances - - - - - 90f61ccd by Teo Camarasu at 2026-01-31T11:37:18+00:00 Refine imports of GHC.Internal.Control.Monad - - - - - 802d4adf by Teo Camarasu at 2026-01-31T11:37:19+00:00 Float up Generics - - - - - 2a542bf0 by Teo Camarasu at 2026-01-31T11:37:19+00:00 Refine imports of GHC.Internal.Stack - - - - - f0658571 by Teo Camarasu at 2026-01-31T11:38:09+00:00 Tidy up GHC.Internal.Stack - - - - - 95febc30 by Teo Camarasu at 2026-01-31T11:38:09+00:00 Switch MonadFix with Arrow - - - - - 625c1b1a by Teo Camarasu at 2026-01-31T11:38:09+00:00 Refine import of ForeignPtr - - - - - e4ee1d14 by Teo Camarasu at 2026-01-31T11:38:09+00:00 wip - - - - - 955465e9 by Teo Camarasu at 2026-01-31T11:38:10+00:00 Explicit imports - - - - - 87ffd839 by Teo Camarasu at 2026-01-31T11:38:10+00:00 Delete re-exports - - - - - e8428e16 by Teo Camarasu at 2026-01-31T11:38:10+00:00 Delete Imp modules - - - - - e14fec2d by Teo Camarasu at 2026-01-31T11:38:10+00:00 Move MonadFix instance of Q into MonadFix - - - - - 49 changed files: - libraries/base/src/Control/Monad/ST.hs - libraries/base/src/Control/Monad/ST/Lazy.hs - libraries/base/src/Control/Monad/ST/Lazy/Safe.hs - libraries/base/src/Control/Monad/ST/Lazy/Unsafe.hs - libraries/base/src/Control/Monad/ST/Safe.hs - libraries/base/src/Control/Monad/ST/Strict.hs - libraries/base/src/Control/Monad/ST/Unsafe.hs - libraries/base/src/Data/STRef/Lazy.hs - libraries/base/src/Data/Traversable.hs - libraries/base/src/Foreign/ForeignPtr.hs - libraries/base/src/Foreign/ForeignPtr/Safe.hs - libraries/base/src/Foreign/ForeignPtr/Unsafe.hs - libraries/base/src/GHC/Stack.hs - libraries/base/src/Numeric.hs - libraries/ghc-internal/ghc-internal.cabal.in - 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.hs - − libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Lazy.hs - − libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Lazy/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Zip.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs - libraries/ghc-internal/src/GHC/Internal/Data/Semigroup/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/String.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs - libraries/ghc-internal/src/GHC/Internal/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/ForeignPtr.hs - − libraries/ghc-internal/src/GHC/Internal/Foreign/ForeignPtr/Imp.hs - − libraries/ghc-internal/src/GHC/Internal/Foreign/ForeignPtr/Unsafe.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs - libraries/ghc-internal/src/GHC/Internal/IO/Buffer.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs - libraries/ghc-internal/src/GHC/Internal/IORef.hs - libraries/ghc-internal/src/GHC/Internal/Numeric.hs - libraries/ghc-internal/src/GHC/Internal/ResponseFile.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/Stack.hs - libraries/ghc-internal/src/GHC/Internal/Stats.hsc - libraries/ghc-internal/src/GHC/Internal/System/Environment.hs - libraries/ghc-internal/src/GHC/Internal/System/Exit.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/TH/Monad.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/44b212a7813ef6781b3d461585b6de… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/44b212a7813ef6781b3d461585b6de… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26859] Deleted 1 commit: try no data instance
by Teo Camarasu (＠teo) 31 Jan '26

31 Jan '26

Teo Camarasu pushed to branch wip/T26859 at Glasgow Haskell Compiler / GHC WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: a1a1fe26 by Teo Camarasu at 2026-01-31T02:11:59+00:00 try no data instance - - - - - 1 changed file: - libraries/base/src/Data/Ord.hs Changes: ===================================== libraries/base/src/Data/Ord.hs ===================================== @@ -41,7 +41,7 @@ import GHC.Internal.Generics import GHC.Internal.Data.Foldable import GHC.Internal.Data.Traversable import GHC.Internal.Control.Monad.Zip -import GHC.Internal.Data.Data +--import GHC.Internal.Data.Data -- $setup -- >>> import Prelude @@ -173,7 +173,7 @@ instance Monad Down where Down a >>= k = k a -- | @since base-4.12.0.0 -deriving instance Data a => Data (Down a) +--deriving instance Data a => Data (Down a) -- | -- > comparing p x y = compare (p x) (p y) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1a1fe26970c4300dd6b0c4ee71e828… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1a1fe26970c4300dd6b0c4ee71e828… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/fix-docs
by Simon Hengel (＠sol) 31 Jan '26

31 Jan '26

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

1 0

[Git][ghc/ghc][wip/T26859] try no data instance
by Teo Camarasu (＠teo) 31 Jan '26

31 Jan '26

Teo Camarasu pushed to branch wip/T26859 at Glasgow Haskell Compiler / GHC Commits: a1a1fe26 by Teo Camarasu at 2026-01-31T02:11:59+00:00 try no data instance - - - - - 1 changed file: - libraries/base/src/Data/Ord.hs Changes: ===================================== libraries/base/src/Data/Ord.hs ===================================== @@ -41,7 +41,7 @@ import GHC.Internal.Generics import GHC.Internal.Data.Foldable import GHC.Internal.Data.Traversable import GHC.Internal.Control.Monad.Zip -import GHC.Internal.Data.Data +--import GHC.Internal.Data.Data -- $setup -- >>> import Prelude @@ -173,7 +173,7 @@ instance Monad Down where Down a >>= k = k a -- | @since base-4.12.0.0 -deriving instance Data a => Data (Down a) +--deriving instance Data a => Data (Down a) -- | -- > comparing p x y = compare (p x) (p y) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1a1fe26970c4300dd6b0c4ee71e828… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1a1fe26970c4300dd6b0c4ee71e828… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26859] ghc-internal: Move GHC.Internal.Data.Ord to base:Data.Ord
by Teo Camarasu (＠teo) 30 Jan '26

30 Jan '26

Teo Camarasu pushed to branch wip/T26859 at Glasgow Haskell Compiler / GHC Commits: 54910a17 by Teo Camarasu at 2026-01-30T23:45:27+00:00 ghc-internal: Move GHC.Internal.Data.Ord to base:Data.Ord This module is just a re-export of Ord and the definition of some utilities. Nothing from this module is used in ghc-internal and none of it is known key or wiredin. Yet its presence linearises the module graph. Let's move it base. Resolves #26859 - - - - - 26 changed files: - libraries/base/src/Data/Foldable1.hs - libraries/base/src/Data/Functor/Classes.hs - libraries/base/src/Data/List.hs - libraries/base/src/Data/List/NonEmpty.hs - libraries/base/src/Data/List/NubOrdSet.hs - libraries/base/src/Data/Ord.hs - libraries/base/src/GHC/Exts.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/ClosureTypes.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Zip.hs - libraries/ghc-internal/src/GHC/Internal/Data/Data.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - − libraries/ghc-internal/src/GHC/Internal/Data/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - 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/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54910a1757ca494c842cdc0612896d2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/54910a1757ca494c842cdc0612896d2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26834] 17 commits: PPC NCG: Use libcall for 64-bit cmpxchg on 32-bit PowerPC
by Teo Camarasu (＠teo) 30 Jan '26

30 Jan '26

Teo Camarasu pushed to branch wip/T26834 at Glasgow Haskell Compiler / GHC Commits: ce2d62fb by Jessica Clarke at 2026-01-29T19:48:51-05:00 PPC NCG: Use libcall for 64-bit cmpxchg on 32-bit PowerPC There is no native instruction for this, and even if there were a register pair version we could use, the implementation here is assuming the values fit in a single register, and we end up only using / defining the low halves of the registers. Fixes: b4d39adbb5 ("PrimOps: Add CAS op for all int sizes") Fixes: #23969 - - - - - 43d97761 by Michael Karcher at 2026-01-29T19:49:43-05:00 NCG for PPC: add pattern for CmmRegOff to iselExpr64 Closes #26828 - - - - - aeeb4a20 by Matthew Pickering at 2026-01-30T11:42:47-05:00 determinism: Use deterministic map for Strings in TyLitMap When generating typeable evidence the types we need evidence for all cached in a TypeMap, the order terms are retrieved from a type map determines the order the bindings appear in the program. A TypeMap is quite diligent to use deterministic maps, apart from in the TyLitMap, which uses a UniqFM for storing strings, whose ordering depends on the Unique of the FastString. This can cause non-deterministic .hi and .o files. An unexpected side-effect is the error message but RecordDotSyntaxFail8 changing. I looked into this with Sam and this change caused the constraints to be solved in a different order which results in a slightly different error message. I have accepted the new test, since the output before was non-deterministic and the new output is consistent with the other messages in that file. Fixes #26846 - - - - - 9e4d70c2 by Andrew Lelechenko at 2026-01-30T11:43:29-05:00 Upgrade text submodule to 2.1.4 - - - - - 5085d918 by Teo Camarasu at 2026-01-30T18:11:09+00:00 ghc-internal: refine imports of GHC.Internal.Data.Bool - - - - - 33505d95 by Teo Camarasu at 2026-01-30T18:11:09+00:00 Delete unecessary GHC.Internal.Data.Ix - - - - - 3f053e9d by Teo Camarasu at 2026-01-30T18:11:09+00:00 ghc-internal: refine List imports - - - - - 008d7ff2 by Teo Camarasu at 2026-01-30T18:11:10+00:00 Move MonadFix Identity into Monad.Fix - - - - - 6c06525c by Teo Camarasu at 2026-01-30T18:12:27+00:00 ghc-internal: Move GHC.Internal.Data.Ord to base:Data.Ord This module is just a re-export of Ord and the definition of some utilities. Nothing from this module is used in ghc-internal and none of it is known key or wiredin. Yet its presence linearises the module graph. Let's move it base. Resolves #26859 - - - - - d2f11069 by Teo Camarasu at 2026-01-30T18:31:51+00:00 Invert Identity/Const Traversable instances - - - - - be7ef54e by Teo Camarasu at 2026-01-30T18:34:17+00:00 Refine imports of GHC.Internal.Control.Monad - - - - - 48f8c975 by Teo Camarasu at 2026-01-30T20:22:05+00:00 Float up Generics - - - - - 45692c90 by Teo Camarasu at 2026-01-30T20:22:05+00:00 Refine imports of GHC.Internal.Stack - - - - - bb3ff50f by Teo Camarasu at 2026-01-30T20:22:05+00:00 Tidy up GHC.Internal.Stack - - - - - 91d1295c by Teo Camarasu at 2026-01-30T20:24:16+00:00 Switch MonadFix with Arrow - - - - - b7c5ad3d by Teo Camarasu at 2026-01-30T20:24:17+00:00 Refine import of ForeignPtr - - - - - 44b212a7 by Teo Camarasu at 2026-01-30T20:40:39+00:00 wip - - - - - 66 changed files: - compiler/GHC/CmmToAsm/PPC/CodeGen.hs - compiler/GHC/Core/Map/Type.hs - libraries/base/src/Data/Foldable1.hs - libraries/base/src/Data/Functor/Classes.hs - libraries/base/src/Data/Ix.hs - libraries/base/src/Data/List.hs - libraries/base/src/Data/List/NonEmpty.hs - libraries/base/src/Data/List/NubOrdSet.hs - libraries/base/src/Data/Ord.hs - libraries/base/src/Data/Traversable.hs - libraries/base/src/GHC/Exts.hs - libraries/base/src/GHC/Stack.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/ClosureTypes.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/Zip.hs - libraries/ghc-internal/src/GHC/Internal/Data/Data.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Function.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - − libraries/ghc-internal/src/GHC/Internal/Data/Ix.hs - libraries/ghc-internal/src/GHC/Internal/Data/List/NonEmpty.hs - libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs - − libraries/ghc-internal/src/GHC/Internal/Data/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Semigroup/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/String.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows.hsc - libraries/ghc-internal/src/GHC/Internal/ExecutionStack/Internal.hsc - libraries/ghc-internal/src/GHC/Internal/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs - libraries/ghc-internal/src/GHC/Internal/IO/Buffer.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/CodePage.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs - libraries/ghc-internal/src/GHC/Internal/IORef.hs - + libraries/ghc-internal/src/GHC/Internal/Prim.hs - + libraries/ghc-internal/src/GHC/Internal/PrimopWrappers.hs - libraries/ghc-internal/src/GHC/Internal/ResponseFile.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/Stack.hs - libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs - libraries/ghc-internal/src/GHC/Internal/Stats.hsc - libraries/ghc-internal/src/GHC/Internal/System/Environment.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/Blank.hsc - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs - libraries/ghc-internal/src/GHC/Internal/TypeError.hs - libraries/text - + testsuite/tests/ghc-api/TypeMapStringLiteral.hs - testsuite/tests/ghc-api/all.T - 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/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1dd155964e9baf4f58a5196b541e7e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1dd155964e9baf4f58a5196b541e7e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/int-index/no-multiline] Refactor: merge HsMultilineString into HsString (#26860)
by Vladislav Zavialov (＠int-index) 30 Jan '26

30 Jan '26

Vladislav Zavialov pushed to branch wip/int-index/no-multiline at Glasgow Haskell Compiler / GHC Commits: 1d461f72 by Vladislav Zavialov at 2026-01-30T23:09:44+03:00 Refactor: merge HsMultilineString into HsString (#26860) Before this patch, HsLit defined two separate constructors to represent single-line and multi-line strings: data HsLit x ... | HsString (XHsString x) FastString | HsMultilineString (XHsMultilineString x) FastString I found this to be an unnecessary complication and an obstacle to unifying HsLit with HsTyLit. Now we use HsString for both kinds of literals. In addition (and unrelatedly to the main payload of this patch), drop the unused pmPprHsLit helper. - - - - - 11 changed files: - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Syn/Type.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/String.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Hs/Lit.hs ===================================== @@ -45,7 +45,6 @@ import Language.Haskell.Syntax.Lit type instance XHsChar (GhcPass _) = SourceText type instance XHsCharPrim (GhcPass _) = SourceText type instance XHsString (GhcPass _) = SourceText -type instance XHsMultilineString (GhcPass _) = SourceText type instance XHsStringPrim (GhcPass _) = SourceText type instance XHsInt (GhcPass _) = NoExtField type instance XHsIntPrim (GhcPass _) = SourceText @@ -147,7 +146,6 @@ hsLitNeedsParens p = go go (HsChar {}) = False go (HsCharPrim {}) = False go (HsString {}) = False - go (HsMultilineString {}) = False go (HsStringPrim {}) = False go (HsInt _ x) = p > topPrec && il_neg x go (HsFloatPrim {}) = False @@ -177,7 +175,6 @@ convertLit :: XXLit (GhcPass p)~DataConCantHappen => HsLit (GhcPass p) -> HsLit convertLit (HsChar a x) = HsChar a x convertLit (HsCharPrim a x) = HsCharPrim a x convertLit (HsString a x) = HsString a x -convertLit (HsMultilineString a x) = HsMultilineString a x convertLit (HsStringPrim a x) = HsStringPrim a x convertLit (HsInt a x) = HsInt a x convertLit (HsIntPrim a x) = HsIntPrim a x @@ -212,8 +209,7 @@ Equivalently it's True if instance IsPass p => Outputable (HsLit (GhcPass p)) where ppr (HsChar st c) = pprWithSourceText st (pprHsChar c) ppr (HsCharPrim st c) = pprWithSourceText st (pprPrimChar c) - ppr (HsString st s) = pprWithSourceText st (pprHsString s) - ppr (HsMultilineString st s) = + ppr (HsString st s) = case st of NoSourceText -> pprHsString s SourceText src -> vcat $ map text $ split '\n' (unpackFS src) @@ -248,36 +244,6 @@ instance Outputable OverLitVal where ppr (HsFractional f) = ppr f ppr (HsIsString st s) = pprWithSourceText st (pprHsString s) --- | pmPprHsLit pretty prints literals and is used when pretty printing pattern --- match warnings. All are printed the same (i.e., without hashes if they are --- primitive and not wrapped in constructors if they are boxed). This happens --- mainly for too reasons: --- * We do not want to expose their internal representation --- * The warnings become too messy -pmPprHsLit :: forall p. IsPass p => HsLit (GhcPass p) -> SDoc -pmPprHsLit (HsChar _ c) = pprHsChar c -pmPprHsLit (HsCharPrim _ c) = pprHsChar c -pmPprHsLit (HsString st s) = pprWithSourceText st (pprHsString s) -pmPprHsLit (HsMultilineString st s) = pprWithSourceText st (pprHsString s) -pmPprHsLit (HsStringPrim _ s) = pprHsBytes s -pmPprHsLit (HsInt _ i) = integer (il_value i) -pmPprHsLit (HsIntPrim _ i) = integer i -pmPprHsLit (HsWordPrim _ w) = integer w -pmPprHsLit (HsInt8Prim _ i) = integer i -pmPprHsLit (HsInt16Prim _ i) = integer i -pmPprHsLit (HsInt32Prim _ i) = integer i -pmPprHsLit (HsInt64Prim _ i) = integer i -pmPprHsLit (HsWord8Prim _ w) = integer w -pmPprHsLit (HsWord16Prim _ w) = integer w -pmPprHsLit (HsWord32Prim _ w) = integer w -pmPprHsLit (HsWord64Prim _ w) = integer w -pmPprHsLit (HsFloatPrim _ f) = ppr f -pmPprHsLit (HsDoublePrim _ d) = ppr d -pmPprHsLit (XLit x) = case ghcPass @p of - GhcTc -> case x of - (HsInteger _ i _) -> integer i - (HsRat f _) -> ppr f - negateOverLitVal :: OverLitVal -> OverLitVal negateOverLitVal (HsIntegral i) = HsIntegral (negateIntegralLit i) negateOverLitVal (HsFractional f) = HsFractional (negateFractionalLit f) ===================================== compiler/GHC/Hs/Syn/Type.hs ===================================== @@ -75,7 +75,6 @@ hsLitType :: forall p. IsPass p => HsLit (GhcPass p) -> Type hsLitType (HsChar _ _) = charTy hsLitType (HsCharPrim _ _) = charPrimTy hsLitType (HsString _ _) = stringTy -hsLitType (HsMultilineString _ _) = stringTy hsLitType (HsStringPrim _ _) = addrPrimTy hsLitType (HsInt _ _) = intTy hsLitType (HsIntPrim _ _) = intPrimTy ===================================== compiler/GHC/HsToCore/Match/Literal.hs ===================================== @@ -117,7 +117,6 @@ dsLit l = do HsDoublePrim _ fl -> return (Lit (LitDouble (rationalFromFractionalLit fl))) HsChar _ c -> return (mkCharExpr c) HsString _ str -> mkStringExprFS str - HsMultilineString _ str -> mkStringExprFS str HsInt _ i -> return (mkIntExpr platform (il_value i)) XLit x -> case ghcPass @p of GhcTc -> case x of @@ -463,7 +462,6 @@ getSimpleIntegralLit (XLit (HsInteger _ i ty)) = Just (i, ty) getSimpleIntegralLit HsChar{} = Nothing getSimpleIntegralLit HsCharPrim{} = Nothing getSimpleIntegralLit HsString{} = Nothing -getSimpleIntegralLit HsMultilineString{} = Nothing getSimpleIntegralLit HsStringPrim{} = Nothing getSimpleIntegralLit (XLit (HsRat{})) = Nothing getSimpleIntegralLit HsFloatPrim{} = Nothing ===================================== compiler/GHC/HsToCore/Quote.hs ===================================== @@ -3077,7 +3077,6 @@ repLiteral lit HsChar _ _ -> Just charLName HsCharPrim _ _ -> Just charPrimLName HsString _ _ -> Just stringLName - HsMultilineString _ _ -> Just stringLName _ -> Nothing mk_integer :: Integer -> MetaM (HsLit GhcTc) ===================================== compiler/GHC/Parser.y ===================================== @@ -4130,7 +4130,7 @@ literal :: { Located (HsLit GhcPs) } : CHAR { sL1 $1 $ HsChar (getCHARs $1) $ getCHAR $1 } | STRING { sL1 $1 $ HsString (getSTRINGs $1) $ getSTRING $1 } - | STRING_MULTI { sL1 $1 $ HsMultilineString (getSTRINGMULTIs $1) + | STRING_MULTI { sL1 $1 $ HsString (getSTRINGMULTIs $1) $ getSTRINGMULTI $1 } | PRIMINTEGER { sL1 $1 $ HsIntPrim (getPRIMINTEGERs $1) $ getPRIMINTEGER $1 } ===================================== compiler/GHC/Parser/String.hs ===================================== @@ -392,9 +392,9 @@ proposal: https://github.com/ghc-proposals/ghc-proposals/pull/569 Multiline string literals are syntax sugar for normal string literals, with an extra post processing step. This all happens in the Lexer; that -is, HsMultilineString will contain the post-processed string. This matches -the same behavior as HsString, which contains the normalized string -(see Note [Literal source text]). +is, the multi-line HsString will contain the post-processed string. +This matches the behavior of the single-line HsString, which contains +the normalized string too (see Note [Literal source text]). The canonical steps for post processing a multiline string are: 1. Collapse string gaps ===================================== compiler/GHC/Rename/Expr.hs ===================================== @@ -352,18 +352,13 @@ rnExpr (HsOverLabel src v) hs_ty_arg = mkEmptyWildCardBndrs $ wrapGenSpan $ HsTyLit noExtField (HsStrTy NoSourceText v) -rnExpr (HsLit x lit) | Just (src, s) <- stringLike lit +rnExpr (HsLit x lit) | HsString src s <- lit = do { opt_OverloadedStrings <- xoptM LangExt.OverloadedStrings ; if opt_OverloadedStrings then rnExpr (HsOverLit x (mkHsIsString src s)) else do { ; rnLit lit ; return (HsLit x (convertLit lit), emptyFVs) } } - where - stringLike = \case - HsString src s -> Just (src, s) - HsMultilineString src s -> Just (src, s) - _ -> Nothing rnExpr (HsLit x lit) = do { rnLit lit ===================================== compiler/GHC/Tc/Gen/HsType.hs ===================================== @@ -4786,7 +4786,6 @@ promotionErr name err tyLitFromLit :: HsLit GhcRn -> Maybe (HsTyLit GhcRn) tyLitFromLit (HsString x str) = Just (HsStrTy x str) -tyLitFromLit (HsMultilineString x str) = Just (HsStrTy x str) tyLitFromLit (HsChar x char) = Just (HsCharTy x char) tyLitFromLit _ = Nothing ===================================== compiler/Language/Haskell/Syntax/Extension.hs ===================================== @@ -604,7 +604,6 @@ type family XXParStmtBlock x x' type family XHsChar x type family XHsCharPrim x type family XHsString x -type family XHsMultilineString x type family XHsStringPrim x type family XHsInt x type family XHsIntPrim x ===================================== compiler/Language/Haskell/Syntax/Lit.hs ===================================== @@ -47,8 +47,6 @@ data HsLit x -- ^ Unboxed character | HsString (XHsString x) {- SourceText -} FastString -- ^ String - | HsMultilineString (XHsMultilineString x) {- SourceText -} FastString - -- ^ String | HsStringPrim (XHsStringPrim x) {- SourceText -} !ByteString -- ^ Packed bytes | HsInt (XHsInt x) IntegralLit ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -4794,7 +4794,6 @@ hsLit2String lit = HsChar src v -> toSourceTextWithSuffix src v "" HsCharPrim src p -> toSourceTextWithSuffix src p "" HsString src v -> toSourceTextWithSuffix src v "" - HsMultilineString src v -> toSourceTextWithSuffix src v "" HsStringPrim src v -> toSourceTextWithSuffix src v "" HsInt _ (IL src _ v) -> toSourceTextWithSuffix src v "" HsIntPrim src v -> toSourceTextWithSuffix src v "" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d461f728d4e65726725f02e4dab854… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d461f728d4e65726725f02e4dab854… You're receiving this email because of your account on gitlab.haskell.org.

1 0