- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/davide/hadrian_avoid_response_files_2] Hadrian: always keep response files
by David Eichmann (＠DavidEichmann) 04 Jun '26

04 Jun '26

David Eichmann pushed to branch wip/davide/hadrian_avoid_response_files_2 at Glasgow Haskell Compiler / GHC Commits: a0abeeab by David Eichmann at 2026-06-04T10:43:41+01:00 Hadrian: always keep response files Now that response files are only used in a small number of cases, it's reasonable to keep all response files by default and simply remove the -r / --keep-response-files command line options. The response file paths are nolonger randomized. They are placed in the `_build/rsp` directory. This ensures we reuse file paths when rebuilding rather than leaving stale response files around. - - - - - 5 changed files: - − changelog.d/hadrian-response-files.md - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Utilities.hs Changes: ===================================== changelog.d/hadrian-response-files.md deleted ===================================== @@ -1,9 +0,0 @@ -section: packaging -synopsis: Add a flag to tell Hadrian to keep response files -issues: #27184 -mrs: !15906 -description: - Hadrian can now be instructed to keep response files with the new - --keep-response-files command line flag. This is helpful when debugging a - build failure, as it allows re-running the failing command line invocation - without an error due to a missing response file. ===================================== hadrian/src/Builder.hs ===================================== @@ -304,7 +304,7 @@ instance H.Builder Builder where case builder of Ar Pack stg -> do useTempFile <- arSupportsAtFile stg - if useTempFile then runAr path buildArgs buildInputs buildOptions + if useTempFile then runAr output path buildArgs buildInputs buildOptions else runArWithoutTempFile path buildArgs buildInputs buildOptions Ar Unpack _ -> cmd' [Cwd output] [path] buildArgs buildOptions @@ -343,7 +343,7 @@ instance H.Builder Builder where Exit _ <- cmd' [path] (buildArgs ++ [input]) buildOptions return () - Haddock BuildPackage -> runHaddock path buildArgs buildInputs + Haddock BuildPackage -> runHaddock output path buildArgs buildInputs Ghc _ _ -> -- Use a response file for ghc invocations to avoid issues with command line @@ -352,6 +352,7 @@ instance H.Builder Builder where -- empty arguments (such as the -dep-suffix flag), but that isn't supported -- yet due to #26560. withResponseFileIfLongCmd + output (toCmdArgument [path] <> toCmdArgument buildArgs) buildInputs (toCmdArgument buildOptions) @@ -390,11 +391,13 @@ instance H.Builder Builder where -- | Invoke @haddock@ given a path to it and a list of arguments. On Windows, -- the input file arguments are passed as a response file. -runHaddock :: FilePath -- ^ path to @haddock@ +runHaddock :: FilePath -- ^ base name to use for response file + -> FilePath -- ^ path to @haddock@ -> [String] -> [FilePath] -- ^ input file paths -> Action () -runHaddock haddockPath flagArgs fileInputs = withResponseFileIfLongCmd +runHaddock outputFilePath haddockPath flagArgs fileInputs = withResponseFileIfLongCmd + outputFilePath (toCmdArgument [haddockPath] <> toCmdArgument flagArgs) fileInputs (CmdArgument []) ===================================== hadrian/src/CommandLine.hs ===================================== @@ -3,8 +3,7 @@ module CommandLine ( lookupBignum, cmdBignum, cmdProgressInfo, cmdCompleteSetting, cmdDocsArgs, cmdUnitIdHash, lookupBuildRoot, TestArgs(..), TestSpeed(..), defaultTestArgs, - cmdPrefix, cmdChangelogVersion, DocArgs(..), defaultDocArgs, - cmdKeepResponseFiles + cmdPrefix, cmdChangelogVersion, DocArgs(..), defaultDocArgs ) where import Data.Either @@ -12,7 +11,7 @@ import qualified Data.HashMap.Strict as Map import Data.List.Extra import Development.Shake hiding (Normal) import Flavour (DocTargets, DocTarget(..)) -import Hadrian.Utilities hiding (buildRoot, keepResponseFiles) +import Hadrian.Utilities hiding (buildRoot) import Settings.Parser import System.Console.GetOpt import System.Environment @@ -37,7 +36,6 @@ data CommandLineArgs = CommandLineArgs , testArgs :: TestArgs , docsArgs :: DocArgs , docTargets :: DocTargets - , keepResponseFiles :: Bool , prefix :: Maybe FilePath , changelogVersion :: Maybe String , completeStg :: Maybe String } @@ -58,7 +56,6 @@ defaultCommandLineArgs = CommandLineArgs , testArgs = defaultTestArgs , docsArgs = defaultDocArgs , docTargets = Set.fromList [minBound..maxBound] - , keepResponseFiles = False , prefix = Nothing , changelogVersion = Nothing , completeStg = Nothing } @@ -141,9 +138,6 @@ readFreeze1 = Right $ \flags -> flags { freeze1 = True } readFreeze2 = Right $ \flags -> flags { freeze1 = True, freeze2 = True } readSkipDepends = Right $ \flags -> flags { skipDepends = True } -readKeepResponseFiles :: Either String (CommandLineArgs -> CommandLineArgs) -readKeepResponseFiles = Right $ \flags -> flags { keepResponseFiles = True } - readUnitIdHash :: Either String (CommandLineArgs -> CommandLineArgs) readUnitIdHash = Right $ \flags -> trace "--hash-unit-ids is deprecated. It is enabled by release flavour or +hash_unit_ids flavour transformer" $ @@ -302,8 +296,6 @@ optDescrs = "Progress info style (None, Brief, Normal or Unicorn)." , Option [] ["docs"] (ReqArg readDocsArg "TARGET") "Strip down docs targets (none, no-haddocks, no-sphinx[-{html, pdfs, man}]." - , Option ['r'] ["keep-response-files"] (NoArg readKeepResponseFiles) - "Keep response files created during the build (for debugging)." , Option ['k'] ["keep-test-files"] (NoArg readTestKeepFiles) "Keep all the files generated when running the testsuite." , Option [] ["test-compiler"] (ReqArg readTestCompiler "TEST_COMPILER") @@ -382,7 +374,6 @@ cmdLineArgsMap = do return $ insertExtra (progressInfo args) -- Accessed by Hadrian.Utilities $ insertExtra (buildRoot args) -- Accessed by Hadrian.Utilities - $ insertExtra (KeepResponseFiles $ keepResponseFiles args) -- Accessed by Hadrian.Utilities $ insertExtra (testArgs args) -- Accessed by Settings.Builders.RunTest $ insertExtra (docsArgs args) -- Accessed by Rules.Documentation $ insertExtra allSettings -- Accessed by Settings @@ -424,9 +415,6 @@ cmdUnitIdHash = unitIdHash <$> cmdLineArgs cmdBignum :: Action (Maybe String) cmdBignum = bignum <$> cmdLineArgs -cmdKeepResponseFiles :: Action Bool -cmdKeepResponseFiles = keepResponseFiles <$> cmdLineArgs - cmdProgressInfo :: Action ProgressInfo cmdProgressInfo = progressInfo <$> cmdLineArgs ===================================== hadrian/src/Hadrian/Builder/Ar.hs ===================================== @@ -35,14 +35,16 @@ instance NFData ArMode -- to be archived is passed via a temporary response file. Passing arguments -- via a response file is not supported by some versions of @ar@, in which -- case you should use 'runArWithoutTempFile' instead. -runAr :: FilePath -- ^ path to @ar@ +runAr :: FilePath -- ^ base name to use for response files + -> FilePath -- ^ path to @ar@ -> [String] -- ^ other arguments -> [FilePath] -- ^ input file paths -> [CmdOption] -- ^ Additional options -> Action () -runAr arPath flagArgs fileArgs buildOptions = withResponseFile $ \tmp -> do - writeFile' tmp $ unwords fileArgs - cmd [arPath] flagArgs ('@' : tmp) buildOptions +runAr outputFilePath arPath flagArgs fileArgs buildOptions = do + rspFile <- responseFilePath outputFilePath + writeFile' rspFile $ unwords fileArgs + cmd [arPath] flagArgs ('@' : rspFile) buildOptions -- | Invoke @ar@ given a path to it and a list of arguments. Note that @ar@ -- will be called multiple times if the list of files to be archived is too ===================================== hadrian/src/Hadrian/Utilities.hs ===================================== @@ -16,7 +16,7 @@ module Hadrian.Utilities ( -- * Paths BuildRoot (..), buildRoot, buildRootRules, isGeneratedSource, - KeepResponseFiles (..), keepResponseFiles, withResponseFile, withResponseFileIfLongCmd, + withResponseFileIfLongCmd, responseFilePath, -- * File system operations copyFile, copyFileUntracked, createFileLink, fixFile, @@ -49,10 +49,10 @@ import Data.Maybe import Data.Typeable (TypeRep, typeOf) import Development.Shake hiding (Normal) import Development.Shake.Classes +import Development.Shake.Command (CmdArgument (..), IsCmdArgument (toCmdArgument)) import Development.Shake.FilePath import GHC.ResponseFile (escapeArgs) import System.Environment (lookupEnv) -import System.IO (hClose, openTempFile) import System.IO.Error (isPermissionError) import qualified Data.ByteString as BS @@ -62,7 +62,6 @@ import qualified System.Directory.Extra as IO import qualified System.Info.Extra as IO import qualified System.IO as IO import qualified System.FilePath.Posix as Posix -import Development.Shake.Command (CmdArgument (..), IsCmdArgument (toCmdArgument)) -- | Extract a value from a singleton list, or terminate with an error message -- if the list does not contain exactly one value. @@ -323,59 +322,35 @@ buildRootRules = do isGeneratedSource :: FilePath -> Action Bool isGeneratedSource file = buildRoot <&> (`isPrefixOf` file) -newtype KeepResponseFiles = KeepResponseFiles Bool deriving (Eq, Show) - --- | Whether to retain response files after the build action that created them --- completes. Mainly useful for debugging. -keepResponseFiles :: Action Bool -keepResponseFiles = do - KeepResponseFiles keep <- userSetting (KeepResponseFiles False) - return keep - -- | Run an command with the given arguments. If the command is too long then the -- response file arguments are placed into a response file and escaped with @GHC.ResponseFile.escapeArgs@. --- --- With @--keep-response-files@, the file is left on disk (if used) -withResponseFileIfLongCmd :: (CmdResult c) => - CmdArgument -- ^ Command and arguments before the response file arguments. +withResponseFileIfLongCmd :: + CmdResult c + => FilePath -- ^ Response base name. The reponse file is placed in @_build/rsp/\<Response base name\>@. + -> CmdArgument -- ^ Command and arguments before the response file arguments. -> [String] -- ^ Response file aruguments. -> CmdArgument -- ^ Command arguments after the response file arguments. -> Action c -withResponseFileIfLongCmd argsPre argsResp argsPost = do +withResponseFileIfLongCmd outputFilePath argsPre argsResp argsPost = do let cmdLineLengh = sum [ 1 + length arg -- add one to account for space inbetween arguments | let CmdArgument args = argsPre <> toCmdArgument argsResp <> argsPost , Right arg <- args ] - if cmdLineLengh >= cmdLineLengthLimit - then withResponseFile $ \tmp -> do - writeFile' tmp (escapeArgs argsResp) - cmd argsPre ['@' : tmp] argsPost - else cmd argsPre argsResp argsPost - --- | Run an action with a response file path. --- --- With @--keep-response-files@, the file is left on disk. -withResponseFile :: (FilePath -> Action a) -> Action a -withResponseFile action = do - keep <- keepResponseFiles - let putVerboseResponseFile tmp = do - verbosity <- getVerbosity - when (verbosity >= Verbose) $ do - tmpContent <- liftIO (readFile tmp) - putVerbose (tmp <> " (use hadrian flag --keep-response-files to keep this file):\n" <> tmpContent) - if keep - then do - (tmp, h) <- liftIO $ openTempFile "." "hadrian-rsp" - liftIO $ hClose h - putInfo $ "Keeping response file: " ++ tmp - result <- action tmp - putVerboseResponseFile tmp - return result - else withTempFile $ \tmp -> do - result <- action tmp - putVerboseResponseFile tmp - return result + if cmdLineLengh < cmdLineLengthLimit + then cmd argsPre argsResp argsPost + else do + rspFile <- responseFilePath outputFilePath + writeFile' rspFile (escapeArgs argsResp) + cmd argsPre ['@' : rspFile] argsPost + +-- | Convert a command's output file path to a response file path to be used for that command. +-- Response files are placed in a dedicated @rps@ directory under the build directory. This avoids +-- clutering the work tree or interfearing with other build directories. +responseFilePath :: FilePath -> Action FilePath +responseFilePath outputFilePath = do + buildDir <- buildRoot + return $ buildDir </> "rsp" </> outputFilePath -- | Link a file tracking the link target. Create the target directory if -- missing. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a0abeeabe793a50b1311f36c9b56fb1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a0abeeabe793a50b1311f36c9b56fb1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Add treatment of `UnlinkedStaticCon`
by Wolfgang Jeltsch (＠jeltsch) 04 Jun '26

04 Jun '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: 7c57dd19 by Wolfgang Jeltsch at 2026-06-04T11:42:42+03:00 Add treatment of `UnlinkedStaticCon` - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -11,7 +11,7 @@ import Control.Exception (assert) import Data.Eq ((==)) import Data.Bits (FiniteBits, finiteBitSize) import Data.Function (($), (.)) -import Data.Bool (otherwise) +import Data.Bool (Bool, otherwise, not) import Data.Int (Int) import Data.Word (Word, Word16) import Data.Maybe (Maybe, maybe) @@ -117,21 +117,13 @@ pprByteCodeObject currentModule byteCodeObject = case byteCodeObject of pprLiterals currentModule $ unlinkedBCOLits, pprPointers currentModule $ unlinkedBCOPtrs ] - UnlinkedStaticCon {{-..-}} - -> entry (text "static constructor object:") $ --FIXME: Remove colon and add name. + UnlinkedStaticCon {..} + -> entry (text "static constructor object" <+> ppr unlinkedStaticConName) $ vcat [ - {- - unlinkedStaticConName :: !Name, - -- ^ The name to which this static constructor is bound, not to be - -- confused with the name of the static constructor itself - -- ('unlinkedStaticConDataConName') - unlinkedStaticConDataConName :: !Name, - unlinkedStaticConLits :: !(FlatBag BCONPtr), - -- ^ non-ptrs full words, where sub-word literals have already been - -- packed into full words as needed - unlinkedStaticConPtrs :: !(FlatBag BCOPtr), -- ptrs - unlinkedStaticConIsUnlifted :: !Bool - -} + pprDataConstructorName $ unlinkedStaticConDataConName, + pprLiftedness $ not unlinkedStaticConIsUnlifted, + pprLiterals currentModule $ unlinkedStaticConLits, + pprPointers currentModule $ unlinkedStaticConPtrs ] -- | […] @@ -146,6 +138,14 @@ pprInstructions = entry (text "instructions:") . pprBCOByteArray pprBitmap :: BCOByteArray Word -> SDoc pprBitmap = entry (text "bitmap:") . pprBCOByteArray +-- | […] +pprDataConstructorName :: Name -> SDoc +pprDataConstructorName = entry (text "data constructor name:") . ppr + +-- | […] +pprLiftedness :: Bool -> SDoc +pprLiftedness = entry (text "lifted:") . noOrYes + -- | […] pprLiterals :: Module -> FlatBag BCONPtr -> SDoc pprLiterals currentModule = entry (text "literals:") . @@ -290,6 +290,10 @@ pprFixedSizeNatural num unpadded :: String unpadded = showHex num "" +-- | […] +noOrYes :: Bool -> SDoc +noOrYes bool = text (if bool then "yes" else "no") + -- | […] entry :: SDoc -> SDoc -> SDoc entry title content = hang title 2 content View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7c57dd192360d54e06a8ae14bbdde93… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7c57dd192360d54e06a8ae14bbdde93… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Add treatment of `UnlinkedStaticCon`
by Wolfgang Jeltsch (＠jeltsch) 04 Jun '26

04 Jun '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: f893ce2c by Wolfgang Jeltsch at 2026-06-04T11:29:05+03:00 Add treatment of `UnlinkedStaticCon` - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -11,7 +11,7 @@ import Control.Exception (assert) import Data.Eq ((==)) import Data.Bits (FiniteBits, finiteBitSize) import Data.Function (($), (.)) -import Data.Bool (otherwise) +import Data.Bool (Bool, otherwise) import Data.Int (Int) import Data.Word (Word, Word16) import Data.Maybe (Maybe, maybe) @@ -117,21 +117,13 @@ pprByteCodeObject currentModule byteCodeObject = case byteCodeObject of pprLiterals currentModule $ unlinkedBCOLits, pprPointers currentModule $ unlinkedBCOPtrs ] - UnlinkedStaticCon {{-..-}} - -> entry (text "static constructor object:") $ --FIXME: Remove colon and add name. + UnlinkedStaticCon {..} + -> entry (text "static constructor object" <+> ppr unlinkedStaticConName) $ vcat [ - {- - unlinkedStaticConName :: !Name, - -- ^ The name to which this static constructor is bound, not to be - -- confused with the name of the static constructor itself - -- ('unlinkedStaticConDataConName') - unlinkedStaticConDataConName :: !Name, - unlinkedStaticConLits :: !(FlatBag BCONPtr), - -- ^ non-ptrs full words, where sub-word literals have already been - -- packed into full words as needed - unlinkedStaticConPtrs :: !(FlatBag BCOPtr), -- ptrs - unlinkedStaticConIsUnlifted :: !Bool - -} + pprDataConstructorName $ unlinkedStaticConDataConName, + pprNoOrYes $ unlinkedStaticConIsUnlifted, + pprLiterals currentModule $ unlinkedStaticConLits, + pprPointers currentModule $ unlinkedStaticConPtrs ] -- | […] @@ -146,6 +138,10 @@ pprInstructions = entry (text "instructions:") . pprBCOByteArray pprBitmap :: BCOByteArray Word -> SDoc pprBitmap = entry (text "bitmap:") . pprBCOByteArray +-- | […] +pprDataConstructorName :: Name -> SDoc +pprDataConstructorName = entry (text "data constructor name:") . ppr + -- | […] pprLiterals :: Module -> FlatBag BCONPtr -> SDoc pprLiterals currentModule = entry (text "literals:") . @@ -290,6 +286,10 @@ pprFixedSizeNatural num unpadded :: String unpadded = showHex num "" +-- | […] +pprNoOrYes :: Bool -> SDoc +pprNoOrYes bool = text (if bool then "yes" else "no") + -- | […] entry :: SDoc -> SDoc -> SDoc entry title content = hang title 2 content View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f893ce2cf51274c58515305acf3f4d6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f893ce2cf51274c58515305acf3f4d6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T26964] 2 commits: Improve -fcheck-prim-bounds runtime error messages
by Simon Jakobi (＠sjakobi2) 04 Jun '26

04 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T26964 at Glasgow Haskell Compiler / GHC Commits: 64b4252e by Simon Jakobi at 2026-06-04T01:37:58+02:00 Improve -fcheck-prim-bounds runtime error messages When an array access instrumented by -fcheck-prim-bounds fails at runtime, report the failing primop, the offending index and the array size, and exit with a normal failure status. Previously the program aborted via barf with an "internal error" framed as a GHC bug, even though such failures are almost always caused by incorrect use of unsafe primops in user or library code. The primop name is threaded to the failure handlers through a new fcs_prim_op field in FCodeState, set once in cmmPrimOpApp, so the bounds-check sites themselves are unchanged. Fixes #26964, #24617. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 6bf57c99 by Simon Jakobi at 2026-06-04T01:37:58+02:00 rts: name the primop in DEBUG ASSERT_IN_BOUNDS failures ASSERT_IN_BOUNDS passed the literal "array access" as the op name, which collided with rtsOutOfBoundsAccess's own message text ("<op>: array access out of bounds"), producing the redundant "array access: array access out of bounds". Thread the real primop name (e.g. "casIntArray#") through the macro instead, matching the native code generator's messages. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 12 changed files: - + changelog.d/improve-check-prim-bounds-messages - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToCmm/Prim.hs - docs/users_guide/debugging.rst - rts/PrimOps.cmm - rts/RtsMessages.c - rts/include/rts/Messages.h - + testsuite/tests/codeGen/should_fail/T26964.hs - + testsuite/tests/codeGen/should_fail/T26964.stderr - + testsuite/tests/codeGen/should_fail/T26964b.hs - + testsuite/tests/codeGen/should_fail/T26964b.stderr - testsuite/tests/codeGen/should_fail/all.T Changes: ===================================== changelog.d/improve-check-prim-bounds-messages ===================================== @@ -0,0 +1,13 @@ +section: codegen +synopsis: Improve ``-fcheck-prim-bounds`` runtime error messages +issues: #26964 #24617 +mrs: !16130 + +description: { + When an array access instrumented by ``-fcheck-prim-bounds`` fails at + runtime, the program now reports the failing primop, the offending index and + the array size, and exits with a normal non-zero status. Previously it + aborted with an "internal error" framed as a GHC bug, even though such + failures are almost always caused by incorrect use of unsafe primops in user + or library code. +} ===================================== compiler/GHC/StgToCmm/Monad.hs ===================================== @@ -42,6 +42,7 @@ module GHC.StgToCmm.Monad ( SelfLoopInfo(..), setTickyCtrLabel, getTickyCtrLabel, + withCurrentPrimOpName, getCurrentPrimOpName, tickScope, getTickScope, withUpdFrameOff, getUpdFrameOff, @@ -304,6 +305,9 @@ data FCodeState = -- See Note [Self-recursive tail calls] in GHC.StgToCmm.Expr , fcs_ticky :: !CLabel -- ^ Destination for ticky counts , fcs_tickscope :: !CmmTickScope -- ^ Tick scope for new blocks & ticks + , fcs_prim_op :: Maybe String -- ^ Source name of the primop currently being + -- compiled, used by -fcheck-prim-bounds error + -- messages. } data HeapUsage -- See Note [Virtual and real heap pointers] @@ -462,6 +466,7 @@ initFCodeState p = , fcs_selfloop = Nothing , fcs_ticky = mkTopTickyCtrLabel , fcs_tickscope = GlobalScope + , fcs_prim_op = Nothing } getFCodeState :: FCode FCodeState @@ -520,6 +525,20 @@ setTickyCtrLabel ticky code = do fstate <- getFCodeState withFCodeState code (fstate {fcs_ticky = ticky}) +-- ---------------------------------------------------------------------------- +-- Track the primop currently being compiled + +-- | The source name of the primop currently being compiled (e.g. +-- @"writeArray#"@), if any. Used to produce informative @-fcheck-prim-bounds@ +-- error messages. +getCurrentPrimOpName :: FCode (Maybe String) +getCurrentPrimOpName = fcs_prim_op <$> getFCodeState + +withCurrentPrimOpName :: String -> FCode a -> FCode a +withCurrentPrimOpName name code = do + fstate <- getFCodeState + withFCodeState code (fstate {fcs_prim_op = Just name}) + -- ---------------------------------------------------------------------------- -- Manage tick scopes ===================================== compiler/GHC/StgToCmm/Prim.hs ===================================== @@ -25,11 +25,13 @@ import GHC.StgToCmm.Layout import GHC.StgToCmm.Foreign import GHC.StgToCmm.Monad import GHC.StgToCmm.Utils +import GHC.StgToCmm.Lit ( newStringCLit ) import GHC.StgToCmm.Ticky import GHC.StgToCmm.Heap import GHC.StgToCmm.Prof ( costCentreFrom ) import GHC.Types.Basic +import GHC.Types.Name.Occurrence ( occNameString ) import GHC.Types.Literal.Floating import GHC.Cmm.BlockId import GHC.Cmm.Graph @@ -94,7 +96,13 @@ cmmPrimOpApp cfg primop cmm_args mres_ty = do -- if the result type isn't explicitly given, we directly use the -- result type of the primop. res_ty = fromMaybe (primOpResultType primop) mres_ty - f res_ty + -- When -fcheck-prim-bounds is on, record the primop name so that any + -- bounds-check failure handler emitted while compiling it can name it in the + -- error message. Guarded by the flag so that the common (unchecked) case pays + -- nothing: no name thunk, no FCodeState update. + if stgToCmmDoBoundsCheck cfg + then withCurrentPrimOpName (occNameString (primOpOcc primop)) (f res_ty) + else f res_ty externalPrimop :: PrimOp -> [CmmExpr] -> PrimopCmmEmit externalPrimop primop args = outOfLinePrimop (callExternalPrimop primop args) @@ -3615,8 +3623,12 @@ emitCheckedMemcpyCall dst src n align = do emitMemcpyCall dst src n align where doCheck platform = do + name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName + nameLbl <- newStringCLit name overlapCheckFailed <- getCode $ - emitCCallNeverReturns [] (mkLblExpr mkMemcpyRangeOverlapLabel) [] + emitCCallNeverReturns [] + (mkLblExpr mkMemcpyRangeOverlapLabel) + [ (CmmLit nameLbl, AddrHint) ] emit =<< mkCmmIfThen' rangesOverlap overlapCheckFailed (Just False) where rangesOverlap = (checkDiff dst src `or` checkDiff src dst) `ne` zero @@ -3728,6 +3740,25 @@ whenCheckBounds a = do False -> pure () True -> a +-- | Emit a call to the RTS @rtsOutOfBoundsAccess@ bounds-check failure +-- handler, passing the offending index, the number of accessed elements and +-- the array size, so that the runtime can produce an informative error +-- message. The name of the offending primop is read from the code generator +-- environment (see 'withCurrentPrimOpName'). +emitBoundsCheckFailed :: CmmExpr -- ^ accessed index + -> CmmExpr -- ^ number of accessed elements + -> CmmExpr -- ^ array size (in elements) + -> FCode () +emitBoundsCheckFailed idx count sz = do + name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName + nameLbl <- newStringCLit name + emitCCallNeverReturns [] + (mkLblExpr mkOutOfBoundsAccessLabel) + [ (idx, NoHint) + , (count, NoHint) + , (sz, NoHint) + , (CmmLit nameLbl, AddrHint) ] + emitBoundsCheck :: CmmExpr -- ^ accessed index -> CmmExpr -- ^ array size (in elements) -> FCode () @@ -3735,7 +3766,7 @@ emitBoundsCheck idx sz = do assertM (stgToCmmDoBoundsCheck <$> getStgToCmmConfig) platform <- getPlatform boundsCheckFailed <- getCode $ - emitCCallNeverReturns [] (mkLblExpr mkOutOfBoundsAccessLabel) [] + emitBoundsCheckFailed idx (mkIntExpr platform 1) sz let isOutOfBounds = cmmUGeWord platform idx sz emit =<< mkCmmIfThen' isOutOfBounds boundsCheckFailed (Just False) @@ -3754,7 +3785,7 @@ emitRangeBoundsCheck idx len arrSizeExpr = do _ <- withSequel (AssignTo [lastSafeIndexReg, rangeTooLargeReg] False) $ cmmPrimOpApp config WordSubCOp [arrSize, len] Nothing boundsCheckFailed <- getCode $ - emitCCallNeverReturns [] (mkLblExpr mkOutOfBoundsAccessLabel) [] + emitBoundsCheckFailed idx len arrSize let rangeTooLarge = CmmReg (CmmLocal rangeTooLargeReg) lastSafeIndex = CmmReg (CmmLocal lastSafeIndexReg) ===================================== docs/users_guide/debugging.rst ===================================== @@ -1167,10 +1167,25 @@ Checking for consistency Typically primops operations like ``writeArray#`` exhibit unsafe behavior, relying on the user to perform any bounds checking. This flag instructs the code generator to instrument such operations with bound checking logic - which aborts the program when an out-of-bounds access is detected. + which terminates the program when an out-of-bounds access is detected. + + When a check fails, the program prints a message naming the offending + primop together with the offending index and the array size, and exits + with a non-zero status, for example:: + + myprog: writeArray#: array access out of bounds: + index 5 is not within [0, 3). + This is usually caused by incorrect use of unsafe primops in user or library code. + + The message does not identify the enclosing function or module. To obtain a + backtrace pinpointing the failing call, build with profiling and run with + ``+RTS -xc`` (see :ref:`prof-time-options`), or use :ghc-flag:`-finfo-table-map` + together with ``+RTS -xc``. Note that this is only intended to be used as a debugging measure, not as - the primary means of catching out-of-bounds accesses. + the primary means of catching out-of-bounds accesses. Currently only the + native code generator is instrumented; the JavaScript backend is unaffected + by this flag. .. ghc-flag:: -fcmm-thread-sanitizer :shortdesc: Enable ThreadSanitizer instrumentation of memory accesses. ===================================== rts/PrimOps.cmm ===================================== @@ -88,10 +88,14 @@ import CLOSURE ghc_hs_iface; #endif #if defined(DEBUG) -#define ASSERT_IN_BOUNDS(ind, sz) \ - if (ind >= sz) { ccall rtsOutOfBoundsAccess(); } +// `op` is the source name of the primop being checked (e.g. "casIntArray#"). +// NB: in some callers `ind` is a byte offset rather than an element index, so +// the index reported here may be in bytes. count is 1 since these checks cover +// a single access. +#define ASSERT_IN_BOUNDS(op, ind, sz) \ + if (ind >= sz) { ccall rtsOutOfBoundsAccess(ind, 1, sz, op); } #else -#define ASSERT_IN_BOUNDS(ind, sz) +#define ASSERT_IN_BOUNDS(op, ind, sz) #endif /*----------------------------------------------------------------------------- @@ -336,7 +340,7 @@ stg_casIntArrayzh( gcptr arr, W_ ind, W_ old, W_ new ) { W_ p, h; - ASSERT_IN_BOUNDS(ind + WDS(1) - 1, StgArrBytes_bytes(arr)); + ASSERT_IN_BOUNDS("casIntArray#", ind + WDS(1) - 1, StgArrBytes_bytes(arr)); p = arr + SIZEOF_StgArrBytes + WDS(ind); (h) = prim %cmpxchgW(p, old, new); @@ -350,7 +354,7 @@ stg_casInt8Arrayzh( gcptr arr, W_ ind, I8 old, I8 new ) W_ p; I8 h; - ASSERT_IN_BOUNDS(ind, StgArrBytes_bytes(arr)); + ASSERT_IN_BOUNDS("casInt8Array#", ind, StgArrBytes_bytes(arr)); p = arr + SIZEOF_StgArrBytes + ind; (h) = prim %cmpxchg8(p, old, new); @@ -364,7 +368,7 @@ stg_casInt16Arrayzh( gcptr arr, W_ ind, I16 old, I16 new ) W_ p; I16 h; - ASSERT_IN_BOUNDS(ind + 1, StgArrBytes_bytes(arr)); + ASSERT_IN_BOUNDS("casInt16Array#", ind + 1, StgArrBytes_bytes(arr)); p = arr + SIZEOF_StgArrBytes + ind*2; (h) = prim %cmpxchg16(p, old, new); @@ -378,7 +382,7 @@ stg_casInt32Arrayzh( gcptr arr, W_ ind, I32 old, I32 new ) W_ p; I32 h; - ASSERT_IN_BOUNDS(ind + 3, StgArrBytes_bytes(arr)); + ASSERT_IN_BOUNDS("casInt32Array#", ind + 3, StgArrBytes_bytes(arr)); p = arr + SIZEOF_StgArrBytes + ind*4; (h) = prim %cmpxchg32(p, old, new); @@ -392,7 +396,7 @@ stg_casInt64Arrayzh( gcptr arr, W_ ind, I64 old, I64 new ) W_ p; I64 h; - ASSERT_IN_BOUNDS(ind + 7, StgArrBytes_bytes(arr)); + ASSERT_IN_BOUNDS("casInt64Array#", ind + 7, StgArrBytes_bytes(arr)); p = arr + SIZEOF_StgArrBytes + ind*8; (h) = prim %cmpxchg64(p, old, new); @@ -470,7 +474,7 @@ stg_casArrayzh ( gcptr arr, W_ ind, gcptr old, gcptr new ) gcptr h; W_ p, len; - ASSERT_IN_BOUNDS(ind, StgMutArrPtrs_ptrs(arr)); + ASSERT_IN_BOUNDS("casArray#", ind, StgMutArrPtrs_ptrs(arr)); p = arr + SIZEOF_StgMutArrPtrs + WDS(ind); (h) = prim %cmpxchgW(p, old, new); @@ -578,8 +582,8 @@ stg_copySmallArrayzh ( gcptr src, W_ src_off, gcptr dst, W_ dst_off, W_ n) SET_INFO(dst, stg_SMALL_MUT_ARR_PTRS_DIRTY_info); - ASSERT_IN_BOUNDS(dst_off + n - 1, StgSmallMutArrPtrs_ptrs(dst)); - ASSERT_IN_BOUNDS(src_off + n - 1, StgSmallMutArrPtrs_ptrs(src)); + ASSERT_IN_BOUNDS("copySmallArray#", dst_off + n - 1, StgSmallMutArrPtrs_ptrs(dst)); + ASSERT_IN_BOUNDS("copySmallArray#", src_off + n - 1, StgSmallMutArrPtrs_ptrs(src)); dst_p = dst + SIZEOF_StgSmallMutArrPtrs + WDS(dst_off); src_p = src + SIZEOF_StgSmallMutArrPtrs + WDS(src_off); bytes = WDS(n); @@ -601,8 +605,8 @@ stg_copySmallMutableArrayzh ( gcptr src, W_ src_off, gcptr dst, W_ dst_off, W_ n SET_INFO(dst, stg_SMALL_MUT_ARR_PTRS_DIRTY_info); - ASSERT_IN_BOUNDS(dst_off + n - 1, StgSmallMutArrPtrs_ptrs(dst)); - ASSERT_IN_BOUNDS(src_off + n - 1, StgSmallMutArrPtrs_ptrs(src)); + ASSERT_IN_BOUNDS("copySmallMutableArray#", dst_off + n - 1, StgSmallMutArrPtrs_ptrs(dst)); + ASSERT_IN_BOUNDS("copySmallMutableArray#", src_off + n - 1, StgSmallMutArrPtrs_ptrs(src)); dst_p = dst + SIZEOF_StgSmallMutArrPtrs + WDS(dst_off); src_p = src + SIZEOF_StgSmallMutArrPtrs + WDS(src_off); bytes = WDS(n); @@ -623,7 +627,7 @@ stg_casSmallArrayzh ( gcptr arr, W_ ind, gcptr old, gcptr new ) gcptr h; W_ p, len; - ASSERT_IN_BOUNDS(ind, StgSmallMutArrPtrs_ptrs(arr)); + ASSERT_IN_BOUNDS("casSmallArray#", ind, StgSmallMutArrPtrs_ptrs(arr)); p = arr + SIZEOF_StgSmallMutArrPtrs + WDS(ind); (h) = prim %cmpxchgW(p, old, new); ===================================== rts/RtsMessages.c ===================================== @@ -352,13 +352,32 @@ rtsBadAlignmentBarf(void) } void -rtsOutOfBoundsAccess(void) +rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) { - barf("Encountered out of bounds array access."); + if (count <= 1) { + errorBelch("%s: array access out of bounds:\n" + " index %" FMT_Int " is not within [0, %" FMT_Word ").\n" + "This is usually caused by incorrect use of unsafe primops " + "in user or library code.", + op, index, size); + } else { + errorBelch("%s: array access out of bounds:\n" + " range of %" FMT_Word " elements starting at index %" FMT_Int + " is not within [0, %" FMT_Word ").\n" + "This is usually caused by incorrect use of unsafe primops " + "in user or library code.", + op, count, index, size); + } + stg_exit(EXIT_FAILURE); } void -rtsMemcpyRangeOverlap(void) +rtsMemcpyRangeOverlap(const char *op) { - barf("Encountered overlapping source/destination ranges in a memcpy-using op."); + errorBelch("%s: overlapping source and destination ranges in a " + "memcpy-using operation.\n" + "This is usually caused by incorrect use of unsafe primops " + "in user or library code.", + op); + stg_exit(EXIT_FAILURE); } ===================================== rts/include/rts/Messages.h ===================================== @@ -108,5 +108,5 @@ extern RtsMsgFunction rtsSysErrorMsgFn; /* Used by code generator */ void rtsBadAlignmentBarf(void) STG_NORETURN; -void rtsOutOfBoundsAccess(void) STG_NORETURN; -void rtsMemcpyRangeOverlap(void) STG_NORETURN; +void rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) STG_NORETURN; +void rtsMemcpyRangeOverlap(const char *op) STG_NORETURN; ===================================== testsuite/tests/codeGen/should_fail/T26964.hs ===================================== @@ -0,0 +1,17 @@ +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE MagicHash #-} + +-- Test that -fcheck-prim-bounds reports the failing primop, the offending +-- index and the array size. The negative index also checks that it is reported +-- as a signed number (e.g. -1, not a huge unsigned word). + +module Main where + +import GHC.Exts +import GHC.IO + +main :: IO () +main = do + IO $ \s0 -> + case newSmallArray# 5# () s0 of + (# s1, marr #) -> readSmallArray# marr (-1#) s1 ===================================== testsuite/tests/codeGen/should_fail/T26964.stderr ===================================== @@ -0,0 +1,3 @@ +readSmallArray#: array access out of bounds: + index -1 is not within [0, 5). +This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/T26964b.hs ===================================== @@ -0,0 +1,20 @@ +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE MagicHash #-} + +-- Test that -fcheck-prim-bounds reports a failing *range* access (count > 1) +-- with the "range of N elements starting at index" wording. The source range +-- is in bounds, but the destination range [6, 10) overruns the 8-byte array. + +module Main where + +import GHC.Exts +import GHC.IO + +main :: IO () +main = IO $ \s0 -> + case newByteArray# 8# s0 of + (# s1, src #) -> + case newByteArray# 8# s1 of + (# s2, dst #) -> + case copyMutableByteArray# src 0# dst 6# 4# s2 of + s3 -> (# s3, () #) ===================================== testsuite/tests/codeGen/should_fail/T26964b.stderr ===================================== @@ -0,0 +1,3 @@ +copyMutableByteArray#: array access out of bounds: + range of 4 elements starting at index 6 is not within [0, 8). +This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/all.T ===================================== @@ -6,8 +6,10 @@ test('T8131', [cmm_src, only_ways(llvm_ways)], compile_fail, ['-no-hs-main']) def check_bounds_test(name): """ A -fcheck-prim-bounds test that is expected to fail. """ + # The native backend exits with EXIT_FAILURE (1); the JS backend still + # aborts with h$exitProcess(134) (the improved messages are native-only). test(name, - [ignore_stderr, omit_ghci, exit_code(127 if opsys('mingw32') else 134)], + [ignore_stderr, omit_ghci, exit_code(134 if js_arch() else 1)], compile_and_run, ['-fcheck-prim-bounds']) check_bounds_test('CheckBoundsWriteArray') # Check past end @@ -25,3 +27,18 @@ check_bounds_test('CheckBoundsCompareByteArray3') # Check negative length check_bounds_test('CheckOverlapCopyByteArray') check_bounds_test('CheckOverlapCopyAddrToByteArray') check_bounds_test('T26958') + +# Unlike the check_bounds_test cases above, these tests pin down the exact +# -fcheck-prim-bounds error message. Drop the leading "<prog>: " prefix so the +# tests don't depend on the binary's name/path (incl. Windows drive letters). +def strip_prog_prefix(s): + return re.sub(r'(?m)^.*?(\w+#: array access)', r'\1', s) + +# T26964 checks the single-element message. T26964b checks the range variant. +# Skipped on the JS backend, which emits no message and aborts with code 134. +test('T26964', + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], + compile_and_run, ['-fcheck-prim-bounds']) +test('T26964b', + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], + compile_and_run, ['-fcheck-prim-bounds']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/faeb0540a61b6f4e3fa1210ae364f4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/faeb0540a61b6f4e3fa1210ae364f4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T26964] testsuite: keep exit code 134 for -fcheck-prim-bounds tests on the JS backend
by Simon Jakobi (＠sjakobi2) 04 Jun '26

04 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T26964 at Glasgow Haskell Compiler / GHC Commits: faeb0540 by Simon Jakobi at 2026-06-04T01:27:11+02:00 testsuite: keep exit code 134 for -fcheck-prim-bounds tests on the JS backend The improved -fcheck-prim-bounds error messages and EXIT_FAILURE (1) exit status are native-only; the JS backend still aborts via h$exitProcess(134). Expect 134 on the JS arch for the bulk tests, and skip the message-pinning tests T26964/T26964b there, since the JS backend emits no message. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 1 changed file: - testsuite/tests/codeGen/should_fail/all.T Changes: ===================================== testsuite/tests/codeGen/should_fail/all.T ===================================== @@ -6,8 +6,10 @@ test('T8131', [cmm_src, only_ways(llvm_ways)], compile_fail, ['-no-hs-main']) def check_bounds_test(name): """ A -fcheck-prim-bounds test that is expected to fail. """ + # The native backend exits with EXIT_FAILURE (1); the JS backend still + # aborts with h$exitProcess(134) (the improved messages are native-only). test(name, - [ignore_stderr, omit_ghci, exit_code(1)], + [ignore_stderr, omit_ghci, exit_code(134 if js_arch() else 1)], compile_and_run, ['-fcheck-prim-bounds']) check_bounds_test('CheckBoundsWriteArray') # Check past end @@ -33,9 +35,10 @@ def strip_prog_prefix(s): return re.sub(r'(?m)^.*?(\w+#: array access)', r'\1', s) # T26964 checks the single-element message. T26964b checks the range variant. +# Skipped on the JS backend, which emits no message and aborts with code 134. test('T26964', - [omit_ghci, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], compile_and_run, ['-fcheck-prim-bounds']) test('T26964b', - [omit_ghci, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], compile_and_run, ['-fcheck-prim-bounds']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faeb0540a61b6f4e3fa1210ae364f48… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faeb0540a61b6f4e3fa1210ae364f48… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] 3 commits: Avoid mkTick in Core Prep breaking ANF
by recursion-ninja (＠recursion-ninja) 03 Jun '26

03 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: f9bcfac2 by sheaf at 2026-06-03T14:47:19-04:00 Avoid mkTick in Core Prep breaking ANF As discovered in #27182, mkTick can break ANF. This patch introduces a variant of mkTick that skips the single optimisation that could break ANF. This is preferrable over switching to the raw Tick constructor, as the latter may introduce spurious cost centres in profiling reports. This is a temporary measure until we more thoroughly refactor how mkTick works (see #27141). See Note [mkTick breaks ANF] in GHC.CoreToStg.Prep. Fixes #27182 - - - - - cf1fd661 by Artem Pelenitsyn at 2026-06-03T14:48:09-04:00 clarify comment for getSizeofMutableByteArray#: we get the size in bytes, not "elements" - - - - - 3b8166c5 by Recursion Ninja at 2026-06-03T17:57:41-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Resolves issue #26953 - - - - - 66 changed files: - + changelog.d/T27182.md - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.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/Usage.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Misc.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - + testsuite/tests/profiling/should_compile/T27182.hs - testsuite/tests/profiling/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/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2ac2f3a113a22623748983ac3b608b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2ac2f3a113a22623748983ac3b608b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/exactprint-annotation-rationalisation] 2 commits: TTG: Add extension points to HsConDetails
by Alan Zimmerman (＠alanz) 03 Jun '26

03 Jun '26

Alan Zimmerman pushed to branch wip/az/exactprint-annotation-rationalisation at Glasgow Haskell Compiler / GHC Commits: 6bcaa0bc by Alan Zimmerman at 2026-06-03T18:01:55+01:00 TTG: Add extension points to HsConDetails In contrast to normal TTG extension points, these are indexed by the arg and rec type parameters, since HsConDetails is a container type used in various roles. Each of these uses a GhcPass based structure, so the overall effect is a family of pass-sensitive extension points. data HsConDetails p arg rec = PrefixCon !(XPrefixCon p) [arg] -- C @t1 @t2 p1 p2 p3 | RecCon !(XRecCon p) rec -- C { x = p1, y = p2 } | InfixCon !(XInfixCon p) arg arg -- p1 `C` p2 | XHsConDetails !(XXHsConDetails p) type family XPrefixCon p type family XRecCon p type family XInfixCon p type family XXHsConDetails p - - - - - 0030d0c7 by Alan Zimmerman at 2026-06-03T22:11:45+01:00 EPA: remove LocatedLI / SrcSpanAnnLI These were used for module export lists, and import decl lists. Replace them with direct capture of the relevant EP Annotations in HsModule and ImportDecl annotation extension points. Also use the HsConDetails RecCon extension point to capture the braces in a record constructor - - - - - 83 changed files: - compiler/GHC/Data/BooleanFormula.hs - compiler/GHC/Hs.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Stats.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Constructor.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Utils/Backpack.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/ThToHs.hs - compiler/Language/Haskell/Syntax.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - ghc/GHCi/UI.hs - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/Makefile - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Utils.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.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/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d627ab07da07dfb3da93c5cc3d7ecb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d627ab07da07dfb3da93c5cc3d7ecb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] Decoupling 'L.H.S' from 'GHC.Types.SourceText'
by recursion-ninja (＠recursion-ninja) 03 Jun '26

03 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 2ac2f3a1 by Recursion Ninja at 2026-06-03T15:31:22-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Resolves issue #26953 - - - - - 60 changed files: - compiler/GHC/Builtin/Utils.hs - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.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/Usage.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Misc.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - 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/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2ac2f3a113a22623748983ac3b608ba… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2ac2f3a113a22623748983ac3b608ba… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] Decoupling 'L.H.S' from 'GHC.Types.SourceText'
by recursion-ninja (＠recursion-ninja) 03 Jun '26

03 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: c9022191 by Recursion Ninja at 2026-06-03T14:48:36-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Resolves issue #26953 - - - - - 60 changed files: - compiler/GHC/Builtin/Utils.hs - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.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/Usage.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Misc.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - 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/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c9022191ec7598d6eb067a6fd50b026… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c9022191ec7598d6eb067a6fd50b026… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] clarify comment for getSizeofMutableByteArray#: we get the size in bytes, not "elements"
by Marge Bot (＠marge-bot) 03 Jun '26

03 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: cf1fd661 by Artem Pelenitsyn at 2026-06-03T14:48:09-04:00 clarify comment for getSizeofMutableByteArray#: we get the size in bytes, not "elements" - - - - - 1 changed file: - compiler/GHC/Builtin/primops.txt.pp Changes: ===================================== compiler/GHC/Builtin/primops.txt.pp ===================================== @@ -2149,7 +2149,7 @@ primop SizeofMutableByteArrayOp "sizeofMutableByteArray#" GenPrimOp primop GetSizeofMutableByteArrayOp "getSizeofMutableByteArray#" GenPrimOp MutableByteArray# s -> State# s -> (# State# s, Int# #) - {Return the number of elements in the array, correctly accounting for + {Return the number of bytes in the array, correctly accounting for the effect of 'shrinkMutableByteArray#' and 'resizeMutableByteArray#'. @since 0.5.0.0} View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf1fd6615544bbd828c399ca9aee35d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf1fd6615544bbd828c399ca9aee35d… You're receiving this email because of your account on gitlab.haskell.org.

1 0