- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/fendor/ghc-sample-profiler
by Hannes Siebenhandl (＠fendor) 17 Oct '25

17 Oct '25

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

1 0

[Git][ghc/ghc][wip/26264] compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag
by Zubin (＠wz1000) 17 Oct '25

17 Oct '25

Zubin pushed to branch wip/26264 at Glasgow Haskell Compiler / GHC Commits: f85058d3 by Zubin Duggal at 2025-10-17T13:50:52+05:30 compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag Fixes #26264 Metric Decrease: T9233 - - - - - 41 changed files: - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/JS/JStg/Monad.hs - compiler/GHC/Platform/Reg.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToJS/CodeGen.hs - compiler/GHC/StgToJS/Ids.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Name/Cache.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/Supply.hs - + testsuite/tests/ghc-api/T26264.hs - + testsuite/tests/ghc-api/T26264.stdout - testsuite/tests/ghc-api/all.T - testsuite/tests/overloadedrecflds/should_compile/BootFldReexport.stderr - testsuite/tests/overloadedrecflds/should_fail/T16745.stderr - testsuite/tests/overloadedrecflds/should_fail/T18999_NoDisambiguateRecordFields.stderr - testsuite/tests/perf/should_run/UniqLoop.hs - testsuite/tests/regalloc/regalloc_unit_tests.hs - testsuite/tests/simplCore/should_compile/rule2.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f85058d3361cc9030265c716d5d1b8e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f85058d3361cc9030265c716d5d1b8e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 2 commits: Fix buglet in solving equalities from QCIs
by Simon Peyton Jones (＠simonpj) 17 Oct '25

17 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: e50adf9c by Simon Peyton Jones at 2025-10-17T08:19:14+01:00 Fix buglet in solving equalities from QCIs - - - - - f4875d90 by Simon Peyton Jones at 2025-10-17T08:19:42+01:00 Free vars of a type ...should include free vars of CoercionHoles - - - - - 2 changed files: - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Tc/Solver/Equality.hs Changes: ===================================== compiler/GHC/Core/TyCo/FVs.hs ===================================== @@ -338,9 +338,15 @@ deepTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and synon | otherwise = appEndo (deep_ty (varType v)) $ acc `extendVarSet` v + do_bndr :: TyCoVarSet -> TyVar -> ForAllTyFlag -> TyCoVarSet do_bndr is tcv _ = extendVarSet is tcv - do_hole _ _ = mempty -- See (CHFV1) in Note [CoercionHoles and coercion free variables] - -- in GHC.Core.TyCo.Rep + + do_hole :: VarSet -> CoercionHole -> Endo TyCoVarSet + do_hole _ hole = deep_ty (varType (coHoleCoVar hole)) + -- We don't collect the CoercionHole itself, but we /do/ + -- need to collect the free variables of its /kind/ + -- See (CHFV1) in Note [CoercionHoles and coercion free variables] + -- in GHC.Core.TyCo.Rep {- ********************************************************************* * * ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -2935,8 +2935,7 @@ lookup_eq_in_qcis :: CtEvidence -> EqRel -> TcType -> TcType -> SolverStage () -- [W] t1 ~# t2 -- and a Given quantified contraint like (forall a b. blah => a ~ b) -- Why? See Note [Looking up primitive equalities in quantified constraints] --- See also GHC.Tc.Solver.Dict --- Note [Equality superclasses in quantified constraints] +-- See also GHC.Tc.Solver.Dict Note [Equality superclasses in quantified constraints] lookup_eq_in_qcis (CtGiven {}) _ _ _ = nopStage () @@ -2952,10 +2951,18 @@ lookup_eq_in_qcis ev@(CtWanted (WantedCt { ctev_dest = dest, ctev_loc = loc })) where hole = case dest of HoleDest hole -> hole -- Equality constraints have HoleDest - _ -> pprPanic "lookup_eq_in_qcis" (ppr dest) + _ -> pprPanic "lookup_eq_in_qcis" (ppr dest) try :: SwapFlag -> SolverStage () - try swap -- First try looking for (lhs ~ rhs) + -- E.g. We are trying to solve (say) + -- [W] g : [Int] ~# b) + -- from [G] forall x. blah => b ~ [x] -- A quantified constraint + -- We can solve it like this + -- d::b~[Int] := $df @Int blah -- Apply the quantified constraint + -- g'::b~#[Int] := sc_sel d -- Binding, extract the coercion from d + -- g(co-hole) := sym g' -- Fill the original coercion hole + -- Here g' is a fresh coercion variable. + try swap | Just (cls, tys) <- unSwap swap (boxEqPred eq_rel) lhs rhs = Stage $ do { let cls_pred = mkClassPred cls tys @@ -2965,7 +2972,7 @@ lookup_eq_in_qcis ev@(CtWanted (WantedCt { ctev_dest = dest, ctev_loc = loc })) OneInst {} -> do { dict_ev <- newWantedEvVarNC loc emptyCoHoleSet cls_pred ; chooseInstance dict_ev res - ; let co_var = coHoleCoVar hole + ; co_var <- newEvVar (unSwap swap (mkEqPred eq_rel) lhs rhs) ; setEvBind (mkWantedEvBind co_var EvCanonical (mk_sc_sel cls tys dict_ev)) ; fillCoercionHole hole emptyCoHoleSet $ maybeSymCo swap (mkCoVarCo co_var) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/058b40f2f7d5c04256e81d4a6fdd5a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/058b40f2f7d5c04256e81d4a6fdd5a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED] 2 commits: Fixup: Align Settings
by Sven Tennie (＠supersven) 17 Oct '25

17 Oct '25

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: bc7c7b88 by Sven Tennie at 2025-10-17T06:34:38+02:00 Fixup: Align Settings - - - - - 21fb6e2a by Sven Tennie at 2025-10-17T06:35:37+02:00 Hack around libffi not creating shared libs with GCC (in lieu of LD) - - - - - 2 changed files: - hadrian/src/Rules/Libffi.hs - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Rules/Libffi.hs ===================================== @@ -142,15 +142,18 @@ configureEnvironment stage@Stage1 = do , builderEnvironment "AR" (Ar Unpack stage) , builderEnvironment "NM" (Nm stage) , builderEnvironment "RANLIB" (Ranlib stage) - , remBuilderEnvironment "OBJDUMP" - , remBuilderEnvironment "STRIP" + -- , remBuilderEnvironment "OBJDUMP" + -- , remBuilderEnvironment "STRIP" , return . AddEnv "CFLAGS" $ unwords cFlags ++ " -w" - , return . AddEnv "LDFLAGS" $ unwords ldFlags ++ " -w" ] + , return . AddEnv "LDFLAGS" $ unwords ldFlags ++ " -w" + , return . AddEnv "OBJDUMP" $ "objdump" + , return . AddEnv "STRIP" $ "strip" ] ++ (if winTarget then -- TODO: Use staged LD for winTarget. This is only a hack because the wrong staged LD was provided. [remBuilderEnvironment "LD"] else - [ -- TODO: This should be the staged LD, but that points to GCC and not LD. + [ -- TODO: This should be the staged LD, but that points to gcc and not ld. With the current gcc as linker config, libffi doesn't build shared libs. + remBuilderEnvironment "LD" ]) configureEnvironment stage = do @@ -172,6 +175,7 @@ configureEnvironment stage = do [] else [ -- TODO: This should be the staged LD, but that points to GCC and not LD. + -- builderEnvironment "LD" (Ld stage) ]) -- Need the libffi archive and `trackAllow` all files in the build directory. ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -3,7 +3,7 @@ module Settings.Packages (packageArgs) where import Data.Version.Extra import Expression import Flavour -import Oracles.Setting hiding (ghcWithInterpreter) +import Oracles.Setting import Oracles.Flag import Packages import Settings @@ -12,7 +12,6 @@ import Settings.Builders.Common (wayCcArgs) import qualified GHC.Toolchain.Library as Lib import GHC.Toolchain.Target import GHC.Platform.ArchOS -import Settings.Program (ghcWithInterpreter) -- | Package-specific command-line arguments. packageArgs :: Args @@ -93,7 +92,7 @@ packageArgs = do -- load target code, otherwise enable for stage1 since -- that runs on the target and can use target's own -- ghci object linker - [ andM [expr (ghcWithInterpreter stage), orM [notM (expr cross), stage2]] `cabalFlag` "internal-interpreter" + [ andM [expr (ghcWithInterpreter stage)] `cabalFlag` "internal-interpreter" , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" , arg "-build-tool-depends" , staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd" @@ -263,7 +262,7 @@ ghcInternalArgs = package ghcInternal ? do -- backend specific , case backend of - "gmp" -> mconcat + "gmp" -> mconcat [ builder (Cabal Setup) ? mconcat -- enable GMP backend: configure script will produce @@ -415,7 +414,7 @@ rtsPackageArgs = package rts ? do -- any warnings in the module. See: -- https://gitlab.haskell.org/ghc/ghc/wikis/working-conventions#Warnings - , (not <$> (staged (buildFlag CcLlvmBackend))) ? + , (not <$> staged (buildFlag CcLlvmBackend)) ? inputs ["**/Compact.c"] ? arg "-finline-limit=2500" , input "**/RetainerProfile.c" ? staged (buildFlag CcLlvmBackend) ? View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/db447b27430492c6c5db5a5e145aa3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/db447b27430492c6c5db5a5e145aa3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25262] Use template-haskell-lift/quasiquoter in boot libraries
by Teo Camarasu (＠teo) 16 Oct '25

16 Oct '25

Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC Commits: a4a510ca by Teo Camarasu at 2025-10-16T23:38:48+01:00 Use template-haskell-lift/quasiquoter in boot libraries - - - - - 8 changed files: - + libraries/addupstreams.py - libraries/bytestring - libraries/containers - libraries/exceptions - libraries/filepath - libraries/os-string - libraries/text - libraries/time Changes: ===================================== libraries/addupstreams.py ===================================== @@ -0,0 +1,135 @@ +#!/usr/bin/env python3 + +from pathlib import Path +import subprocess +import logging +import re + +logging.basicConfig(level=logging.INFO) + +IGNORE = 1 # ignore submodule +GITHUB_HASKELL = 2 # in the haskell github org +ORIGIN = 3 # upstream remote == origin remote + +def github(owner: str, name: str) -> str: + return f'https://github.com/{owner}/{name}' + +def github_haskell(name: str) -> str: + return github('haskell', name) + +def gitlab_ssh(owner: str, name: str) -> str: + return f'git@gitlab.haskell.org:{owner}/{name}' + +upstreams = { + '.arc-linters/arcanist-external-json-linter': IGNORE, + 'libffi-tarballs': IGNORE, + 'libraries/array': GITHUB_HASKELL, + 'libraries/binary': GITHUB_HASKELL, + 'libraries/bytestring': GITHUB_HASKELL, + 'libraries/Cabal': GITHUB_HASKELL, + 'libraries/containers': GITHUB_HASKELL, + 'libraries/deepseq': GITHUB_HASKELL, + 'libraries/directory': GITHUB_HASKELL, + 'libraries/file-io': GITHUB_HASKELL, + 'libraries/filepath': GITHUB_HASKELL, + 'libraries/ghc-bignum/gmp/gmp-tarballs': ORIGIN, + 'libraries/ghc-internal/gmp/gmp-tarballs': ORIGIN, + 'libraries/haskeline': GITHUB_HASKELL, + 'libraries/hpc': ORIGIN, + 'libraries/integer-gmp/gmp/gmp-tarballs': ORIGIN, + 'libraries/mtl': GITHUB_HASKELL, + 'libraries/os-string': GITHUB_HASKELL, + 'libraries/parallel': GITHUB_HASKELL, + 'libraries/parsec': GITHUB_HASKELL, + 'libraries/pretty': GITHUB_HASKELL, + 'libraries/primitive': GITHUB_HASKELL, + 'libraries/process': GITHUB_HASKELL, + 'libraries/semaphore-compat': ORIGIN, + 'libraries/stm': GITHUB_HASKELL, + 'libraries/terminfo': GITHUB_HASKELL, + 'libraries/text': GITHUB_HASKELL, + 'libraries/time': GITHUB_HASKELL, + 'libraries/transformers': IGNORE, # darcs mirror + 'libraries/unix': GITHUB_HASKELL, + 'libraries/Win32': GITHUB_HASKELL, + 'nofib': 'https://gitlab.haskell.org/ghc/nofib', + 'utils/hpc': GITHUB_HASKELL, + 'utils/haddock': GITHUB_HASKELL, +} + +all_submods = [ + line.split()[1] + for line in subprocess.check_output(['git', 'submodule'], encoding='UTF-8').split('\n') + if len(line.split()) > 0 +] + +packages = { + line.split()[0]: line.split()[3] + for line in open('packages').read().split('\n') + if not line.startswith('#') + if len(line.split()) == 4 + if line.split()[3] != '-' +} + +def get_remote_url(submod: str, remote: str): + p = subprocess.run(['git', '-C', submod, 'remote', 'get-url', remote], + encoding='UTF-8', + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + if p.returncode == 0: + return p.stdout + else: + return None + +def add_remote(submod: str, remote: str, url: str): + old_url = get_remote_url(submod, remote) + if old_url is None: + logging.info(f'{submod}: adding remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'add', remote, url]) + elif old_url == url: + return + else: + logging.info(f'{submod}: updating remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'set-url', remote, url]) + + #update_remote(submod, remote) + +def update_remote(submod: str, remote: str): + subprocess.check_call(['git', '-C', submod, 'remote', 'update', remote]) + +def main(): + for submod in all_submods: + print(submod) + upstream = None + if submod in upstreams: + upstream = upstreams[submod] + elif submod in packages: + upstream = packages[submod] + + if upstream == ORIGIN: + upstream = subprocess.check_output(['git', '-C', submod, 'remote', 'get-url', 'origin'], encoding='UTF-8').strip() + elif upstream == GITHUB_HASKELL: + upstream = github_haskell(Path(submod).name) + elif upstream == IGNORE: + continue + + if upstream is None: + print(f'Unknown upstream for {submod}') + raise ValueError('unknown upstream') + else: + print(f'Upstream of {submod} is {upstream}') + add_remote(submod, 'upstream', upstream) + + origin = get_remote_url(submod, 'origin') + m = re.match('https://gitlab.haskell.org/(.*)', origin) + if m is not None: + push = f'git@gitlab.haskell.org:{m.group(1)}' + print(f'origin-push of {submod} is {push}') + add_remote(submod, 'origin-push', push) + + name = Path(submod).name + add_remote(submod, 'teo', f'git@github.com:TeofilC/{name}') + +if __name__ == '__main__': + main() + ===================================== libraries/bytestring ===================================== @@ -1 +1 @@ -Subproject commit d984ad00644c0157bad04900434b9d36f23633c5 +Subproject commit afc9dd08be0be0a44cffb67e42f82f652a412cf3 ===================================== libraries/containers ===================================== @@ -1 +1 @@ -Subproject commit 801b06e5d4392b028e519d5ca116a2881d559721 +Subproject commit ad2e78287af5092748fce8011a377c75db9c56f9 ===================================== libraries/exceptions ===================================== @@ -1 +1 @@ -Subproject commit b6c4290124eb1138358bf04ad9f33e67f6c5c1d8 +Subproject commit 224546df89ee8afa09c4bd9ec97eed62ddf1cbba ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit e4cc73a60a7fa0111715292626fd0e1b01d4d39e ===================================== libraries/os-string ===================================== @@ -1 +1 @@ -Subproject commit 2e693aad07540173a0169971b27c9acac28eeff1 +Subproject commit 13b7bef9c40cd454a6e7b357dece7262e5276744 ===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67 +Subproject commit b2f86f8a010dabcbdfb32f4b7f3d95259d9107fa ===================================== libraries/time ===================================== @@ -1 +1 @@ -Subproject commit 507f50844802f1469ba6cadfeefd4e3fecee0416 +Subproject commit 4ae1bbd587bcbe0c643cefb00337ce85e0ff2507 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a4a510cad49fd1a0d6d02baf97bd6ba… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a4a510cad49fd1a0d6d02baf97bd6ba… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25262] Use template-haskell-lift/quasiquoter in boot libraries
by Teo Camarasu (＠teo) 16 Oct '25

16 Oct '25

Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC Commits: 53e68d2e by Teo Camarasu at 2025-10-16T23:20:39+01:00 Use template-haskell-lift/quasiquoter in boot libraries - - - - - 8 changed files: - + libraries/addupstreams.py - libraries/bytestring - libraries/containers - libraries/exceptions - libraries/filepath - libraries/os-string - libraries/text - libraries/time Changes: ===================================== libraries/addupstreams.py ===================================== @@ -0,0 +1,135 @@ +#!/usr/bin/env python3 + +from pathlib import Path +import subprocess +import logging +import re + +logging.basicConfig(level=logging.INFO) + +IGNORE = 1 # ignore submodule +GITHUB_HASKELL = 2 # in the haskell github org +ORIGIN = 3 # upstream remote == origin remote + +def github(owner: str, name: str) -> str: + return f'https://github.com/{owner}/{name}' + +def github_haskell(name: str) -> str: + return github('haskell', name) + +def gitlab_ssh(owner: str, name: str) -> str: + return f'git@gitlab.haskell.org:{owner}/{name}' + +upstreams = { + '.arc-linters/arcanist-external-json-linter': IGNORE, + 'libffi-tarballs': IGNORE, + 'libraries/array': GITHUB_HASKELL, + 'libraries/binary': GITHUB_HASKELL, + 'libraries/bytestring': GITHUB_HASKELL, + 'libraries/Cabal': GITHUB_HASKELL, + 'libraries/containers': GITHUB_HASKELL, + 'libraries/deepseq': GITHUB_HASKELL, + 'libraries/directory': GITHUB_HASKELL, + 'libraries/file-io': GITHUB_HASKELL, + 'libraries/filepath': GITHUB_HASKELL, + 'libraries/ghc-bignum/gmp/gmp-tarballs': ORIGIN, + 'libraries/ghc-internal/gmp/gmp-tarballs': ORIGIN, + 'libraries/haskeline': GITHUB_HASKELL, + 'libraries/hpc': ORIGIN, + 'libraries/integer-gmp/gmp/gmp-tarballs': ORIGIN, + 'libraries/mtl': GITHUB_HASKELL, + 'libraries/os-string': GITHUB_HASKELL, + 'libraries/parallel': GITHUB_HASKELL, + 'libraries/parsec': GITHUB_HASKELL, + 'libraries/pretty': GITHUB_HASKELL, + 'libraries/primitive': GITHUB_HASKELL, + 'libraries/process': GITHUB_HASKELL, + 'libraries/semaphore-compat': ORIGIN, + 'libraries/stm': GITHUB_HASKELL, + 'libraries/terminfo': GITHUB_HASKELL, + 'libraries/text': GITHUB_HASKELL, + 'libraries/time': GITHUB_HASKELL, + 'libraries/transformers': IGNORE, # darcs mirror + 'libraries/unix': GITHUB_HASKELL, + 'libraries/Win32': GITHUB_HASKELL, + 'nofib': 'https://gitlab.haskell.org/ghc/nofib', + 'utils/hpc': GITHUB_HASKELL, + 'utils/haddock': GITHUB_HASKELL, +} + +all_submods = [ + line.split()[1] + for line in subprocess.check_output(['git', 'submodule'], encoding='UTF-8').split('\n') + if len(line.split()) > 0 +] + +packages = { + line.split()[0]: line.split()[3] + for line in open('packages').read().split('\n') + if not line.startswith('#') + if len(line.split()) == 4 + if line.split()[3] != '-' +} + +def get_remote_url(submod: str, remote: str): + p = subprocess.run(['git', '-C', submod, 'remote', 'get-url', remote], + encoding='UTF-8', + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + if p.returncode == 0: + return p.stdout + else: + return None + +def add_remote(submod: str, remote: str, url: str): + old_url = get_remote_url(submod, remote) + if old_url is None: + logging.info(f'{submod}: adding remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'add', remote, url]) + elif old_url == url: + return + else: + logging.info(f'{submod}: updating remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'set-url', remote, url]) + + #update_remote(submod, remote) + +def update_remote(submod: str, remote: str): + subprocess.check_call(['git', '-C', submod, 'remote', 'update', remote]) + +def main(): + for submod in all_submods: + print(submod) + upstream = None + if submod in upstreams: + upstream = upstreams[submod] + elif submod in packages: + upstream = packages[submod] + + if upstream == ORIGIN: + upstream = subprocess.check_output(['git', '-C', submod, 'remote', 'get-url', 'origin'], encoding='UTF-8').strip() + elif upstream == GITHUB_HASKELL: + upstream = github_haskell(Path(submod).name) + elif upstream == IGNORE: + continue + + if upstream is None: + print(f'Unknown upstream for {submod}') + raise ValueError('unknown upstream') + else: + print(f'Upstream of {submod} is {upstream}') + add_remote(submod, 'upstream', upstream) + + origin = get_remote_url(submod, 'origin') + m = re.match('https://gitlab.haskell.org/(.*)', origin) + if m is not None: + push = f'git@gitlab.haskell.org:{m.group(1)}' + print(f'origin-push of {submod} is {push}') + add_remote(submod, 'origin-push', push) + + name = Path(submod).name + add_remote(submod, 'teo', f'git@github.com:TeofilC/{name}') + +if __name__ == '__main__': + main() + ===================================== libraries/bytestring ===================================== @@ -1 +1 @@ -Subproject commit d984ad00644c0157bad04900434b9d36f23633c5 +Subproject commit afc9dd08be0be0a44cffb67e42f82f652a412cf3 ===================================== libraries/containers ===================================== @@ -1 +1 @@ -Subproject commit 801b06e5d4392b028e519d5ca116a2881d559721 +Subproject commit c4d4d83c4d55e83dc8771cb10d29e8542e11487d ===================================== libraries/exceptions ===================================== @@ -1 +1 @@ -Subproject commit b6c4290124eb1138358bf04ad9f33e67f6c5c1d8 +Subproject commit e74d6c9b6e857563f00eca5b5a6aa63631e807a4 ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit e4cc73a60a7fa0111715292626fd0e1b01d4d39e ===================================== libraries/os-string ===================================== @@ -1 +1 @@ -Subproject commit 2e693aad07540173a0169971b27c9acac28eeff1 +Subproject commit 13b7bef9c40cd454a6e7b357dece7262e5276744 ===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67 +Subproject commit b2f86f8a010dabcbdfb32f4b7f3d95259d9107fa ===================================== libraries/time ===================================== @@ -1 +1 @@ -Subproject commit 507f50844802f1469ba6cadfeefd4e3fecee0416 +Subproject commit 4ae1bbd587bcbe0c643cefb00337ce85e0ff2507 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/53e68d2e9e55880e9297f2c7377c77a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/53e68d2e9e55880e9297f2c7377c77a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25262] Use template-haskell-lift/quasiquoter in boot libraries
by Teo Camarasu (＠teo) 16 Oct '25

16 Oct '25

Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC Commits: 75b6f8c3 by Teo Camarasu at 2025-10-16T23:01:06+01:00 Use template-haskell-lift/quasiquoter in boot libraries - - - - - 8 changed files: - + libraries/addupstreams.py - libraries/bytestring - libraries/containers - libraries/exceptions - libraries/filepath - libraries/os-string - libraries/text - libraries/time Changes: ===================================== libraries/addupstreams.py ===================================== @@ -0,0 +1,135 @@ +#!/usr/bin/env python3 + +from pathlib import Path +import subprocess +import logging +import re + +logging.basicConfig(level=logging.INFO) + +IGNORE = 1 # ignore submodule +GITHUB_HASKELL = 2 # in the haskell github org +ORIGIN = 3 # upstream remote == origin remote + +def github(owner: str, name: str) -> str: + return f'https://github.com/{owner}/{name}' + +def github_haskell(name: str) -> str: + return github('haskell', name) + +def gitlab_ssh(owner: str, name: str) -> str: + return f'git@gitlab.haskell.org:{owner}/{name}' + +upstreams = { + '.arc-linters/arcanist-external-json-linter': IGNORE, + 'libffi-tarballs': IGNORE, + 'libraries/array': GITHUB_HASKELL, + 'libraries/binary': GITHUB_HASKELL, + 'libraries/bytestring': GITHUB_HASKELL, + 'libraries/Cabal': GITHUB_HASKELL, + 'libraries/containers': GITHUB_HASKELL, + 'libraries/deepseq': GITHUB_HASKELL, + 'libraries/directory': GITHUB_HASKELL, + 'libraries/file-io': GITHUB_HASKELL, + 'libraries/filepath': GITHUB_HASKELL, + 'libraries/ghc-bignum/gmp/gmp-tarballs': ORIGIN, + 'libraries/ghc-internal/gmp/gmp-tarballs': ORIGIN, + 'libraries/haskeline': GITHUB_HASKELL, + 'libraries/hpc': ORIGIN, + 'libraries/integer-gmp/gmp/gmp-tarballs': ORIGIN, + 'libraries/mtl': GITHUB_HASKELL, + 'libraries/os-string': GITHUB_HASKELL, + 'libraries/parallel': GITHUB_HASKELL, + 'libraries/parsec': GITHUB_HASKELL, + 'libraries/pretty': GITHUB_HASKELL, + 'libraries/primitive': GITHUB_HASKELL, + 'libraries/process': GITHUB_HASKELL, + 'libraries/semaphore-compat': ORIGIN, + 'libraries/stm': GITHUB_HASKELL, + 'libraries/terminfo': GITHUB_HASKELL, + 'libraries/text': GITHUB_HASKELL, + 'libraries/time': GITHUB_HASKELL, + 'libraries/transformers': IGNORE, # darcs mirror + 'libraries/unix': GITHUB_HASKELL, + 'libraries/Win32': GITHUB_HASKELL, + 'nofib': 'https://gitlab.haskell.org/ghc/nofib', + 'utils/hpc': GITHUB_HASKELL, + 'utils/haddock': GITHUB_HASKELL, +} + +all_submods = [ + line.split()[1] + for line in subprocess.check_output(['git', 'submodule'], encoding='UTF-8').split('\n') + if len(line.split()) > 0 +] + +packages = { + line.split()[0]: line.split()[3] + for line in open('packages').read().split('\n') + if not line.startswith('#') + if len(line.split()) == 4 + if line.split()[3] != '-' +} + +def get_remote_url(submod: str, remote: str): + p = subprocess.run(['git', '-C', submod, 'remote', 'get-url', remote], + encoding='UTF-8', + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + if p.returncode == 0: + return p.stdout + else: + return None + +def add_remote(submod: str, remote: str, url: str): + old_url = get_remote_url(submod, remote) + if old_url is None: + logging.info(f'{submod}: adding remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'add', remote, url]) + elif old_url == url: + return + else: + logging.info(f'{submod}: updating remote {remote} = {url}') + subprocess.call(['git', '-C', submod, 'remote', 'set-url', remote, url]) + + #update_remote(submod, remote) + +def update_remote(submod: str, remote: str): + subprocess.check_call(['git', '-C', submod, 'remote', 'update', remote]) + +def main(): + for submod in all_submods: + print(submod) + upstream = None + if submod in upstreams: + upstream = upstreams[submod] + elif submod in packages: + upstream = packages[submod] + + if upstream == ORIGIN: + upstream = subprocess.check_output(['git', '-C', submod, 'remote', 'get-url', 'origin'], encoding='UTF-8').strip() + elif upstream == GITHUB_HASKELL: + upstream = github_haskell(Path(submod).name) + elif upstream == IGNORE: + continue + + if upstream is None: + print(f'Unknown upstream for {submod}') + raise ValueError('unknown upstream') + else: + print(f'Upstream of {submod} is {upstream}') + add_remote(submod, 'upstream', upstream) + + origin = get_remote_url(submod, 'origin') + m = re.match('https://gitlab.haskell.org/(.*)', origin) + if m is not None: + push = f'git@gitlab.haskell.org:{m.group(1)}' + print(f'origin-push of {submod} is {push}') + add_remote(submod, 'origin-push', push) + + name = Path(submod).name + add_remote(submod, 'teo', f'git@github.com:TeofilC/{name}') + +if __name__ == '__main__': + main() + ===================================== libraries/bytestring ===================================== @@ -1 +1 @@ -Subproject commit d984ad00644c0157bad04900434b9d36f23633c5 +Subproject commit afc9dd08be0be0a44cffb67e42f82f652a412cf3 ===================================== libraries/containers ===================================== @@ -1 +1 @@ -Subproject commit 801b06e5d4392b028e519d5ca116a2881d559721 +Subproject commit c4d4d83c4d55e83dc8771cb10d29e8542e11487d ===================================== libraries/exceptions ===================================== @@ -1 +1 @@ -Subproject commit b6c4290124eb1138358bf04ad9f33e67f6c5c1d8 +Subproject commit e74d6c9b6e857563f00eca5b5a6aa63631e807a4 ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit e4cc73a60a7fa0111715292626fd0e1b01d4d39e ===================================== libraries/os-string ===================================== @@ -1 +1 @@ -Subproject commit 2e693aad07540173a0169971b27c9acac28eeff1 +Subproject commit 13b7bef9c40cd454a6e7b357dece7262e5276744 ===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67 +Subproject commit b2f86f8a010dabcbdfb32f4b7f3d95259d9107fa ===================================== libraries/time ===================================== @@ -1 +1 @@ -Subproject commit 507f50844802f1469ba6cadfeefd4e3fecee0416 +Subproject commit 4ae1bbd587bcbe0c643cefb00337ce85e0ff2507 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75b6f8c3efc362299c106ff4d93d80e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75b6f8c3efc362299c106ff4d93d80e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25262] 10 commits: T22859: Increase threadDelay for small machines
by Teo Camarasu (＠teo) 16 Oct '25

16 Oct '25

Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC Commits: e10dcd65 by Sven Tennie at 2025-10-12T10:24:56+00:00 T22859: Increase threadDelay for small machines The previously used thread delay led to failures on my RISC-V test setups. - - - - - d59ef6b6 by Hai / @BestYeen at 2025-10-14T21:51:14-04:00 Change Alex and Happy m4 scripts to display which version was found in the system, adapt small formatting details in Happy script to be more like the Alex script again. - - - - - c98abb6a by Hai / @BestYeen at 2025-10-14T21:52:08-04:00 Update occurrences of return to pure and add a sample for redefining :m to mean :main - - - - - 70ee825a by Cheng Shao at 2025-10-14T21:52:50-04:00 testsuite: fix T3586 for non-SSE3 platforms `T3586.hs` contains `-fvia-C -optc-msse3` which I think is a best-effort basis to harvest the C compiler's auto vectorization optimizations via the C backend back when the test was added. The `-fvia-C` part is now a deprecated no-op because GHC can't fall back to the C backend on a non-unregisterised build, and `-optc-msse3` might actually cause the test to fail on non x86/x64 platforms, e.g. recent builds of wasi-sdk would report `wasm32-wasi-clang: error: unsupported option '-msse3' for target 'wasm32-unknown-wasi'`. So this patch cleans up this historical cruft. `-fvia-C` is removed, and `-optc-msse3` is only passed when cpuid contains `pni` (which indicates support of SSE3). - - - - - 4be32153 by Teo Camarasu at 2025-10-15T08:06:09-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 0c00c9c3 by Ben Gamari at 2025-10-15T08:06:51-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - 3e6a09d2 by Teo Camarasu at 2025-10-16T22:55:20+01:00 Use template-haskell-lift/quasiquoter in boot libraries - - - - - 58 changed files: - .gitmodules - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - docs/users_guide/ghci.rst - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - + libraries/addupstreams.py - libraries/bytestring - libraries/containers - libraries/exceptions - libraries/filepath - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - libraries/os-string - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter - libraries/text - libraries/time - m4/fptools_alex.m4 - m4/fptools_happy.m4 - rts/Printer.c - rts/posix/OSMem.c - testsuite/driver/cpu_features.py - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/perf/should_run/T3586.hs - testsuite/tests/perf/should_run/all.T - testsuite/tests/rts/T22859.hs - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eb03ac67213e10e92568ea396b5555… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eb03ac67213e10e92568ea396b5555… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/ghc-cpp] 8 commits: Refactor distinct constructor tables map construction
by Alan Zimmerman (＠alanz) 16 Oct '25

16 Oct '25

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC Commits: bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - 82fb5bed by Alan Zimmerman at 2025-10-16T19:58:09+01:00 GHC-CPP: Initial implementation Processes #define FOO #ifdef FOO x = 1 #endif Into [ITcppIgnored [L loc ITcppDefine] ,ITcppIgnored [L loc ITcppIfdef] ,ITvarid "x" ,ITequal ,ITinteger (IL {il_text = SourceText "1", il_neg = False, il_value = 1}) ,ITcppIgnored [L loc ITcppEndif] ,ITeof] In time, ITcppIgnored will be pushed into a comment Tidy up before re-visiting the continuation mechanic Switch preprocessor to continuation passing style Proof of concept, needs tidying up Small cleanup Get rid of some cruft Summary: Patch: Author: Alan Zimmerman <alan.zimm(a)gmail.com> Date: 2025-10-12 16:23:56 +0100 Summary: Patch: rebase-and-tests-pass Author: Alan Zimmerman <alan.zimm(a)gmail.com> Date: 2025-10-12 14:19:04 +0100 Rebase, and all tests pass except whitespace for generated parser Starting to integrate. Need to get the pragma recognised and set Make cppTokens extend to end of line, and process CPP comments Remove unused ITcppDefined Allow spaces between # and keyword for preprocessor directive Process CPP continuation lines They are emited as separate ITcppContinue tokens. Perhaps the processing should be more like a comment, and keep on going to the end. BUT, the last line needs to be slurped as a whole. Accumulate CPP continuations, process when ready Can be simplified further, we only need one CPP token Simplify Lexer interface. Only ITcpp We transfer directive lines through it, then parse them from scratch in the preprocessor. Deal with directive on last line, with no trailing \n Start parsing and processing the directives Prepare for processing include files Move PpState into PreProcess And initParserState, initPragState too Process nested include files Also move PpState out of Lexer.x, so it is easy to evolve it in a ghci session, loading utils/check-cpp/Main.hs Split into separate files Starting on expression parser. But it hangs. Time for Text.Parsec.Expr Start integrating the ghc-cpp work From https://github.com/alanz/ghc-cpp WIP Fixup after rebase WIP Fixup after rebase, including all tests pass Change pragma usage to GHC_CPP from GhcCPP Some comments Reformat Delete unused file Rename module Parse to ParsePP Clarify naming in the parser WIP. Switching to alex/happy to be able to work in-tree Since Parsec is not available Layering is now correct - GHC lexer, emits CPP tokens - accumulated in Preprocessor state - Lexed by CPP lexer, CPP command extracted, tokens concated with spaces (to get rid of token pasting via comments) - if directive lexed and parsed by CPP lexer/parser, and evaluated First example working Loading Example1.hs into ghci, getting the right results ``` {-# LANGUAGE GHC_CPP #-} module Example1 where y = 3 x = "hello" "bye now" foo = putStrLn x ``` Rebase, and all tests pass except whitespace for generated parser info: patch template saved to `-` More plumbing. Ready for testing tomorrow. Proress. Renamed module State from Types And at first blush it seems to handle preprocessor scopes properly. Insert basic GHC version macros into parser __GLASGOW_HASKELL__ __GLASGOW_HASKELL_FULL_VERSION__ __GLASGOW_HASKELL_PATCHLEVEL1__ __GLASGOW_HASKELL_PATCHLEVEL2__ Re-sync check-cpp for easy ghci work Get rid of warnings Rework macro processing, in check-cpp Macros kept at the top level, looked up via name, multiple arity versions per name can be stored WIP. Can crack arguments for #define Next step it to crack out args in an expansion WIP on arg parsing. Progress. Still screwing up nested parens. Seems to work, but has redundant code Remove redundant code Reformat Expand args, single pass Still need to repeat until fixpoint Fixed point expansion Sync the playground to compiler Working on dumping the GHC_CPP result But We need to keep the BufSpan in a comment Keep BufSpan in queued comments in GHC.Parser.Lexer Getting close to being able to print the combined tokens showing what is in and what is out First implementation of dumpGhcCpp. Example output First dumps all macros in the state, then the source, showing which lines are in and which are out ------------------------------ - |#define FOO(A,B) A + B - |#define FOO(A,B,C) A + B + C - |#if FOO(1,FOO(3,4)) == 8 - |-- a comment |x = 1 - |#else - |x = 5 - |#endif Clean up a bit Add -ddump-ghc-cpp option and a test based on it Restore Lexer.x rules, we need them for continuation lines Lexer.x: trying to sort out the span for continuations - We need to match on \n at the end of the line - We cannot simply back up for it Inserts predefined macros. But does not dump properly Because the cpp tokens have a trailing newline Remove unnecessary LExer rules We *need* the ones that explicitly match to the end of the line. Generate correct span for ITcpp Dump now works, except we do not render trailing `\` for continuation lines. This is good enough for use in test output. Reduce duplication in lexer Tweaks Insert min_version predefined macros into state The mechanism now works. Still need to flesh out the full set. Trying my alternative pragma syntax. It works, but dumpGhcCpp is broken, I suspect from the ITcpp token span update. Pragma extraction now works, with both CPP and GHC_CPP For the following {-# LANGUAGE CPP #-} #if __GLASGOW_HASKELL__ >= 913 {-# LANGUAGE GHC_CPP #-} #endif We will enable GHC_CPP only Remove some tracing Fix test exes for changes For GHC_CPP tests, normalise config-time-based macros WIP WIP again. What is wrong? Revert to dynflags for normal not pragma lexing Working on getting check-exact to work properly Passes CppCommentPlacement test Starting on exact printing with GHC_CPP While overriding normal CPP Correctly store CPP ignored tokens as comments By populating the lexeme string in it, based on the bufpos WIP Simplifying Update the active state logic Work the new logic into the mainline code Process `defined` operator Manage lexer state while skipping tokens There is very intricate layout-related state used when lexing. If a CPP directive blanks out some tokens, store this state when the blanking starts, and restore it when they are no longer being blanked. Track the last token buffer index, for ITCppIgnored We need to attach the source being skipped in an ITCppIgnored token. We cannot simply use its BufSpan as an index into the underlying StringBuffer as it counts unicode chars, not bytes. So we update the lexer state to store the starting StringBuffer location for the last token, and use the already-stored length to extract the correct portion of the StringBuffer being parsed. Process the ! operator in GHC_CPP expressions Predefine a constant when GHC_CPP is being used. WIP Skip lines directly in the lexer when required Properly manage location when accepting tokens again Seems to be working now, for Example9 Remove tracing Fix parsing '*' in block comments Instead of replacing them with '-' Keep the trailing backslash in a ITcpp token Deal with only enabling one section of a group. A group is an instance of a conditional introduced by #if/#ifdef/#ifndef, and ending at the final #endif, including intermediate #elsif sections Replace remaining identifiers with 0 when evaluating As per the spec Snapshot before rebase Skip non-processed lines starting with # Export generateMacros so we can use it in ghc-exactprint Fix rebase Expose initParserStateWithMacrosString Fix buggy lexer cppSkip It was skipping all lines, not just ones prefixed by # Fix evaluation of && to use the correct operator Deal with closing #-} at the start of a line Add the MIN_VERSION_GLASGOW_HASKELL predefined macro Include MIN_VERSION_GLASGOW_HASKELL in GhcCpp01.stderr Use a strict map for macro defines Process TIdentifierLParen Which only matters at the start of #define Do not provide TIdentifierLParen paren twice Handle whitespace between identifier and '(' for directive only Expose some Lexer bitmap manipulation helpers Deal with line pragmas as tokens Blows up for dumpGhcCpp though Allow strings delimited by a single quote too Allow leading whitespace on cpp directives As per https://timsong-cpp.github.io/cppwp/n4140/cpp#1 Implement GHC_CPP undef Sort out expansion of no-arg macros, in a context with args And make the expansion bottom out, in the case of recursion Fix GhcCpp01 test The LINE pragma stuff works in ghc-exactprint when specifically setting flag to emit ITline_pragma tokens Process comments in CPP directives Correctly lex pragmas with finel #-} on a newline Do not process CPP-style comments Allow cpp-style comments when GHC_CPP enabled Return other pragmas as cpp ignored when GHC_CPP active Reorganise getOptionsFromFile for use in ghc-exactprint We want to be able to inject predefined macro definitions into the parser preprocessor state for when we do a hackage roundtrip. Tweak testing Only allow unknown cpp pragmas with # in left margin Require # against left margin for all GHC_CPP directives Fix CPP directives appearing in pragmas And add a test for error reporting for missing `#if` Starting to report GHC_CPP errors using GHC machinery More GHC_CPP diagnostic results WIP on converting error calls to GHC diagnostics in GHC_CPP Working on CPP diagnostic reporting Tweak some tests/lint warnings More error reporting in Macro Some cleanups Some cleanup GHC_CPP: Working on improving error reporting Harvest some commonality Use PPM as Maybe inside PP Clean up a bit Fix GhcCpp01 test I think this needs to be made more robust. Likely by not dumping the (pre-)defined macros. info: patch template saved to `-` info: patch template saved to `-` - - - - - 7f735d00 by Alan Zimmerman at 2025-10-16T19:58:13+01:00 Fix GhcCpp01 after rebase - - - - - d7bc9135 by Alan Zimmerman at 2025-10-16T19:58:13+01:00 GHC_CPP: delete utils/check-cpp It is not needed - - - - - 78925493 by Alan Zimmerman at 2025-10-16T19:58:13+01:00 GHC_CPP: remove #include processing We do not support it - - - - - a947e987 by Alan Zimmerman at 2025-10-16T19:58:13+01:00 GHC_CPP: move Eval.hs into GHC.Parser.PreProcess.Macro - - - - - 86 changed files: - compiler/GHC.hs - compiler/GHC/Cmm/Lexer.x - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Parser/Monad.hs - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Config/Parser.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Parser.hs-boot - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Header.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - + compiler/GHC/Parser/PreProcess.hs - + compiler/GHC/Parser/PreProcess/Lexer.x - + compiler/GHC/Parser/PreProcess/Macro.hs - + compiler/GHC/Parser/PreProcess/ParsePP.hs - + compiler/GHC/Parser/PreProcess/Parser.y - + compiler/GHC/Parser/PreProcess/ParserM.hs - + compiler/GHC/Parser/PreProcess/State.hs - compiler/GHC/Parser/Utils.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/SysTools/Cpp.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/ghc.cabal.in - docs/users_guide/debug-info.rst - docs/users_guide/debugging.rst - ghc/GHCi/UI.hs - hadrian/src/Rules/SourceDist.hs - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/driver/T4437.hs - testsuite/tests/ghc-api/T11579.hs - + testsuite/tests/ghc-cpp/GhcCpp01.hs - + testsuite/tests/ghc-cpp/GhcCpp01.stderr - + testsuite/tests/ghc-cpp/GhcCpp02.hs - + testsuite/tests/ghc-cpp/GhcCpp02.stderr - + testsuite/tests/ghc-cpp/all.T - testsuite/tests/interface-stability/template-haskell-exports.stdout - testsuite/tests/linters/notes.stdout - testsuite/tests/linters/regex-linters/check-cpp.py - + testsuite/tests/printer/CppCommentPlacement.hs - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout - utils/check-exact/Main.hs - utils/check-exact/Parsers.hs - utils/check-exact/Preprocess.hs - utils/check-exact/Utils.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Parser.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/537a881b539ecad068ca4e6f7c6aa2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/537a881b539ecad068ca4e6f7c6aa2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] re-include -u_init_ghc_hs_iface flag, see comments on #26166
by Rodrigo Mesquita (＠alt-romes) 16 Oct '25

16 Oct '25

Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: fa0d2788 by Rodrigo Mesquita at 2025-10-16T16:00:27+01:00 re-include -u_init_ghc_hs_iface flag, see comments on #26166 - - - - - 1 changed file: - compiler/GHC/Linker/Static.hs Changes: ===================================== compiler/GHC/Linker/Static.hs ===================================== @@ -250,6 +250,13 @@ linkBinary' staticLink logger tmpfs dflags unit_env o_files dep_units = do ++ pkg_lib_path_opts ++ extraLinkObj ++ noteLinkObjs + -- See Note [RTS/ghc-internal interface] + -- (-u<sym> must come before -lghc-internal...!) + ++ (if ghcInternalUnitId `elem` map unitId pkgs + then [concat [ "-Wl,-u," + , ['_' | platformLeadingUnderscore platform] + , "init_ghc_hs_iface" ]] + else []) ++ pkg_link_opts ++ pkg_framework_opts ++ (if platformOS platform == OSDarwin View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa0d27886c2a5d72a04de6291366a4f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fa0d27886c2a5d72a04de6291366a4f… You're receiving this email because of your account on gitlab.haskell.org.

1 0