July 2025 - ghc-commits

[Git][ghc/ghc][wip/T26186] rts/nonmovingGC: remove n_free
by Teo Camarasu (＠teo) 11 Jul '25

11 Jul '25

Teo Camarasu pushed to branch wip/T26186 at Glasgow Haskell Compiler / GHC Commits: e2cfe7bc by Teo Camarasu at 2025-07-11T16:45:20+01:00 rts/nonmovingGC: remove n_free We remove the nonmovingHeap.n_free variable. We wanted this to track the length of nonmovingHeap.free. But this isn't possible to do atomically. When this isn't accurate we can get a segfault by going past the end of the list. Instead, we just count the length of the list when we grab it in nonmovingPruneFreeSegment. Resolves #26186 - - - - - 3 changed files: - rts/sm/NonMoving.c - rts/sm/NonMoving.h - rts/sm/NonMovingAllocate.c Changes: ===================================== rts/sm/NonMoving.c ===================================== @@ -603,7 +603,6 @@ void nonmovingPushFreeSegment(struct NonmovingSegment *seg) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) old, (StgWord) seg) == (StgWord) old) break; } - __sync_add_and_fetch(&nonmovingHeap.n_free, 1); } static int @@ -621,20 +620,26 @@ cmp_segment_ptr (const void *x, const void *y) void nonmovingPruneFreeSegmentList(void) { trace(TRACE_nonmoving_gc, "Pruning free segment list."); + // Atomically grab the entire free list. struct NonmovingSegment *free; - size_t length; while (true) { free = ACQUIRE_LOAD(&nonmovingHeap.free); - length = ACQUIRE_LOAD(&nonmovingHeap.n_free); if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) free, (StgWord) NULL) == (StgWord) free) { - atomic_dec((StgVolatilePtr) &nonmovingHeap.n_free, length); break; } - // Save the current free list so the sanity checker can see these segments. - nonmovingHeap.saved_free = free; + } + // Save the current free list so the sanity checker can see these segments. + nonmovingHeap.saved_free = free; + + // Calculate the length of the list we've taken + size_t length = 0; + struct NonmovingSegment *free1 = free; + while (!free1) { + length++; + free1 = free1->link; } // Sort the free list by address. @@ -692,7 +697,6 @@ void nonmovingPruneFreeSegmentList(void) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) rest, (StgWord) free) == (StgWord) rest) { - __sync_add_and_fetch(&nonmovingHeap.n_free, new_length); break; } } ===================================== rts/sm/NonMoving.h ===================================== @@ -134,8 +134,6 @@ struct NonmovingHeap { // saved free segment list, so the sanity checker can // see the segments while the free list is being pruned. struct NonmovingSegment *saved_free; - // how many segments in free segment list? accessed atomically. - unsigned int n_free; // records the current length of the nonmovingAllocator.current arrays unsigned int n_caps; ===================================== rts/sm/NonMovingAllocate.c ===================================== @@ -183,7 +183,6 @@ static struct NonmovingSegment *nonmovingPopFreeSegment(void) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) seg, (StgWord) seg->link) == (StgWord) seg) { - __sync_sub_and_fetch(&nonmovingHeap.n_free, 1); return seg; } } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e2cfe7bc0639e70a4fda5170cb06d89… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e2cfe7bc0639e70a4fda5170cb06d89… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T26186
by Teo Camarasu (＠teo) 11 Jul '25

11 Jul '25

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

1 0

[Git][ghc/ghc][wip/romes/24212] Fix testsuite and more
by Rodrigo Mesquita (＠alt-romes) 11 Jul '25

11 Jul '25

Rodrigo Mesquita pushed to branch wip/romes/24212 at Glasgow Haskell Compiler / GHC Commits: 2594f295 by Rodrigo Mesquita at 2025-07-11T16:07:58+01:00 Fix testsuite and more - - - - - 8 changed files: - compiler/GHC/Driver/Session.hs - compiler/GHC/SysTools/BaseDir.hs - libraries/ghc-internal/src/GHC/Internal/ResponseFile.hs - testsuite/tests/ghc-api/settings-escape/T24265.hs - testsuite/tests/ghc-api/settings-escape/T24265.stderr - utils/ghc-toolchain/src/GHC/Toolchain/Target.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cxx.hs Changes: ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -279,7 +279,6 @@ import GHC.Parser (parseIdentifier) import GHC.Parser.Lexer (mkParserOpts, initParserState, P(..), ParseResult(..)) import GHC.SysTools.BaseDir ( expandToolDir, expandTopDir ) -import GHC.ResponseFile import GHC.Toolchain import GHC.Toolchain.Program @@ -3570,13 +3569,13 @@ compilerInfo dflags expandDirectories = expandToolDir (toolDir dflags) . expandTopDir (topDir dflags) query :: (Target -> a) -> a query f = f (rawTarget dflags) - queryFlags f = query (escapeArgs . prgFlags . f) + queryFlags f = query (unwords . map escapeArg . prgFlags . f) queryCmd f = expandDirectories (query (prgPath . f)) queryBool = showBool . query queryCmdMaybe, queryFlagsMaybe :: (a -> Program) -> (Target -> Maybe a) -> String queryCmdMaybe p f = expandDirectories (query (maybe "" (prgPath . p) . f)) - queryFlagsMaybe p f = query (maybe "" (escapeArgs . prgFlags . p) . f) + queryFlagsMaybe p f = query (maybe "" (unwords . map escapeArg . prgFlags . p) . f) -- Note [Special unit-ids] -- ~~~~~~~~~~~~~~~~~~~~~~~ @@ -3904,3 +3903,19 @@ updatePlatformConstants dflags mconstants = do let platform1 = (targetPlatform dflags) { platform_constants = mconstants } let dflags1 = dflags { targetPlatform = platform1 } return dflags1 + +-- ---------------------------------------------------------------------------- +-- Escape Args helpers +-- ---------------------------------------------------------------------------- + +-- | Just like 'GHC.ResponseFile.escapeArg', but it is not exposed from base. +escapeArg :: String -> String +escapeArg = reverse . foldl' escape [] + +escape :: String -> Char -> String +escape cs c + | isSpace c + || '\\' == c + || '\'' == c + || '"' == c = c:'\\':cs -- n.b., our caller must reverse the result + | otherwise = c:cs ===================================== compiler/GHC/SysTools/BaseDir.hs ===================================== @@ -124,7 +124,6 @@ expandToolDir #if defined(mingw32_HOST_OS) expandToolDir (Just tool_dir) s = expandPathVar "tooldir" tool_dir s expandToolDir Nothing _ = panic "Could not determine $tooldir" -expandToolDir _ s = s #else expandToolDir _ s = s #endif @@ -179,7 +178,6 @@ findToolDir top_dir = go 0 (top_dir </> "..") [] if oneLevel then return (Just path) else go (k+1) (path </> "..") tried' -findToolDir _ = return Nothing #else findToolDir _ = return Nothing #endif ===================================== libraries/ghc-internal/src/GHC/Internal/ResponseFile.hs ===================================== @@ -20,7 +20,7 @@ module GHC.Internal.ResponseFile ( getArgsWithResponseFiles, unescapeArgs, - escapeArgs, + escapeArgs, escapeArg, expandResponse ) where ===================================== testsuite/tests/ghc-api/settings-escape/T24265.hs ===================================== @@ -16,6 +16,13 @@ import System.Environment import System.IO (hPutStrLn, stderr) import System.Exit (exitWith, ExitCode(ExitFailure)) +import GHC.Toolchain +import GHC.Toolchain.Program +import GHC.Toolchain.Tools.Cc +import GHC.Toolchain.Tools.Cpp +import GHC.Toolchain.Tools.Cxx +import GHC.Toolchain.Lens + -- Precondition: this test case must be executed in a directory with a space. -- -- First we get the current settings file and amend it with extra arguments that we *know* @@ -30,35 +37,29 @@ main :: IO () main = do libdir:_args <- getArgs - (rawSettingOpts, originalSettings) <- runGhc (Just libdir) $ do + (rawSettingOpts, rawTargetOpts, originalSettings) <- runGhc (Just libdir) $ do dflags <- hsc_dflags <$> getSession - pure (rawSettings dflags, settings dflags) + pure (rawSettings dflags, rawTarget dflags, settings dflags) top_dir <- makeAbsolute "./ghc-install-folder/lib with spaces" - let argsWithSpaces = "\"-some option\" -some\\ other" - numberOfExtraArgs = length $ unescapeArgs argsWithSpaces - -- These are all options that can have multiple 'String' or 'Option' values. - -- We explicitly do not add 'C compiler link flags' here, as 'initSettings' - -- already adds the options of "C compiler flags" to this config field. - multipleArguments = Set.fromList - [ "Haskell CPP flags" - , "JavaScript CPP flags" - , "C-- CPP flags" - , "C compiler flags" - , "C++ compiler flags" - , "CPP flags" - , "Merge objects flags" + let argsWithSpaces l = over l (++["-some option", "-some\\ other"]) + numberOfExtraArgs = 2 + -- Test it on a handfull of list of flags + multipleArguments = + [ _tgtHsCpp % _hsCppProg % _prgFlags -- "Haskell CPP flags" + , _tgtCC % _ccProgram % _prgFlags -- "C compiler flags" + , _tgtCxx % _cxxProgram % _prgFlags -- "C++ compiler flags" + , _tgtCpp % _cppProg % _prgFlags -- "CPP flags" ] - let rawSettingOptsWithExtraArgs = - map (\(name, args) -> if Set.member name multipleArguments - then (name, args ++ " " ++ argsWithSpaces) - else (name, args)) rawSettingOpts + targetWithExtraArgs = foldr argsWithSpaces rawTargetOpts multipleArguments -- write out the modified settings. We try to keep it legible writeFile (top_dir ++ "/settings") $ - "[" ++ (intercalate "\n," (map show rawSettingOptsWithExtraArgs)) ++ "]" + "[" ++ (intercalate "\n," (map show rawSettingOpts)) ++ "]" + writeFile (top_dir ++ "/targets/default.target") $ + show targetWithExtraArgs settingsm <- runExceptT $ initSettings top_dir @@ -113,12 +114,6 @@ main = do -- Setting 'Haskell CPP flags' contains '$topdir' reference. -- Resolving those while containing spaces, should not introduce more options. recordSetting "Haskell CPP flags" (map showOpt . snd . toolSettings_pgm_P . sToolSettings) - -- Setting 'JavaScript CPP flags' contains '$topdir' reference. - -- Resolving those while containing spaces, should not introduce more options. - recordSetting "JavaScript CPP flags" (map showOpt . snd . toolSettings_pgm_JSP . sToolSettings) - -- Setting 'C-- CPP flags' contains '$topdir' reference. - -- Resolving those while containing spaces, should not introduce more options. - recordSetting "C-- CPP flags" (map showOpt . snd . toolSettings_pgm_CmmP . sToolSettings) -- Setting 'C compiler flags' contains strings with spaces. -- GHC should not split these by word. recordSetting "C compiler flags" (toolSettings_opt_c . sToolSettings) @@ -133,10 +128,6 @@ main = do -- Setting 'CPP flags' contains strings with spaces. -- GHC should not split these by word. recordSetting "CPP flags" (map showOpt . snd . toolSettings_pgm_cpp . sToolSettings) - -- Setting 'Merge objects flags' contains strings with spaces. - -- GHC should not split these by word. - -- If 'Nothing', ignore this test, otherwise the same assertion holds as before. - recordSettingM "Merge objects flags" (fmap (map showOpt . snd) . toolSettings_pgm_lm . sToolSettings) -- Setting 'C compiler command' contains '$topdir' reference. -- Spaces in the final filepath should not be escaped. recordFpSetting "C compiler" (toolSettings_pgm_c . sToolSettings) ===================================== testsuite/tests/ghc-api/settings-escape/T24265.stderr ===================================== @@ -1,9 +1,5 @@ === 'Haskell CPP flags' contains 2 new entries: True Contains spaces: True -=== 'JavaScript CPP flags' contains 2 new entries: True - Contains spaces: True -=== 'C-- CPP flags' contains 2 new entries: True - Contains spaces: True === 'C compiler flags' contains 2 new entries: True Contains spaces: True === 'C compiler link flags' contains 2 new entries: True @@ -12,5 +8,4 @@ Contains spaces: True === 'CPP flags' contains 2 new entries: True Contains spaces: True -=== 'Merge objects flags' contains expected entries: True === FilePath 'C compiler' contains escaped spaces: False ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Target.hs ===================================== @@ -7,6 +7,9 @@ module GHC.Toolchain.Target , WordSize(..), wordSize2Bytes + -- ** Lenses + , _tgtCC, _tgtCxx, _tgtCpp, _tgtHsCpp + -- * Re-exports , ByteOrder(..) ) where @@ -137,3 +140,29 @@ instance Show Target where , ", tgtInstallNameTool = " ++ show tgtInstallNameTool , "}" ] + +-------------------------------------------------------------------------------- +-- Lenses +-------------------------------------------------------------------------------- + +_tgtCC :: Lens Target Cc +_tgtCC = Lens tgtCCompiler (\x o -> o {tgtCCompiler = x}) + +_tgtCxx :: Lens Target Cxx +_tgtCxx = Lens tgtCxxCompiler (\x o -> o {tgtCxxCompiler = x}) + +_tgtCpp :: Lens Target Cpp +_tgtCpp = Lens tgtCPreprocessor (\x o -> o {tgtCPreprocessor = x}) + +_tgtHsCpp :: Lens Target HsCpp +_tgtHsCpp = Lens tgtHsCPreprocessor (\x o -> o {tgtHsCPreprocessor = x}) + +_tgtJsCpp :: Lens Target (Maybe JsCpp) +_tgtJsCpp = Lens tgtJsCPreprocessor (\x o -> o {tgtJsCPreprocessor = x}) + +_tgtCmmCpp :: Lens Target CmmCpp +_tgtCmmCpp = Lens tgtCmmCPreprocessor (\x o -> o {tgtCmmCPreprocessor = x}) + +_tgtMergeObjs :: Lens Target (Maybe MergeObjs) +_tgtMergeObjs = Lens tgtMergeObjs (\x o -> o {tgtMergeObjs = x}) + ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs ===================================== @@ -5,6 +5,9 @@ module GHC.Toolchain.Tools.Cpp , Cpp(..), findCpp , JsCpp(..), findJsCpp , CmmCpp(..), findCmmCpp + + -- * Lenses + , _cppProg, _hsCppProg, _jsCppProg, _cmmCppProg ) where import Control.Monad @@ -188,3 +191,18 @@ findCpp progOpt cc = checking "for C preprocessor" $ do let cppProgram = addFlagIfNew "-E" cpp2 return Cpp{cppProgram} +-------------------------------------------------------------------------------- +-- Lenses +-------------------------------------------------------------------------------- + +_cppProg :: Lens Cpp Program +_cppProg = Lens cppProgram (\x o -> o{cppProgram = x}) + +_hsCppProg :: Lens HsCpp Program +_hsCppProg = Lens hsCppProgram (\x o -> o{hsCppProgram = x}) + +_jsCppProg :: Lens JsCpp Program +_jsCppProg = Lens jsCppProgram (\x o -> o{jsCppProgram = x}) + +_cmmCppProg :: Lens CmmCpp Program +_cmmCppProg = Lens cmmCppProgram (\x o -> o{cmmCppProgram = x}) ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cxx.hs ===================================== @@ -4,7 +4,7 @@ module GHC.Toolchain.Tools.Cxx ( Cxx(..) , findCxx -- * Helpful utilities - , compileCxx + , compileCxx, _cxxProgram ) where import System.FilePath View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2594f2959e00576254d0c6bb329182d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2594f2959e00576254d0c6bb329182d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/haanss/depdir] 2 commits: user guide and release notes
by Hassan Al-Awwadi (＠hassan.awwadi) 11 Jul '25

11 Jul '25

Hassan Al-Awwadi pushed to branch wip/haanss/depdir at Glasgow Haskell Compiler / GHC Commits: 6f0e08a8 by Hassan Al-Awwadi at 2025-07-11T14:11:49+02:00 user guide and release notes - - - - - 53045685 by Hassan Al-Awwadi at 2025-07-11T14:41:21+02:00 removed leftover import - - - - - 3 changed files: - compiler/GHC/Tc/Gen/Splice.hs - docs/users_guide/9.14.1-notes.rst - docs/users_guide/separate_compilation.rst Changes: ===================================== compiler/GHC/Tc/Gen/Splice.hs ===================================== @@ -173,8 +173,6 @@ import GHC.Parser.HaddockLex (lexHsDoc) import GHC.Parser (parseIdentifier) import GHC.Rename.Doc (rnHsDoc) -import System.Directory(listDirectory) - {- Note [Template Haskell state diagram] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== docs/users_guide/9.14.1-notes.rst ===================================== @@ -232,6 +232,11 @@ Cmm They are replaced, respectively, by ``SpecialiseEP``, ``pragSpecED`` and ``pragSpecInlED``. +- We have added the ``addDependentDirectory`` function to match + ``addDependentFile``, which adds a directory to the list of dependencies that + the recompilation checker will look at to determine if a module needs to be + recompiled. + Included libraries ~~~~~~~~~~~~~~~~~~ ===================================== docs/users_guide/separate_compilation.rst ===================================== @@ -710,7 +710,7 @@ beautiful sight! You can read about :ghc-wiki:`how all this works <commentary/compiler/recompilation-avoidance>` in the GHC commentary. Recompilation for Template Haskell and Plugins -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Recompilation checking gets a bit more complicated when using Template Haskell or plugins. Both these features execute code at compile time and so if any of the @@ -727,6 +727,17 @@ if ``foo`` is from module ``A`` and ``bar`` is from module ``B``, the module wil now depend on ``A.o`` and ``B.o``, if either of these change then the module will be recompiled. +``addDependentFile`` and ``addDependentDirectory`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +When using Template Haskell or plugins, you can use the functions +``addDependentFile`` and ``addDependentDirectory`` to add additional +dependencies to the module being compiled. When adding a file, this means +that the contents of the file changing between compilations will trigger a +recompilation of the module. When adding a directory, this means that any +file or subdirectory *added* to or *removed* from the directory will trigger +recompilation of the module, so it is not a recursive dependency. + .. _mutual-recursion: Mutually recursive modules and hs-boot files View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75856938050c94945fc6ca91c0cf54… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75856938050c94945fc6ca91c0cf54… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 16 commits: compiler: Import AnnotationWrapper from ghc-internal
by Marge Bot (＠marge-bot) 11 Jul '25

11 Jul '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 67957854 by Ben Gamari at 2025-07-09T09:44:44-04:00 compiler: Import AnnotationWrapper from ghc-internal Since `GHC.Desugar` exported from `base` has been deprecated. - - - - - 813d99d6 by Ben Gamari at 2025-07-09T09:44:44-04:00 ghc-compact: Eliminate dependency on ghc-prim - - - - - 0ec952a1 by Ben Gamari at 2025-07-09T09:44:44-04:00 ghc-heap: Eliminate dependency on ghc-prim - - - - - 480074c3 by Ben Gamari at 2025-07-09T09:44:44-04:00 ghc-heap: Drop redundant import - - - - - 03455829 by Ben Gamari at 2025-07-09T09:44:45-04:00 ghc-prim: Bump version to 0.13.1 There are no interface changes from 0.13.0 but the implementation now lives in `ghc-internal`. - - - - - d315345a by Ben Gamari at 2025-07-09T09:44:45-04:00 template-haskell: Bump version number to 2.24.0.0 Bumps exceptions submodule. - - - - - 004c800e by Ben Gamari at 2025-07-09T09:44:45-04:00 Bump GHC version number to 9.14 - - - - - eb1a3816 by Ben Gamari at 2025-07-09T09:44:45-04:00 Bump parsec to 3.1.18.0 Bumps parsec submodule. - - - - - 86f83296 by Ben Gamari at 2025-07-09T09:44:45-04:00 unix: Bump to 2.8.7.0 Bumps unix submodule. - - - - - 89e13998 by Ben Gamari at 2025-07-09T09:44:45-04:00 binary: Bump to 0.8.9.3 Bumps binary submodule. - - - - - 55fff191 by Ben Gamari at 2025-07-09T09:44:45-04:00 Win32: Bump to 2.14.2.0 Bumps Win32 submodule. - - - - - 7dafa40c by Ben Gamari at 2025-07-09T09:44:45-04:00 base: Bump version to 4.22.0 Bumps various submodules. - - - - - ef03d8b8 by Rodrigo Mesquita at 2025-07-09T09:45:28-04:00 base: Export displayExceptionWithInfo This function should be exposed from base following CLC#285 Approved change in CLC#344 Fixes #26058 - - - - - 01d3154e by Wen Kokke at 2025-07-10T17:06:36+01:00 Fix documentation for HEAP_PROF_SAMPLE_STRING - - - - - ac259c48 by Wen Kokke at 2025-07-10T17:06:38+01:00 Fix documentation for HEAP_PROF_SAMPLE_COST_CENTRE - - - - - f87b4734 by Pi Delport at 2025-07-11T08:39:32-04:00 (Applicative docs typo: missing "one") - - - - - 47 changed files: - compiler/GHC/Tc/Gen/Splice.hs - compiler/ghc.cabal.in - configure.ac - docs/users_guide/eventlog-formats.rst - libraries/Win32 - libraries/array - libraries/base/base.cabal.in - libraries/base/src/Control/Exception.hs - libraries/binary - libraries/deepseq - libraries/directory - libraries/exceptions - libraries/filepath - libraries/ghc-boot-th/ghc-boot-th.cabal.in - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-compact/GHC/Compact.hs - libraries/ghc-compact/GHC/Compact/Serialized.hs - libraries/ghc-compact/ghc-compact.cabal - libraries/ghc-experimental/ghc-experimental.cabal.in - libraries/ghc-heap/GHC/Exts/Heap/Utils.hsc - libraries/ghc-heap/ghc-heap.cabal.in - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs - libraries/ghc-prim/changelog.md - libraries/ghc-prim/ghc-prim.cabal - libraries/ghci/ghci.cabal.in - libraries/haskeline - libraries/hpc - libraries/os-string - libraries/parsec - libraries/process - libraries/semaphore-compat - libraries/stm - libraries/template-haskell/template-haskell.cabal.in - libraries/terminfo - libraries/text - libraries/unix - 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 - utils/haddock/haddock-api/haddock-api.cabal - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs - utils/haddock/haddock-library/haddock-library.cabal - utils/haddock/haddock-test/haddock-test.cabal - utils/haddock/haddock.cabal - utils/hsc2hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a2f247493b8f07617e5e11a672ba89… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a2f247493b8f07617e5e11a672ba89… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/9.10.3-backports] 23 commits: perf: Replace uses of genericLength with strictGenericLength
by Zubin (＠wz1000) 11 Jul '25

11 Jul '25

Zubin pushed to branch wip/9.10.3-backports at Glasgow Haskell Compiler / GHC Commits: 948735d6 by Matthew Pickering at 2025-07-11T17:39:07+05:30 perf: Replace uses of genericLength with strictGenericLength genericLength is a recursive function and marked NOINLINE. It is not going to specialise. In profiles, it can be seen that 3% of total compilation time when computing bytecode is spend calling this non-specialised function. In addition, we can simplify `addListToSS` to avoid traversing the input list twice and also allocating an intermediate list (after the call to reverse). Overall these changes reduce the time spend in 'assembleBCOs' from 5.61s to 3.88s. Allocations drop from 8GB to 5.3G. Fixes #25706 - - - - - 2efc27de by Matthew Craven at 2025-07-11T17:39:49+05:30 Fix bytecode generation for `tagToEnum# <LITERAL>` Fixes #25975. (cherry picked from commit a00eeaec8f0b98ec2b8c4630f359fdeb3a6ce04e) - - - - - 5f369799 by sheaf at 2025-07-11T17:39:50+05:30 Use mkTrAppChecked in ds_ev_typeable This change avoids violating the invariant of mkTrApp according to which the argument should not be a fully saturated function type. This ensures we don't return false negatives for type equality involving function types. Fixes #25998 (cherry picked from commit 9c6d2b1bf54310b6d9755aa2ba67fbe38feeac51) - - - - - 53e12e66 by Ben Gamari at 2025-07-11T17:39:50+05:30 rts/linker: Don't fail due to RTLD_NOW In !12264 we started using the NativeObj machinery introduced some time ago for loading of shared objects. One of the side-effects of this change is shared objects are now loaded eagerly (i.e. with `RTLD_NOW`). This is needed by NativeObj to ensure full visibility of the mappings of the loaded object, which is in turn needed for safe shared object unloading. Unfortunately, this change subtly regressed, causing compilation failures in some programs. Specifically, shared objects which refer to undefined symbols (e.g. which may be usually provided by either the executable image or libraries loaded via `dlopen`) will fail to load with eager binding. This is problematic as GHC loads all package dependencies while, e.g., evaluating TemplateHaskell splices. This results in compilation failures in programs depending upon (but not using at compile-time) packages with undefined symbol references. To mitigate this NativeObj now first attempts to load an object via eager binding, reverting to lazy binding (and disabling unloading) on failure. See Note [Don't fail due to RTLD_NOW]. Fixes #25943. (cherry picked from commit ce6cf240f4b39371777d484b4de30d746b7abd62) - - - - - 6245a6e0 by Ben Gamari at 2025-07-11T17:39:50+05:30 base: Note strictness changes made in 4.16.0.0 Addresses #25886. (cherry picked from commit 7722232c6f8f0b57db03d0439d77896d38191bf9) - - - - - f8e28144 by kwxm at 2025-07-11T17:39:51+05:30 Fix bugs in `integerRecipMod` and `integerPowMod` This fixes #26017. * `integerRecipMod x 1` now returns `(# 1 | #)` for all x; previously it incorrectly returned `(# | () #)`, indicating failure. * `integerPowMod 0 e m` now returns `(# | () #)` for e<0 and m>1, indicating failure; previously it incorrectly returned `(# 0 | #)`. (cherry picked from commit 8ded23300367c6e032b3c5a635fd506b8915374b) - - - - - 3562b51b by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker: Factor out ProddableBlocks machinery - - - - - 405b0e71 by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker: Improve efficiency of proddable blocks structure Previously the linker's "proddable blocks" check relied on a simple linked list of spans. This resulted in extremely poor complexity while linking objects with lots of small sections (e.g. objects built with split sections). Rework the mechanism to instead use a simple interval set implemented via binary search. Fixes #26009. - - - - - 15f5c679 by Ben Gamari at 2025-07-11T17:39:51+05:30 testsuite: Add simple functional test for ProddableBlockSet - - - - - 43b453c3 by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker/PEi386: Drop check for LOAD_LIBRARY_SEARCH_*_DIRS The `LOAD_LIBRARY_SEARCH_USER_DIRS` and `LOAD_LIBRARY_SEARCH_DEFAULT_DIRS` were introduced in Windows Vista and have been available every since. As we no longer support Windows XP we can drop this check. Addresses #26009. - - - - - d8d62e10 by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker/PEi386: Clean up code style - - - - - 27d38354 by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/Hash: Factor out hashBuffer This is a useful helper which can be used for non-strings as well. - - - - - e5eb65aa by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker/PEi386: Fix incorrect use of break in nested for Previously the happy path of PEi386 used `break` in a double-`for` loop resulting in redundant calls to `LoadLibraryEx`. Fixes #26052. - - - - - 9da7236c by Ben Gamari at 2025-07-11T17:39:51+05:30 rts: Correctly mark const arguments - - - - - f5b2359a by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker/PEi386: Don't repeatedly load DLLs Previously every DLL-imported symbol would result in a call to `LoadLibraryEx`. This ended up constituting over 40% of the runtime of `ghc --interactive -e 42` on Windows. Avoid this by maintaining a hash-set of loaded DLL names, skipping the call if we have already loaded the requested DLL. Addresses #26009. - - - - - 65f415d7 by Ben Gamari at 2025-07-11T17:39:51+05:30 rts/linker: Expand comment describing ProddableBlockSet - - - - - 8fac39c8 by Cheng Shao at 2025-07-11T17:39:51+05:30 rts: fix rts_clearMemory logic when sanity checks are enabled This commit fixes an RTS assertion failure when invoking rts_clearMemory with +RTS -DS. -DS implies -DZ which asserts that free blocks contain 0xaa as the designated garbage value. Also adds the sanity way to rts_clearMemory test to prevent future regression. Closes #26011. ChatGPT Codex automatically diagnosed the issue and proposed the initial patch in a single shot, given a GHC checkout and the following prompt: --- Someone is reporting the following error when attempting to use `rts_clearMemory` with the RTS option `-DS`: ``` test.wasm: internal error: ASSERTION FAILED: file rts/sm/Storage.c, line 1216 (GHC version 9.12.2.20250327 for wasm32_unknown_wasi) Please report this as a GHC bug: https://www.haskell.org/ghc/reportabug ``` What's the culprit? How do I look into this issue? --- I manually reviewed & revised the patch, tested and submitted it. (cherry picked from commit 86406f48659a5ab61ce1fd2a2d427faba2dcdb09) - - - - - 1273331e by Hécate Kleidukos at 2025-07-11T17:39:51+05:30 Expose all of Backtraces' internals for ghc-internal Closes #26049 (cherry picked from commit 16014bf84afa0d009b6254b103033bceca42233a) - - - - - 4eab9fe0 by ARATA Mizuki at 2025-07-11T17:39:51+05:30 AArch64 NCG: Fix sub-word arithmetic right shift As noted in Note [Signed arithmetic on AArch64], we should zero-extend sub-word values. Fixes #26061 (cherry picked from commit 265d0024abc95be941f8e4769f24af128eedaa10) - - - - - 360d5019 by Ben Gamari at 2025-07-11T17:39:51+05:30 base: Expose Backtraces constructor and fields This was specified in the proposal (CLC #199) yet somehow didn't make it into the implementation. Fixes #26049. (cherry picked from commit 17db44c5b32fff82ea988fa4f1a233d1a27bdf57) - - - - - 980dd11c by ARATA Mizuki at 2025-07-11T17:39:51+05:30 x86 NCG: Fix code generation of bswap64 on i386 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> Fix #25601 (cherry picked from commit bfa6b70f27dc2ce7fc890ec71103c40f66497c77) - - - - - 9815ac92 by Cheng Shao at 2025-07-11T17:39:51+05:30 testsuite: add T26120 marked as broken (cherry picked from commit 44b8cee2d5c114b238898ce4ee7b44ecaa0bf491) - - - - - 777810c8 by Cheng Shao at 2025-07-11T17:39:51+05:30 compiler: fix GHC.SysTools.Ar archive member size writing logic This patch fixes a long-standing bug in `GHC.SysTools.Ar` that emits the wrong archive member size in each archive header. It should encode the exact length of the member payload, excluding any padding byte, otherwise malformed archive that extracts a broken object with an extra trailing byte could be created. Apart from the in-tree `T26120` test, I've also created an out-of-tree testsuite at https://github.com/TerrorJack/ghc-ar-quickcheck that contains QuickCheck roundtrip tests for `GHC.SysTools.Ar`. With this fix, simple roundtrip tests and `writeGNUAr`/GNU `ar` roundtrip test passes. There might be more bugs lurking in here, but this patch is still a critical bugfix already. Fixes #26120 #22586. Co-authored-by: Codex <codex(a)openai.com> (cherry picked from commit 894a04f3a82dd39ecef71619e2032c4dfead556e) - - - - - 56 changed files: - compiler/GHC/Builtin/Names.hs - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/Prelude/Basic.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/SysTools/Ar.hs - libraries/base/changelog.md - libraries/base/src/Control/Exception/Backtrace.hs - libraries/ghc-bignum/src/GHC/Num/Integer.hs - libraries/ghc-boot/GHC/Data/SizedSeq.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs - rts/Hash.c - rts/Hash.h - rts/Linker.c - rts/LinkerInternals.h - rts/PathUtils.c - rts/PathUtils.h - rts/linker/Elf.c - rts/linker/LoadNativeObjPosix.c - rts/linker/MachO.c - rts/linker/PEi386.c - rts/linker/PEi386.h - + rts/linker/ProddableBlocks.c - + rts/linker/ProddableBlocks.h - rts/rts.cabal - rts/sm/Storage.h - + testsuite/tests/bytecode/T25975.hs - + testsuite/tests/bytecode/T25975.stdout - testsuite/tests/bytecode/all.T - + testsuite/tests/cmm/should_run/T25601.hs - + testsuite/tests/cmm/should_run/T25601.stdout - + testsuite/tests/cmm/should_run/T25601a.cmm - testsuite/tests/cmm/should_run/all.T - + testsuite/tests/codeGen/should_run/T26061.hs - + testsuite/tests/codeGen/should_run/T26061.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/ffi/should_run/all.T - + testsuite/tests/ghc-api/T26120.hs - + testsuite/tests/ghc-api/T26120.stdout - 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/lib/integer/T26017.hs - + testsuite/tests/lib/integer/T26017.stdout - testsuite/tests/lib/integer/all.T - testsuite/tests/lib/integer/integerRecipMod.hs - testsuite/tests/lib/integer/integerRecipMod.stdout - + testsuite/tests/rts/TestProddableBlockSet.c - testsuite/tests/rts/all.T - + testsuite/tests/typecheck/should_run/T25998.hs - + testsuite/tests/typecheck/should_run/T25998.stdout - testsuite/tests/typecheck/should_run/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74adc4505933c03307ba39d2ee4c49… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/74adc4505933c03307ba39d2ee4c49… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/9.10.3-backports
by Zubin (＠wz1000) 11 Jul '25

11 Jul '25

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

1 0

[Git][ghc/ghc][wip/haanss/depdir] revert returning dir contents from qAddDependetDirectory
by Hassan Al-Awwadi (＠hassan.awwadi) 11 Jul '25

11 Jul '25

Hassan Al-Awwadi pushed to branch wip/haanss/depdir at Glasgow Haskell Compiler / GHC Commits: 75856938 by Hassan Al-Awwadi at 2025-07-11T13:30:37+02:00 revert returning dir contents from qAddDependetDirectory - - - - - 5 changed files: - compiler/GHC/Tc/Gen/Splice.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - libraries/ghci/GHCi/Message.hs - libraries/template-haskell/Language/Haskell/TH/Syntax.hs - testsuite/tests/interface-stability/template-haskell-exports.stdout Changes: ===================================== compiler/GHC/Tc/Gen/Splice.hs ===================================== @@ -1528,13 +1528,6 @@ instance TH.Quasi TcM where ref <- fmap tcg_dependent_dirs getGblEnv dep_dirs <- readTcRef ref writeTcRef ref (dp:dep_dirs) - -- listDirectory does not return an absolute path, so - -- we need to prepend the directory path to make the - -- the contents absolute. - contents <- liftIO $ listDirectory dp - let path_prefix = dp ++ "\\" - let abs_contents = map (path_prefix ++) contents - return abs_contents qAddTempFile suffix = do dflags <- getDynFlags ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs ===================================== @@ -136,7 +136,7 @@ class (MonadIO m, MonadFail m) => Quasi m where qAddDependentFile :: FilePath -> m () -- | See 'addDependentDirectory'. - qAddDependentDirectory :: FilePath -> m [FilePath] + qAddDependentDirectory :: FilePath -> m () -- | See 'addTempFile'. qAddTempFile :: String -> m FilePath @@ -839,23 +839,9 @@ getPackageRoot = Q qGetPackageRoot -- * The dependency is shallow, just a hash of its direct contents. It returns -- a list of the contents (absolute paths), files and subdirectories both, so -- you can manually depend on (a subset of) those, if you wish. -addDependentDirectory :: FilePath -> Q [FilePath] +addDependentDirectory :: FilePath -> Q () addDependentDirectory dp = Q (qAddDependentDirectory dp) --- | Record external directories that runIO is using (dependent upon). --- The compiler can then recognize that it should re-compile the Haskell file --- when a directory changes. --- --- Expects an absolute directory path. --- --- Notes: --- --- * ghc -M does not know about these dependencies - it does not execute TH. --- --- * The dependency is shallow, just a hash of its direct contents. --- See 'addDependentDirectory' for a version that returns the contents. -addDependentDirectory_ :: FilePath -> Q () -addDependentDirectory_ dp = addDependentDirectory dp >> pure () -- | Record external files that runIO is using (dependent upon). -- The compiler can then recognize that it should re-compile the Haskell file ===================================== libraries/ghci/GHCi/Message.hs ===================================== @@ -291,7 +291,7 @@ data THMessage a where GetPackageRoot :: THMessage (THResult FilePath) AddDependentFile :: FilePath -> THMessage (THResult ()) - AddDependentDirectory :: FilePath -> THMessage (THResult [FilePath]) + AddDependentDirectory :: FilePath -> THMessage (THResult ()) AddTempFile :: String -> THMessage (THResult FilePath) AddModFinalizer :: RemoteRef (TH.Q ()) -> THMessage (THResult ()) AddCorePlugin :: String -> THMessage (THResult ()) ===================================== libraries/template-haskell/Language/Haskell/TH/Syntax.hs ===================================== @@ -33,7 +33,6 @@ module Language.Haskell.TH.Syntax ( addCorePlugin, addDependentFile, addDependentDirectory, - addDependentDirectory_, addForeignFile, addForeignFilePath, addForeignSource, ===================================== testsuite/tests/interface-stability/template-haskell-exports.stdout ===================================== @@ -1715,7 +1715,7 @@ module Language.Haskell.TH.Syntax where qRunIO :: forall a. GHC.Internal.Types.IO a -> m a qGetPackageRoot :: m GHC.Internal.IO.FilePath qAddDependentFile :: GHC.Internal.IO.FilePath -> m () - qAddDependentDirectory :: GHC.Internal.IO.FilePath -> m [GHC.Internal.IO.FilePath] + qAddDependentDirectory :: GHC.Internal.IO.FilePath -> m () qAddTempFile :: GHC.Internal.Base.String -> m GHC.Internal.IO.FilePath qAddTopDecls :: [Dec] -> m () qAddForeignFilePath :: ForeignSrcLang -> GHC.Internal.Base.String -> m () @@ -1780,8 +1780,7 @@ module Language.Haskell.TH.Syntax where type VarStrictType :: * type VarStrictType = VarBangType addCorePlugin :: GHC.Internal.Base.String -> Q () - addDependentDirectory :: GHC.Internal.IO.FilePath -> Q [GHC.Internal.IO.FilePath] - addDependentDirectory_ :: GHC.Internal.IO.FilePath -> Q () + addDependentDirectory :: GHC.Internal.IO.FilePath -> Q () addDependentFile :: GHC.Internal.IO.FilePath -> Q () addForeignFile :: ForeignSrcLang -> GHC.Internal.Base.String -> Q () addForeignFilePath :: ForeignSrcLang -> GHC.Internal.IO.FilePath -> Q () View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75856938050c94945fc6ca91c0cf542… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75856938050c94945fc6ca91c0cf542… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26115] Wibbles
by Simon Peyton Jones (＠simonpj) 11 Jul '25

11 Jul '25

Simon Peyton Jones pushed to branch wip/T26115 at Glasgow Haskell Compiler / GHC Commits: 3afdcdca by Simon Peyton Jones at 2025-07-11T10:29:01+01:00 Wibbles - - - - - 2 changed files: - compiler/GHC/Core/FVs.hs - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/FVs.hs ===================================== @@ -188,24 +188,21 @@ exprSomeFreeVarsDSet fv_cand e = fvDVarSet $ filterFV fv_cand $ exprFVs e exprsSomeFreeVars :: InterestingVarFun -- Says which 'Var's are interesting -> [CoreExpr] -> VarSet -exprsSomeFreeVars fv_cand es = - fvVarSet $ filterFV fv_cand $ mapUnionFV exprFVs es +exprsSomeFreeVars fv_cand es = fvVarSet $ filterFV fv_cand $ mapUnionFV exprFVs es -- | Finds free variables in several expressions selected by a predicate -- returning a deterministically ordered list. exprsSomeFreeVarsList :: InterestingVarFun -- Says which 'Var's are interesting -> [CoreExpr] -> [Var] -exprsSomeFreeVarsList fv_cand es = - fvVarList $ filterFV fv_cand $ mapUnionFV exprFVs es +exprsSomeFreeVarsList fv_cand es = fvVarList $ filterFV fv_cand $ mapUnionFV exprFVs es -- | Finds free variables in several expressions selected by a predicate -- returning a deterministic set. exprsSomeFreeVarsDSet :: InterestingVarFun -- ^ Says which 'Var's are interesting -> [CoreExpr] -> DVarSet -exprsSomeFreeVarsDSet fv_cand e = - fvDVarSet $ filterFV fv_cand $ mapUnionFV exprFVs e +exprsSomeFreeVarsDSet fv_cand e = fvDVarSet $ filterFV fv_cand $ mapUnionFV exprFVs e -- Comment about obsolete code -- We used to gather the free variables the RULES at a variable occurrence ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -2594,12 +2594,12 @@ specHeader , Core.Subst -- Apply this to the body -- RULE helpers - -- RULE forall rule_bndrs. f rule_es = $sf spec_bndrs + -- `RULE forall rule_bndrs. f rule_es = $sf spec_bndrs` , [OutBndr] -- rule_bndrs: Binders for the RULE , [OutExpr] -- rule_es: Args for the LHS of the rule -- Specialised function helpers - -- $sf = \spec_bndrs. let { dx_binds } in <orig-rhs> spec_arg + -- `$sf = \spec_bndrs. let { dx_binds } in <orig-rhs> spec_arg` , [OutBndr] -- spec_bndrs: Binders for $sf. Subset of rule_bndrs. , [DictBind] -- dx_binds: Auxiliary dictionary bindings , [OutExpr] -- spec_args: Specialised arguments for unfolding View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3afdcdca67a54c537e33de808a2b5b8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3afdcdca67a54c537e33de808a2b5b8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/24212] Fix
by Rodrigo Mesquita (＠alt-romes) 11 Jul '25

11 Jul '25

Rodrigo Mesquita pushed to branch wip/romes/24212 at Glasgow Haskell Compiler / GHC Commits: a7ec377a by Rodrigo Mesquita at 2025-07-11T09:09:32+01:00 Fix - - - - - 1 changed file: - compiler/GHC/Driver/Session.hs Changes: ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -407,6 +407,7 @@ settings dflags = Settings , sToolSettings = toolSettings dflags , sPlatformMisc = platformMisc dflags , sRawSettings = rawSettings dflags + , sRawTarget = rawTarget dflags } pgm_L :: DynFlags -> String View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a7ec377a3bbd8efe6dc42be65854e98… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a7ec377a3bbd8efe6dc42be65854e98… You're receiving this email because of your account on gitlab.haskell.org.

1 0