- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/sand-witch/27423-gadt-parens
by Andrei Borzenkov (＠sand-witch) 09 Jul '26

09 Jul '26

Andrei Borzenkov pushed new branch wip/sand-witch/27423-gadt-parens at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sand-witch/27423-gadt-parens You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 4 commits: testsuite: Keep real reason for fragile test failures
by Marge Bot (＠marge-bot) 09 Jul '26

09 Jul '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 29032f17 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Keep real reason for fragile test failures - - - - - c34e03a7 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Fall back to the failure reason for empty JUnit bodies - - - - - 409d40f0 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Show output diffs in JUnit output Also refactor compare_outputs to return essentially a `Maybe Diff` (`CompareOutput`) instead of a bool, but more pythonic. This allows us to pass the diff through nice. - - - - - 06fee1ab by Zubin Duggal at 2026-07-09T09:24:58-04:00 perf notes: include stat deviation and acceptance window in notes so they show up in gitlab - - - - - 5 changed files: - testsuite/driver/junit.py - testsuite/driver/perf_notes.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/driver/testutil.py Changes: ===================================== testsuite/driver/junit.py ===================================== @@ -26,10 +26,14 @@ def junit(t: TestRun) -> ET.ElementTree: classname = tr.way, name = '%s(%s)' % (tr.testname, tr.way)) message = [] # type: List[str] + if tr.diff: + message += ['diff:', '==========', tr.diff] if tr.stdout: message += ['', 'stdout:', '==========', tr.stdout] if tr.stderr: message += ['', 'stderr:', '==========', tr.stderr] + if not message: + message = [tr.reason] result = ET.SubElement(testcase, kind, type = res_type, ===================================== testsuite/driver/perf_notes.py ===================================== @@ -653,7 +653,11 @@ def check_stats_change(actual: PerfStat, error = str(change) + ' from ' + baseline.perfStat.test_env + \ ' baseline @ %s' % baseline.commit print(actual.metric, error + ':') - result = failBecause('stat ' + error, tag='stat') + dev = 100.0 if expected_val == 0 else round(((float(actual.value) * 100) / int(expected_val)) - 100, 1) + change_line = (f'{actual.metric} {change.value} from {baseline.perfStat.test_env} ' + f'baseline @ {baseline.commit[:7]}: {expected_val} -> {actual.value} ' + f'({dev:+g}%, allowed {acceptance_window.describe()})') + result = failBecause('stat ' + change_line, tag='stat') if not change_allowed or force_print: length = max(len(str(x)) for x in [expected_val, lowerBound, upperBound, actual.value]) ===================================== testsuite/driver/testglobals.py ===================================== @@ -291,20 +291,22 @@ class TestResult: framework_failures, framework_warnings, unexpected_passes, unexpected_failures, unexpected_stat_failures lists of TestRun. """ - __slots__ = 'directory', 'testname', 'reason', 'way', 'stdout', 'stderr' + __slots__ = 'directory', 'testname', 'reason', 'way', 'stdout', 'stderr', 'diff' def __init__(self, directory: str, testname: TestName, reason: str, way: WayName, stdout: Optional[str]=None, - stderr: Optional[str]=None) -> None: + stderr: Optional[str]=None, + diff: Optional[str]=None) -> None: self.directory = directory self.testname = testname self.reason = reason self.way = way self.stdout = stdout self.stderr = stderr + self.diff = diff # A performance metric measured in this test run. PerfMetric = NamedTuple('PerfMetric', ===================================== testsuite/driver/testlib.py ===================================== @@ -1828,9 +1828,11 @@ async def do_test(name: TestName, if result.passed: t.fragile_passes.append(TestResult(directory, name, 'fragile', way)) else: - t.fragile_failures.append(TestResult(directory, name, 'fragile', way, + reason = '%s (fragile)' % result.reason if result.reason else 'fragile' + t.fragile_failures.append(TestResult(directory, name, reason, way, stdout=result.stdout, - stderr=result.stderr)) + stderr=result.stderr, + diff=result.diff)) elif result.passed: if _expect_pass(way): t.expected_passes.append(TestResult(directory, name, "", way)) @@ -1849,7 +1851,8 @@ async def do_test(name: TestName, if_verbose(1, '*** unexpected failure for %s' % full_name) tr = TestResult(directory, name, reason, way, stdout=result.stdout, - stderr=result.stderr) + stderr=result.stderr, + diff=result.diff) t.unexpected_failures.append(tr) else: t.n_expected_failures += 1 @@ -2021,19 +2024,16 @@ async def do_compile(name: TestName, expected_stderr_file = find_expected_file(name, 'stderr', way) actual_stderr_file = add_suffix(name, 'comp.stderr') - diff_file_name = in_testdir(add_suffix(name, 'comp.diff')) - - if compare_stderr and not await compare_outputs(way, 'stderr', + if compare_stderr: + stderr_match = await compare_outputs(way, 'stderr', join_normalisers(getTestOpts().extra_errmsg_normaliser, normalise_errmsg), expected_stderr_file, actual_stderr_file, - diff_file=diff_file_name, whitespace_normaliser=getattr(getTestOpts(), "whitespace_normaliser", - normalise_whitespace)): - stderr = diff_file_name.read_text() - diff_file_name.unlink() - return failBecause('stderr mismatch', stderr=stderr) + normalise_whitespace)) + if not stderr_match: + return failBecause('stderr mismatch', diff=stderr_match.diff) opts = getTestOpts() if isGenericStatsTest(): @@ -2063,10 +2063,11 @@ async def compile_cmp_asm(name: TestName, expected_asm_file = find_expected_file(name, 'asm', way) actual_asm_file = add_suffix(name, 's') - if not await compare_outputs(way, 'asm', + asm_match = await compare_outputs(way, 'asm', join_normalisers(normalise_errmsg, normalise_asm), - expected_asm_file, actual_asm_file): - return failBecause('asm mismatch') + expected_asm_file, actual_asm_file) + if not asm_match: + return failBecause('asm mismatch', diff=asm_match.diff) # no problems found, this test passed return passed() @@ -2147,19 +2148,15 @@ async def compile_and_run__(name: TestName, if compile_stderr: expected_stderr_file = find_expected_file(name, 'ghc.stderr', way) actual_stderr_file = add_suffix(name, 'comp.stderr') - diff_file_name = in_testdir(add_suffix(name, 'comp.diff')) - - if not await compare_outputs(way, 'stderr', + ghc_stderr_match = await compare_outputs(way, 'stderr', join_normalisers(getTestOpts().extra_errmsg_normaliser, normalise_errmsg), expected_stderr_file, actual_stderr_file, - diff_file=diff_file_name, whitespace_normaliser=getattr(getTestOpts(), "whitespace_normaliser", - normalise_whitespace)): - stderr = diff_file_name.read_text() - diff_file_name.unlink() - return failBecause('ghc.stderr mismatch', stderr=stderr) + normalise_whitespace)) + if not ghc_stderr_match: + return failBecause('ghc.stderr mismatch', diff=ghc_stderr_match.diff) opts = getTestOpts() extension = exe_extension() if not opts.ignore_extension else "" @@ -2448,14 +2445,18 @@ async def simple_run(name: TestName, way: WayName, prog: str, extra_run_opts: st message = format_bad_exit_code_message(exit_code) return failBecause(message) - if not (opts.ignore_stderr or await stderr_ok(name, way) or opts.combined_output): + stderr_match = CompareOutput(True) if (opts.ignore_stderr or opts.combined_output) else await stderr_ok(name, way) + if not stderr_match: return failBecause('bad stderr', stderr=read_stderr(name), - stdout=read_stdout(name)) - if not (opts.ignore_stdout or await stdout_ok(name, way)): + stdout=read_stdout(name), + diff=stderr_match.diff) + stdout_match = CompareOutput(True) if opts.ignore_stdout else await stdout_ok(name, way) + if not stdout_match: return failBecause('bad stdout', stderr=read_stderr(name), - stdout=read_stdout(name)) + stdout=read_stdout(name), + diff=stdout_match.diff) check_hp = '-hT' in my_rts_flags and opts.check_hp check_prof = '-p' in my_rts_flags @@ -2463,8 +2464,10 @@ async def simple_run(name: TestName, way: WayName, prog: str, extra_run_opts: st # exit_code > 127 probably indicates a crash, so don't try to run hp2ps. if check_hp and (exit_code <= 127 or exit_code == 251) and not await check_hp_ok(name): return failBecause('bad heap profile') - if check_prof and not await check_prof_ok(name, way): - return failBecause('bad profile') + if check_prof: + prof_match = await check_prof_ok(name, way) + if not prof_match: + return failBecause('bad profile', diff=prof_match.diff) # Check the results of stats tests if isGenericStatsTest(): @@ -2558,20 +2561,23 @@ async def interpreter_run(name: TestName, # ToDo: if the sub-shell was killed by ^C, then exit - if not (opts.ignore_stderr or await stderr_ok(name, way)): + stderr_match = CompareOutput(True) if opts.ignore_stderr else await stderr_ok(name, way) + if not stderr_match: if _expect_pass(way): dump_stderr_for('comp', name) return failBecause('bad stderr', stderr=read_stderr(name), - stdout=read_stdout(name)) - elif not (opts.ignore_stdout or await stdout_ok(name, way)): + stdout=read_stdout(name), + diff=stderr_match.diff) + stdout_match = CompareOutput(True) if opts.ignore_stdout else await stdout_ok(name, way) + if not stdout_match: if _expect_pass(way): dump_stderr_for('comp', name) return failBecause('bad stdout', stderr=read_stderr(name), - stdout=read_stdout(name)) - else: - return passed() + stdout=read_stdout(name), + diff=stdout_match.diff) + return passed() def split_file(in_fn: Path, delimiter: str, out1_fn: Path, out2_fn: Path): # See Note [Universal newlines]. @@ -2602,7 +2608,15 @@ def get_compiler_flags() -> List[str]: return flags -async def stdout_ok(name: TestName, way: WayName) -> bool: +class CompareOutput: + __slots__ = 'ok', 'diff' + def __init__(self, ok: bool, diff: Optional[str]=None) -> None: + self.ok = ok + self.diff = diff + def __bool__(self) -> bool: + return self.ok + +async def stdout_ok(name: TestName, way: WayName) -> CompareOutput: actual_stdout_file = add_suffix(name, 'run.stdout') expected_stdout_file = find_expected_file(name, 'stdout', way) @@ -2611,7 +2625,7 @@ async def stdout_ok(name: TestName, way: WayName) -> bool: check_stdout = getTestOpts().check_stdout if check_stdout is not None: actual_stdout_path = in_testdir(actual_stdout_file) - return check_stdout(actual_stdout_path, extra_norm) + return CompareOutput(check_stdout(actual_stdout_path, extra_norm)) return await compare_outputs(way, 'stdout', extra_norm, expected_stdout_file, actual_stdout_file) @@ -2623,13 +2637,21 @@ def read_stdout( name: TestName ) -> str: else: return '' +def read_diff( diff_file: Path ) -> Optional[str]: + if diff_file.exists(): + diff = diff_file.read_text() + diff_file.unlink() + return diff or None + else: + return None + def dump_stdout( name: TestName ) -> None: s = read_stdout(name).strip() if s: print("Stdout (", name, "):") safe_print(s) -async def stderr_ok(name: TestName, way: WayName) -> bool: +async def stderr_ok(name: TestName, way: WayName) -> CompareOutput: actual_stderr_file = add_suffix(name, 'run.stderr') expected_stderr_file = find_expected_file(name, 'stderr', way) @@ -2735,48 +2757,48 @@ async def check_hp_ok(name: TestName) -> bool: print("hp2ps error when processing heap profile for " + name) return False -async def check_prof_ok(name: TestName, way: WayName) -> bool: +async def check_prof_ok(name: TestName, way: WayName) -> CompareOutput: expected_prof_file = find_expected_file(name, 'prof.sample', way) expected_prof_path = in_testdir(expected_prof_file) # Check actual prof file only if we have an expected prof file to # compare it with. if not expected_prof_path.exists(): - return True + return CompareOutput(True) actual_prof_file = add_suffix(name, 'prof') actual_prof_path = in_testdir(actual_prof_file) if not actual_prof_path.exists(): print("%s does not exist" % actual_prof_path) - return(False) + return CompareOutput(False) if actual_prof_path.stat().st_size == 0: print("%s is empty" % actual_prof_path) - return(False) + return CompareOutput(False) return await compare_outputs(way, 'prof', normalise_prof, expected_prof_file, actual_prof_file, whitespace_normaliser=normalise_whitespace) # Compare expected output to actual output, and optionally accept the -# new output. Returns true if output matched or was accepted, false -# otherwise. See Note [Output comparison] for the meaning of the -# normaliser and whitespace_normaliser parameters. +# new output. Returns a truthy CompareOutput if output matched or was +# accepted, a falsy one (with the diff) otherwise. See Note [Output +# comparison] for the meaning of the normaliser and whitespace_normaliser +# parameters. async def compare_outputs( way: WayName, kind: str, normaliser: OutputNormalizer, expected_file: Path, actual_file: Path, - diff_file: Optional[Path]=None, - whitespace_normaliser: OutputNormalizer=lambda x:x) -> bool: + whitespace_normaliser: OutputNormalizer=lambda x:x) -> CompareOutput: # Respect ignore_stdout and ignore_stderr options if kind == 'stderr' and getTestOpts().ignore_stderr: - return True + return CompareOutput(True) if kind == 'stdout' and getTestOpts().ignore_stdout: - return True + return CompareOutput(True) expected_path = in_srcdir(expected_file) actual_path = in_testdir(actual_file) @@ -2796,7 +2818,7 @@ async def compare_outputs( # See Note [Output comparison]. if whitespace_normaliser(expected_str) == whitespace_normaliser(actual_str): - return True + return CompareOutput(True) else: if config.verbose >= 1 and _expect_pass(way): print('Actual ' + kind + ' output differs from expected:') @@ -2808,6 +2830,7 @@ async def compare_outputs( actual_normalised_path = add_suffix(actual_path, 'normalised') write_file(actual_normalised_path, actual_str) + diff_file = add_suffix(actual_path, 'diff') if config.verbose >= 1 and _expect_pass(way): # See Note [Output comparison]. r = await runCmd('diff -uw "{0}" "{1}"'.format(null2unix_null(expected_normalised_path), @@ -2822,13 +2845,14 @@ async def compare_outputs( actual_normalised_path), stdout=diff_file, print_output=True) - elif diff_file: diff_file.open('ab').close() # Make sure the file exists still as - # we will try to read it later + else: + diff_file.open('ab').close() # Make sure the file exists still as + # we will try to read it later if config.accept and (getTestOpts().expect == 'fail' or way in getTestOpts().expect_fail_for): if_verbose(1, 'Test is expected to fail. Not accepting new output.') - return False + return CompareOutput(False, read_diff(diff_file)) elif config.accept and actual_raw: if config.accept_platform: if_verbose(1, 'Accepting new output for platform "' @@ -2842,11 +2866,11 @@ async def compare_outputs( if_verbose(1, 'Accepting new output.') write_file(expected_path, actual_raw) - return True + return CompareOutput(True) elif config.accept: if_verbose(1, 'No output. Deleting "{0}".'.format(expected_path)) expected_path.unlink() - return True + return CompareOutput(True) else: if config.unexpected_output_dir is not None: ghc_root = expected_path.relative_to(config.top.parent) @@ -2854,7 +2878,7 @@ async def compare_outputs( out.parent.mkdir(exist_ok=True, parents=True) write_file(out, actual_raw) - return False + return CompareOutput(False, read_diff(diff_file)) # Checks that each line from pattern_file is present in actual_file as # a substring or regex pattern depending on is_substring. ===================================== testsuite/driver/testutil.py ===================================== @@ -14,6 +14,7 @@ PassFail = NamedTuple('PassFail', ('tag', Optional[str]), ('stderr', Optional[str]), ('stdout', Optional[str]), + ('diff', Optional[str]), ('hc_opts', Optional[str]), ]) @@ -26,15 +27,17 @@ def passed(hc_opts=None) -> PassFail: tag=None, stderr=None, stdout=None, + diff=None, hc_opts=hc_opts) def failBecause(reason: str, tag: Optional[str]=None, stderr: Optional[str]=None, - stdout: Optional[str]=None + stdout: Optional[str]=None, + diff: Optional[str]=None ) -> PassFail: return PassFail(passed=False, reason=reason, tag=tag, - stderr=stderr, stdout=stdout, hc_opts=None) + stderr=stderr, stdout=stdout, diff=diff, hc_opts=None) def strip_quotes(s: str) -> str: # Don't wrap commands to subprocess.call/Popen in quotes. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7e8abf413f2fba74bfcda250282018… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7e8abf413f2fba74bfcda250282018… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] EPA: Replace AnnListItem with simply [TrailingAnn]
by Marge Bot (＠marge-bot) 09 Jul '26

09 Jul '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 7e8abf41 by Alan Zimmerman at 2026-07-09T09:24:12-04:00 EPA: Replace AnnListItem with simply [TrailingAnn] Remove the unnecessary wrapper around a single field. - - - - - 35 changed files: - compiler/GHC/Hs/Dump.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Tc/Gen/Head.hs - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - testsuite/tests/typecheck/should_compile/T15242.stderr - testsuite/tests/typecheck/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e8abf413f2fba74bfcda250282018c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e8abf413f2fba74bfcda250282018c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: hadrian: binary-dist-dir should not be the default target
by Marge Bot (＠marge-bot) 09 Jul '26

09 Jul '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 2ecabb4f by Zubin Duggal at 2026-07-09T09:23:25-04:00 hadrian: binary-dist-dir should not be the default target Revert behaviour to pre 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 In 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2, we applied the following behaviour change: ``` hadrian: Build stage 2 cross compilers ... * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 ``` This is a major regression to development experience, a plain hadrian/build --freeze1 now takes ages because we rebuild all docs (which need to go in the binary dist dir). `binary-dist-dir` is the wrong default target for regular GHC development work Fixes #27445 - - - - - e16388e3 by Zubin Duggal at 2026-07-09T09:23:25-04:00 .gitignore: Add the hadrian system.config introduced by commit 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 Since commit 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 Author: Matthew Pickering <matthewtpickering(a)gmail.com> Date: Thu Dec 21 16:17:41 2023 +0000 hadrian: Build stage 2 cross compilers ./configure produces /hadrian/cfg/system.config.{host,target} Add these to .gitignore - - - - - 3 changed files: - .gitignore - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs Changes: ===================================== .gitignore ===================================== @@ -64,6 +64,8 @@ _* .hadrian_ghci_multi/ .hie-bios hadrian/bootstrap/jq-bin +/hadrian/cfg/system.config.host +/hadrian/cfg/system.config.target # ----------------------------------------------------------------------------- # Ignore any overlapped darcs repos and back up files ===================================== hadrian/src/Rules.hs ===================================== @@ -10,6 +10,7 @@ import qualified Hadrian.Oracles.Path import qualified Hadrian.Oracles.TextFile import qualified Hadrian.Haskell.Hash +import BindistConfig import Expression import qualified Oracles.Flavour import qualified Oracles.ModuleFiles @@ -32,17 +33,51 @@ import Settings.Program (programContext) import Target import UserSettings --- | This rule defines what the default build configuration is when no targets --- are selected. +-- | This rule calls 'need' on all top-level build targets that Hadrian builds +-- by default, respecting the 'finalStage' flag. topLevelTargets :: Rules () topLevelTargets = action $ do - let targets = ["binary-dist-dir"] + verbosity <- getVerbosity + forM_ [ Stage1, Stage2, Stage3] $ \stage -> do + when (verbosity >= Verbose) $ do + (libraries, programs) <- partition isLibrary <$> stagePackages stage + libNames <- mapM (name stage) libraries + pgmNames <- mapM (name stage) programs + let stageHeader t ps = + "| Building " ++ show stage ++ " " + ++ t ++ ": " ++ intercalate ", " ps + putInfo . unlines $ + [ stageHeader "libraries" libNames + , stageHeader "programs" pgmNames ] + let buildStages = [ s | s <- allStages, s < finalStage ] + targets <- concatForM buildStages $ \stage -> do + packages <- stagePackages stage + mapM (path stage) packages + + -- For cross compilers, also build the target (stage 2) libraries. They + -- are built by and ship with the executable_stage compiler, so include + -- them iff that compiler is built. + cfg <- implicitBindistConfig + lib_targets <- if executable_stage cfg < finalStage + then map snd . fst <$> Rules.BinaryDist.bindistPackageTargets cfg + else return [] -- Why we need wrappers: https://gitlab.haskell.org/ghc/ghc/issues/16534. root <- buildRoot let wrappers = [ root -/- ("ghc-" ++ stageString s) | s <- [Stage1, Stage2, Stage3] , s < finalStage ] - need (targets ++ wrappers) + need (targets ++ lib_targets ++ wrappers) + where + -- either the package database config file for libraries or + -- the programPath for programs. However this still does + -- not support multiple targets, where a cabal package has + -- a library /and/ a program. + path :: Stage -> Package -> Action FilePath + path stage pkg | isLibrary pkg = pkgConfFile (vanillaContext stage pkg) + | otherwise = programPath =<< programContext stage pkg + name :: Stage -> Package -> Action String + name stage pkg | isLibrary pkg = return (pkgName pkg) + | otherwise = programName (vanillaContext stage pkg) -- | Return the list of targets associated with a given 'Stage' and 'Package'. packageTargets :: Stage -> Package -> Action [FilePath] ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -124,11 +124,8 @@ installTo relocatable prefix = do runBuilderWithCmdOptions env (Make bindistFilesDir) ["install"] [] [] -buildBinDistDir :: FilePath -> BindistConfig -> Action () -buildBinDistDir root conf@BindistConfig{..} = do - - verbosity <- getVerbosity - -- We 'need' all binaries and libraries +bindistPackageTargets :: BindistConfig -> Action ([(Package, FilePath)], [(Package, FilePath)]) +bindistPackageTargets conf@BindistConfig{..} = do lib_pkgs <- stagePackages library_stage (lib_targets, _) <- partitionEithers <$> mapM (pkgTarget conf) lib_pkgs @@ -137,6 +134,14 @@ buildBinDistDir root conf@BindistConfig{..} = do let excluded_packages = [ genapply ] bin_pkgs = filter (`notElem` excluded_packages) bin_pkgs_all (_, bin_targets) <- partitionEithers <$> mapM (pkgTarget conf) bin_pkgs + return (lib_targets, bin_targets) + +buildBinDistDir :: FilePath -> BindistConfig -> Action () +buildBinDistDir root conf@BindistConfig{..} = do + + verbosity <- getVerbosity + -- We 'need' all binaries and libraries + (lib_targets, bin_targets) <- bindistPackageTargets conf when (verbosity >= Verbose) $ do let libNames = map (pkgName . fst) lib_targets View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/67c03eb2c762fdfeb646eb83453411… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/67c03eb2c762fdfeb646eb83453411… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/torsten.schmits/mwb-26-01/fixed] WIP Make extra_decls lazy when loading from Binary
by Torsten Schmits (＠torsten.schmits) 09 Jul '26

09 Jul '26

Torsten Schmits pushed to branch wip/torsten.schmits/mwb-26-01/fixed at Glasgow Haskell Compiler / GHC Commits: 281c2e90 by Torsten Schmits at 2026-07-09T15:17:22+02:00 WIP Make extra_decls lazy when loading from Binary - - - - - 1 changed file: - compiler/GHC/Unit/Module/ModIface.hs Changes: ===================================== compiler/GHC/Unit/Module/ModIface.hs ===================================== @@ -503,7 +503,7 @@ instance Binary ModIface where lazyPut bh warns lazyPut bh anns put_ bh decls - put_ bh extra_decls + lazyPut bh extra_decls put_ bh foreign_ put_ bh insts put_ bh fam_insts @@ -536,7 +536,7 @@ instance Binary ModIface where warns <- {-# SCC "bin_warns" #-} lazyGet bh anns <- {-# SCC "bin_anns" #-} lazyGet bh decls <- {-# SCC "bin_tycldecls" #-} get bh - extra_decls <- get bh + extra_decls <- lazyGet bh foreign_ <- get bh insts <- {-# SCC "bin_insts" #-} get bh fam_insts <- {-# SCC "bin_fam_insts" #-} get bh View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/281c2e90674cfa2eba70bc6a7bb82c7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/281c2e90674cfa2eba70bc6a7bb82c7… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/torsten.schmits/mwb-26-01/fixed] 10 commits: Division by constants optimization
by Torsten Schmits (＠torsten.schmits) 09 Jul '26

09 Jul '26

Torsten Schmits pushed to branch wip/torsten.schmits/mwb-26-01/fixed at Glasgow Haskell Compiler / GHC Commits: ca27a516 by Jannis at 2026-07-08T18:21:35+02:00 Division by constants optimization - - - - - 1f32959f by Rodrigo Mesquita at 2026-07-08T18:21:35+02:00 determinism: Sampling uniques in the CG To achieve object determinism, the passes processing Cmm and the rest of the code generation pipeline musn't create new uniques which are non-deterministic. This commit changes occurrences of non-deterministic unique sampling within these code generation passes by a deterministic unique sampling strategy by propagating and threading through a deterministic incrementing counter in them. The threading is done implicitly with `UniqDSM` and `UniqDSMT`. Secondly, the `DUniqSupply` used to run a `UniqDSM` must be threaded through all passes to guarantee uniques in different passes are unique amongst them altogether. Specifically, the same `DUniqSupply` must be threaded through the CG Streaming pipeline, starting with Driver.Main calling `StgToCmm.codeGen`, `cmmPipeline`, `cmmToRawCmm`, and `codeOutput` in sequence. To thread resources through the `Stream` abstraction, we use the `UniqDSMT` transformer on top of `IO` as the Monad underlying the Stream. `UniqDSMT` will thread the `DUniqSupply` through every pass applied to the `Stream`, for every element. We use @type CgStream = Stream (UniqDSMT IO)@ for the Stream used in code generation which that carries through the deterministic unique supply. See Note [Deterministic Uniques in the CG] - - - - - 7e331c4a by Rodrigo Mesquita at 2026-07-08T18:21:35+02:00 determinism: DCmmGroup vs CmmGroup Part of our strategy in producing deterministic objects, namely, renaming all Cmm uniques in order, depend on the object code produced having a deterministic order (say, A_closure always comes before B_closure). However, the use of LabelMaps in the Cmm representation invalidated this requirement because the LabelMaps elements would already be in a non-deterministic order (due to the original uniques), and the renaming in sequence wouldn't work because of that non-deterministic order. Therefore, we now start off with lists in CmmGroup (which preserve the original order), and convert them into LabelMaps (for performance in the code generator) after the uniques of the list elements have been renamed. See Note [DCmmGroup vs CmmGroup or: Deterministic Info Tables] and #12935. Co-authored-by: Matthew Pickering <matthewtpickering(a)gmail.com> - - - - - 20fc7733 by Rodrigo Mesquita at 2026-07-08T18:21:35+02:00 determinism: Cmm unique renaming pass To achieve object determinism, we need to prevent the non-deterministic uniques from leaking into the object code. We can do this by deterministically renaming the non-external uniques in the Cmm groups that are yielded right after StgToCmm. The key to deterministic renaming is observing that the order of declarations, instructions, and data in the Cmm groups are already deterministic (modulo other determinism bugs), regardless of the uniques. We traverse the Cmm AST in this deterministic order and rename the uniques, incrementally, in the order they are found, thus making them deterministic. This renaming is guarded by -fobject-determinism which is disabled by default for now. This is one of the key passes for object determinism. Read about the overview of object determinism and a more detailed explanation of this pass in: * Note [Object determinism] * Note [Renaming uniques deterministically] Significantly closes the gap to #12935 - - - - - aad980e3 by Ben Gamari at 2026-07-08T18:21:35+02:00 Revert "Division by constants optimization" This appears to be responsible for the regression described in #25653. This reverts commit daff1e30219d136977c71f42e82ccc58c9013cfb. - - - - - 84a4b44d by Rodrigo Mesquita at 2026-07-08T18:21:35+02:00 hi: Stable sort avails Sorting the Avails in DocStructures is required to produce fully deterministic interface files in presence of re-exported modules. Fixes #25104 - - - - - d0a4ba37 by Ian-Woo Kim at 2026-07-08T18:21:35+02:00 determinism: Interface re-export list det In 'DocStructureItem' we want to make sure the 'Avails' are sorted, for interface file determinism. This commit introduces 'DetOrdAvails', a newtype that should only be constructed by sorting Avails with 'sortAvails' unless the avails are known to be deterministically ordered. This newtype is used by 'DocStructureItem' where 'Avails' was previously used to ensure the list of avails is deterministically sorted by construction. Note: Even though we order the constructors and avails in the interface file, the order of constructors in the haddock output is still determined from the order of declaration in the source. This was also true before, when the list of constructors in the interface file <docs> section was non-deterministic. Some haddock tests such as "ConstructorArgs" observe this (check the order of constructors in out/ConstructorArgs.html vs src/ConstructorArgs.hs vs its interface file) The updated tests are caused by haddock corners where the order in the source is not preserved (and was non-deterministic before this PR): * Module header in the latex backend * Re-export of pattern synonyms associated to a datatype (#25342) Fixes #25304 authored by Rodrigo Mesquita - - - - - f3a0e2f2 by Ian-Woo Kim at 2026-07-08T18:21:35+02:00 WIP: determinism: sort dependent file - sort on dependent_files - sort on fingerprint for usage - - - - - d4300dd3 by Matthew Pickering at 2026-07-08T18:21:35+02:00 determinism: Use deterministic map for Strings in TyLitMap When generating typeable evidence the types we need evidence for all cached in a TypeMap, the order terms are retrieved from a type map determines the order the bindings appear in the program. A TypeMap is quite diligent to use deterministic maps, apart from in the TyLitMap, which uses a UniqFM for storing strings, whose ordering depends on the Unique of the FastString. This can cause non-deterministic .hi and .o files. Fixes #26846 - - - - - e8bf7fae by Matthew Pickering at 2026-07-08T18:21:35+02:00 determinism: Use a stable sort in WithHsDocIdentifiers binary instance `WithHsDocIdentifiers` is defined as ``` 71 data WithHsDocIdentifiers a pass = WithHsDocIdentifiers 72 { hsDocString :: !a 73 , hsDocIdentifiers :: ![Located (IdP pass)] 74 } ``` This list of names is populated from `rnHsDocIdentifiers`, which calls `lookupGRE`, which calls `lookupOccEnv_AllNameSpaces`, which calls `nonDetEltsUFM` and returns the results in an order depending on uniques. Sorting the list with a stable sort before returning the interface makes the output deterministic and follows the approach taken by other fields in `Docs`. Fixes #26858 - - - - - 82 changed files: - .gitlab/ci.sh - compiler/GHC/Cmm.hs - compiler/GHC/Cmm/BlockId.hs - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/Cmm/Dataflow.hs - compiler/GHC/Cmm/Dataflow/Graph.hs - compiler/GHC/Cmm/Graph.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/LayoutStack.hs - compiler/GHC/Cmm/Opt.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/ProcPoint.hs - compiler/GHC/Cmm/Reducibility.hs - compiler/GHC/Cmm/Sink.hs - compiler/GHC/Cmm/Switch.hs - compiler/GHC/Cmm/Switch/Implement.hs - compiler/GHC/Cmm/ThreadSanitizer.hs - + compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToAsm.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/CmmToAsm/Dwarf.hs - compiler/GHC/CmmToAsm/Monad.hs - compiler/GHC/CmmToAsm/PPC/Instr.hs - compiler/GHC/CmmToAsm/Reg/Graph.hs - compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Linear/Base.hs - compiler/GHC/CmmToAsm/Reg/Linear/State.hs - compiler/GHC/CmmToAsm/Reg/Liveness.hs - compiler/GHC/CmmToAsm/Wasm.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToAsm/Wasm/Types.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToLlvm.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core/Map/Type.hs - compiler/GHC/Data/Graph/Collapse.hs - compiler/GHC/Data/Stream.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Config/Cmm.hs - compiler/GHC/Driver/Config/StgToCmm.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/GenerateCgIPEStub.hs - compiler/GHC/Driver/Hooks.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Doc.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/StgToCmm.hs - compiler/GHC/StgToCmm/CgUtils.hs - compiler/GHC/StgToCmm/Config.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Foreign.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToCmm/Types.hs - compiler/GHC/Types/Avail.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DFM.hs - + compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/Supply.hs - compiler/GHC/Utils/Monad/State/Strict.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Wasm/ControlFlow/FromCmm.hs - compiler/ghc.cabal.in - docs/users_guide/using-optimisation.rst - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/numeric/should_run/all.T - testsuite/tests/regalloc/regalloc_unit_tests.hs - testsuite/tests/showIface/DocsInHiFileTH.stdout - testsuite/tests/showIface/HaddockIssue849.stdout - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/wasm/should_run/control-flow/LoadCmmGroup.hs - testsuite/tests/wasm/should_run/control-flow/WasmControlFlow.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5f161598778815aa7bfdc48ce2490e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5f161598778815aa7bfdc48ce2490e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/ghc-9-14-building-base] Add CI job `base-build-with-released-ghcs`
by Wolfgang Jeltsch (＠jeltsch) 09 Jul '26

09 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/ghc-9-14-building-base at Glasgow Haskell Compiler / GHC Commits: fe794a88 by Wolfgang Jeltsch at 2026-07-09T14:41:14+03:00 Add CI job `base-build-with-released-ghcs` - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -65,7 +65,7 @@ stages: - quick-build # A very quick smoke-test to weed out broken commits - full-build # Build all the things - packaging # Source distribution, etc. - - testing # head.hackage correctness and compiler performance testing + - testing # Various tests - deploy # push documentation # Note [The CI Story] @@ -1142,6 +1142,48 @@ ghc-wasm-meta-unreg: UPSTREAM_GHC_FLAVOUR: unreg UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf +############################################################ +# Building `base` with released GHC versions +############################################################ + +base-build-with-released-ghcs: + stage: testing + needs: + - job: x86_64-linux-deb13-validate + optional: true + - job: nightly-x86_64-linux-deb13-validate + optional: true + - job: release-x86_64-linux-deb13-release + optional: true + dependencies: null + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV" + tags: + - x86_64-linux + script: + - | + # The GHC versions to build `base` with are specified below as a + # whitespace-separated list between apostrophes. + ghc_versions='9.14.1' + sed -E -e 's/^( *ghc-internal) *==.*(,|$)/\1\2/' \ + < libraries/base/base.cabal.in \ + > libraries/base/base.cabal + for ghc_version in ${ghc_versions} + do + url=https://downloads.haskell.org/~ghc/${ghc_version}/ghc-${ghc_version}-x8… + curl "$url" >ghc-${ghc_version}.tar.xz + tar -xJf ghc-${ghc_version}.tar.xz + cd ghc-${ghc_version}-x86_64-unknown-linux + ./configure --prefix "$PWD/../ghc-${ghc_version}-installed" + make install + cd ../libraries/base + cabal build --with-compiler ../../ghc-${ghc_version}-installed/bin/ghc \ + --allow-boot-library-installs \ + -O0 + cd .. + done + rules: + - *full-ci + ############################################################ # Documentation deployment via GitLab Pages ############################################################ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fe794a88a260122e3652b3a571a156e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fe794a88a260122e3652b3a571a156e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/ghc-9-14-building-base] 67 commits: Tweak mk_mod_usage_info
by Wolfgang Jeltsch (＠jeltsch) 09 Jul '26

09 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/ghc-9-14-building-base at Glasgow Haskell Compiler / GHC Commits: 3b15ff03 by Simon Jakobi at 2026-06-27T18:48:34+02:00 Tweak mk_mod_usage_info * Use O(log n) `elemModuleEnv` instead of O(n) `elem` to filter the direct imports. * Use `nonDetModuleEnvKeys` to avoid sorting the ent_map keys twice. * Prepend the presumably shorter list when creating all_mods with `(++)`. Actually this eliminates the `(++)` entirely, as it seems to fuse with the `filter` expression. As a result there is a tiny speed-up when generating the .hi-files for modules with many imports. None of the changes affect compilation determinism as the module list is explicitly sorted to ensure a canonical order. - - - - - 2d0fd154 by Alan Zimmerman at 2026-06-29T11:44:00-04:00 EPA: Remove LocatedC / SrcSpanAnnC This is part of a cleanup of the zoo of SrcSpanAnnXXX types for exact print annotations. This one removes SrcSpanAnnC used for storing exact print annotations for contexts. It replaces it with an explicit `HsContext` data type that carries the annotations and the context. So, replace type HsContext pass = [LHsType pass] with type HsContext pass = HsContextDetails pass (LHsType pass) data HsContextDetails pass arg = HsContext { hsc_ext :: !(XHsContext pass) , hsc_ctxt :: [arg] } | XHsContextDetails !(XXHsContextDetails pass) We need the parameterised HsContextDetails because it is used both for HsQual carrying 'LHsExpr p' and "normal" contexts carrying 'LHsType p'. - - - - - cca0d589 by Luite Stegeman at 2026-06-30T13:33:40-04:00 rts: handle large AP closures in compacting GC The function update_fwd_large in the compacting GC could run into an unexpected object with the following error: internal error: update_fwd_large: unknown/strange object 24 Closure type 24 is the AP closure, which was not handled in upd_fwd_large. This patch adds handling them. fixes #27434 - - - - - 42935858 by Luite Stegeman at 2026-06-30T13:33:40-04:00 testsuite: use compacting_gc way instead of hardcoding +RTS -c - - - - - bf7b5ce6 by Alan Zimmerman at 2026-06-30T13:34:23-04:00 EPA: Remove LocatedLW from LStmtLR HsDo already had its XDo extension point for an AnnList, which also appeared in LocatedLW. So we remove the redundant one and use the one inside HsDo as originally intended. Also delete LocatedLC/LocatedLS as they were unused - - - - - d7cfea49 by Recursion Ninja at 2026-06-30T21:37:12-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Fixes #26953 - - - - - a1f2558b by Recursion Ninja at 2026-06-30T21:37:12-04:00 Monomorphising GHC pass parameters where appropriate - - - - - 7bf9e3c5 by Teo Camarasu at 2026-06-30T21:38:03-04:00 Make Q abstract This patch aims to clearly demarcate the internal and external interfaces of Q. In the past the `Quasi` typeclass was both part of the external, public-facing interface, and was used to give the implementation of `Q`. Now we separate out these two distinct roles. `Quasi` continues to exist in the public interface, but we introduce a new `MetaHandlers` type, which is equivalent to `Dict Quasi`. `Q a` is now defined to be `MetaHandlers -> IO a`, and, crucially, the constructor and the new `MetaHandlers` type are not exposed from the public interface. This gives us the ability to vary the interface on the GHC side without forcing a breaking change on the `template-haskell` side. Similarly `template-haskell` has more freedom to change the `Quasi` typeclass without needing any changes in `lib:ghc`. Implements https://github.com/ghc-proposals/ghc-proposals/pull/700 Resolves #27341 - - - - - 4262af36 by L0neGamer at 2026-06-30T21:38:56-04:00 generically defines mconcat in terms of internal type's Semigroup instance add changelog entry use simpler definition for mconcat `nonEmpty` isn't available yet; inline branches in case add test case fixup generically defines mconcat in terms of internal type's Semigroup instance add comment on Generically and deriving mishaps swap mconcat to foldr version add some strictness testing for mconcat add to `base` changelog entry - - - - - e22ad997 by Cheng Shao at 2026-06-30T21:39:43-04:00 hadrian/rts: fix unregisterised build for gcc 15+ This patch fixes unregisterised build for gcc 15+: - Pass -optc-Wno-error in hadrian when +werror enables -optc-Werror, see added comment for details. - For RTS functions that the codegen would emit calls, ensure their real prototype is hidden when the header is included in .hc fies (IN_STG_CODE), and the dummy prototype is provided to match the EFF_ convention. In the future we should get rid of EFF_ (#14647) and remove these hacks, but for now this patch makes unregisterised work again on newer toolchains. Fixes #27404. Co-authored-by: Codex <codex(a)openai.com> - - - - - 3f00f234 by Cheng Shao at 2026-06-30T21:40:32-04:00 compiler: fix missing handling of CmmUnsafeForeignCall node in LayoutStack This patch fixes missing handling of `CmmUnsafeForeignCall` middle node in the `LayoutStack` pass. Before proc-points splitting, this pass computes liveliness of local registers, and spills those alive across a Cmm native call onto the stack. It need to traverse all middle nodes in each block and check whether a local register is an assignee, if so then the previous mapping in `sm_regs` is invalidated and needs to be dropped. However, it didn't handle `CmmUnsafeForeignCall` node which may also assign to a local register. When proc-points splitting is enabled, this can produce an invalid basic block that doesn't properly backup the updated local register to the stack before doing a Cmm call, resulting in completely invalid runtime behavior. The patch also adds a `T27447` regression test. With no-TNTC or with LLVM backend, without the fix the test case would output a stale 0x1111111111111111 value, instead of the expected 0x2222222222222222 output. Fixes #27447. Co-authored-by: Codex <codex(a)openai.com> - - - - - 701088db by Ben Gamari at 2026-07-01T10:34:03-04:00 gitlab-ci: Drop vestigial references to make build system - - - - - 62d54a53 by Ben Gamari at 2026-07-01T10:34:03-04:00 gitlab-ci: Add support for running specifying a job's testsuite ways - - - - - 7f97ac2c by Ben Gamari at 2026-07-01T10:34:03-04:00 gitlab-ci: Run llvm testsuite ways in llvm jobs Addresses #25762. - - - - - 7ea75116 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Add normalise_ddump_deriv setup function Some tests check the result of -ddump-deriv, which may contain INLINE pragmas depending on optimization flags. With normalise_ddump_deriv setup function, INLINE pragmas are stripped off. - - - - - c7a8199f by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Use -dsuppress-idinfo to make tests more robust Previously, T18052a and T21755 were failing on 'optasm' and 'optllvm' ways because of visibility of unfoldings. - - - - - a12122e5 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Use a trick to keep large objects alive Previously, T17574 and T19381 were failing on 'optasm' and 'optllvm' ways because of compiler optimizations. Change them to use NOINLINE to prevent unwanted optimizations. - - - - - 1a95b327 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Only run T24224 in 'normal' way This test is a frontend-only one and breaks if optimizations are enabled. - - - - - 8abea737 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Ignore T18118's stderr When optimizations are enabled, the compiler emits a warning (You cannot SPECIALISE ...). The message is not important, so ignore it. - - - - - 9453a722 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Mark T816 and tc216 broken with optimizations These tests are about type checking, so we should not care too much if they are broken with optimizations. See #26952 - - - - - 0aef9ec0 by Ben Gamari at 2026-07-01T10:34:03-04:00 testsuite: ds014 is not longer broken It now appears to pass in the ways it was marked as broken in. Closes #14901. - - - - - 4692d1e4 by Ben Gamari at 2026-07-01T10:34:03-04:00 testsuite: Only run stack cloning tests in the normal way These are too dependent upon code generation specifics to pass in most other ways. - - - - - c154df26 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Update options_ghc_fbyte-code The `-fbyte-code` option used to be overriden by `-fllvm` but it is no longer true since !14872 was merged. I updated the test to accept the new behavior. Closes #27049 - - - - - 5d8bb7b5 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Only run T22744 in 'normal' way This test takes a long time on optimized ways. - - - - - d1e74c8e by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Disable tests that use -finfo-table-map on llvm ways Currently, -finfo-table-map does not work with -fllvm. See #26435 - - - - - 3bf38c84 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Don't run T24726 on optimized ways If optimizations are enabled, the rewrite rule just fires and -drule-check will report nothing. - - - - - e4eef116 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Use -fno-unoptimized-core-for-interpreter when running LinkableUsage01/02 Optimizations for the bytecode interpreter are considered experimental, and need a flag to be enabled. - - - - - 234a9872 by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Suppress unwanted optimizations on T25284 - - - - - 99a2af2f by ARATA Mizuki at 2026-07-01T10:34:03-04:00 testsuite: Don't run stack_big_ret with optimizations Stack layout may change with optimizations enabled. - - - - - 04c836df by ARATA Mizuki at 2026-07-01T10:34:04-04:00 testsuite: Mark memo001 broken on optimized ways See #27396 - - - - - 1a8a24f4 by ARATA Mizuki at 2026-07-01T10:34:04-04:00 testsuite: Mark syn-perf broken on optimized ways See #27398 - - - - - 40412093 by Duncan Coutts at 2026-07-01T10:34:50-04:00 Add a test for thread scheduler fairness It also tests that the interval timer and context switching works. We also test that fairness is lost when the context switching interval is too coarse for the duration of the test. We add this test before doing surgery on the interval timer, so we have decent coverage. - - - - - 3f34d557 by Duncan Coutts at 2026-07-01T10:34:50-04:00 Make exported stop/startTimer no-ops, and rename internal functions Specifically, internally rename: stop/startTimer to pause/unpauseTimer stop/startTicker to pause/unpauseTicker and keep stop/startTimer as exported functions, but now as no-ops. In the past the stop/startTicker actions were used incorrectly as if they were synchronous, which they are not. See issue #27105. We now document pause/unpackTicker as being async and not to be used for the purpose of concurrency safety. The existing stop/startTimer (note Timer not Ticker, the Timer calls the Ticker!) are also exported from the RTS as a public API. This was historically because the ticker used signals and it was important to suspend the timer signel over a process fork. So these functions were exported to be used by the process and unix libraries. We cannot just remove the RTS exports, but we now make them no-ops, and they can be removed from the process and unix library later. This was already documented in a changelog.d entry no-more-timer-signal but due to changes during the MR process the change to make stop/startTicker into no-ops didn't make it into the earlier MR. - - - - - 02e84e5f by Duncan Coutts at 2026-07-01T10:34:51-04:00 Make exitTicker/exitTimer unconditionally synchronous We never use them asynchronously, and we should never need to do so. And update some related comments. - - - - - 13db6a72 by Duncan Coutts at 2026-07-01T10:34:51-04:00 posix ticker: update and improve comments on (un)pause and exit Clarify what is async vs sync. - - - - - 43d9a07d by Duncan Coutts at 2026-07-01T10:34:51-04:00 posix ticker: split out ppoll/select helper functions Move the #ifdefs out of the main code body by introducing local helper functions and types, which themselves have two implementations (with a common API) based on ppoll or select. This helps improve clarity/readability. - - - - - a5491baa by Duncan Coutts at 2026-07-01T10:34:51-04:00 posix ticker: improve the implementation The existing implementation supported pausing and exiting, with the implementation of pausing reling on a mutex and condition variable. It needed to check the pause and stop shared variables on every iteration. It relies on ppoll or select, to wait on the timeout and also wait on an interrupt fd. The interrupt fd was only used for prompt exit/shutdown, and not for pausing or other notification. The pause only needed a lock and a memory operation, but the pause was not prompt. The resume used a lock, and signaling a cond var. The new implementation uses a somewhat more regular design: every notification is done by setting a shared variable and interrupting/notifying the ticker via the fd. The ticker thread does not need to check any shared variables on normal timer expiry, only when it recevies notification. This may be a micro-optimisation, but the tick occurs 100 times a second by default so any improvements in the hot path are amplified. When the ticker thread does receive notification it can check the various shared variables and update its local state. The blocking relies on using ppoll/select but without a timeout. This avoids the condition var and also allows further notifications when paused (also used for unpausing). This design can be extended with further notification types if needed by using and checking further shared vars (or making existing shared vars an enum or counter). This may be used in future for additional notifications to the ticker thread. This will likely be used to proxy wakeUpRts from a single handler context for example. And this approach, avoiding mutexes, is compatible with use from signal handlers. So overall, it's: * slightly simpler / more regular; * easier to extend with additional notifications; * probably slightly more efficient (but a micro-optimisation); * and supports calling notification from signal handlers - - - - - 5b20821e by Duncan Coutts at 2026-07-01T10:34:51-04:00 posix ticker: further minor local renaming for code clarity Improve the clarity with better choice of names for several local vars and function. - - - - - 1f3ec5e0 by Duncan Coutts at 2026-07-01T10:34:51-04:00 win32 ticker: split out local helper functions - - - - - 596e7307 by Duncan Coutts at 2026-07-01T10:34:51-04:00 win32 ticker: provide guarantee about concurrency and idempotency Use a lock to ensure pause/unpause can be used concurrently. Use a paused variable, protected by the lock, to ensure that pause and unpause are both idempotent. This is what the portable API expects. - - - - - 1870edd7 by Duncan Coutts at 2026-07-01T10:34:51-04:00 win32 ticker: make the initial tick be after one wait interval There is no need to tick immediately. This is consistent with the posix implementation. - - - - - 7c15ab5b by Duncan Coutts at 2026-07-01T10:34:51-04:00 ticker: remove now-unnecessary layer of enable/disable There was an atomic variable used to block *part* of the actions of the tick handler. This still did not make stopTimer synchronous, even for the part of the the handle_tick actions it covered. It also added a more expensive (sequentuially consistent) atomic operation in the hot path for the handle_tick action, whereas our new design requires no atomic ops at all. Now that we have eliminate the need for synchronous stop/startTicker, we don't need this not-quite-working-anyway atomic protocol. The new pause/unpauseTicker is explicitly asynchronous and idempotent. - - - - - 8585f8cb by Duncan Coutts at 2026-07-01T10:34:51-04:00 ticker: add TODOs about issue #27250: too much being done from handle_tick The handle_tick should not perform I/O, block, perform long-running operations or call arbitrary user code. Unfortunately, everything to do with the eventlog (at the moment) falls into all those categories. - - - - - 6e381626 by Duncan Coutts at 2026-07-01T22:29:55+01:00 Adjust releaseCapability_ precondition to allow cap->running_task == NULL There are two use cases for releaseCapability_: 1. The current Task (cap->running_task) releases the Capability. The Capability is marked free, and if there is any work to do, an appropriate Task is woken up. 2. There is no current task (cap->task == NULL), and thus the Capability is idle, and we want to wake up an idle Task to animate the Capability. This case uses always_wakeup. Currently, the precondition for releaseCapability_ is cap->running_task != NULL and so the 2nd use cases have to set cap->running_task (which is then immediately overwritten) just to satisfy the precondition. See the use cases in sendMessage and prodCapability. So we can relax the precondition to be: cap->running_task != NULL || always_wakeup so that in the always_wakeup case, we say it is ok for the cap->running_task to be NULL. This lets us simplify sendMessage and prodCapability. In particular it will allow prodCapability to not need a Task parameter. The ulterior motive for all this is that I want to be able to call prodCapability from an OS thread that is not itself a Task, in persuit of issue #27086: disentangle I/O managers from wakeUpRts. The most straightforward way to wake the RTS is using prodCapability, but the context in which we will need to do that are threads that are not Tasks. - - - - - 89404ebc by Duncan Coutts at 2026-07-01T22:29:55+01:00 prodCapability no longer needs to take a Task param Now that releaseCapability_ can accept cap->running_task == NULL then it is no longer necessary for prodCapability to require a Task. - - - - - 4e60c5f6 by Duncan Coutts at 2026-07-01T22:29:56+01:00 Define prodOneCapability There was an existing declaration for this in the header file, but no definition. Similarly, there is a declaration for prodAllCapabilities but no definition, and we don't need it, so remove the declaration. - - - - - 2527026f by Duncan Coutts at 2026-07-01T22:29:56+01:00 Add a wakeUpRtsViaTicker feature to the posix ticker It proxies a call to wakeUpRts, but crucially, this can be called from a signal handler context. It will be used for ctl-c handling. - - - - - aa5a03a5 by Duncan Coutts at 2026-07-01T22:29:56+01:00 Change how wakeUpRts works Previously it would call wakeupIOManager to get a capability to wake up and run. This works but it entangles the I/O managers with unrelated features: ctl-c handling and idle gc (the two features that use wakeUpRts). The reason it used wakeupIOManager is that this action is safe to use from a posix signal handler, since it just posts bytes to a pipe. Otherwise the more direct approach (used e.g. by sendMessage when the target capability is idle) is to use releaseCapability. But that uses condition variables and mutexes, which are not safe to use from within a signal handler. So instead of entangling the (multiple) I/O managers with this, we make wakeUpRts use the direct approach (using prodOneCapability). On win32 the ctl-c console handler can call wakeUpRts directly, since it is called in a proper thread. On posix, to deal with the signal handler problem, we make the signal handler ask the ticker thread to proxy the call to wakeUpRts, since the ticker thread is also a proper thread. This will allow the I/O managers to no longer be concerned with this. This is good because there are many I/O managers (and they're complicated), but there is (on posix) only one ticker implementation. So this is an overall reduction in coupling and complexity. Fixes issue #27086 - - - - - c6d53c16 by sheaf at 2026-07-02T21:35:44-04:00 Test driver: normalise line numbers into libraries When comparing the stdout of tests that print out callstacks, we can't rely on the stability of exact line:column spans pointing into libraries (e.g. ghc-internal), as any change (such as adding a comment) can change them. This commit addresses this by normalising away line:column in callstacks, but only when those point into internal libraries. We don't do this in general, as the exact span might be important to the test (e.g. for a span within the test module itself). Fixes #27387 - - - - - 81ee62e0 by Alan Zimmerman at 2026-07-02T21:36:33-04:00 EPA: Remove LocatedLW from MatchGroup This is the last usage of LocatedLW / SrcSpanAnnLW - - - - - 925959db by Recursion Ninja at 2026-07-04T04:14:12-04:00 Decoupling 'L.H.S' from 'GHC.Hs.Doc' * Migrated 'GHC.Hs.Doc' and 'GHC.Hs.DocString' AST defintions from 'GHC.*' namespace, to new 'Language.Haskell.Syntax.Doc' module in the 'L.H.S' "namespace." * Updated 'HsDocString to be TTG-parameterised as 'HsDocString pass'. * Added 'GHC.Hs.Extension.Pass': splits 'GhcPass'/'Pass' and all 'HsDocString' TTG instances out of 'GHC.Hs.Extension', which re-exports it unchanged (this is backwards compatible and prevents the introduction of a boot file). * Deleted 'GHC.Hs.Doc.hs-boot'; removed all 'L.H.S.*' imports of 'GHC.Hs.Doc'. * Updated 'GHC.Hs.DocString' to be TTG pass-parameterised throughout; moved 'mkHsDocStringChunk'/'unpackHDSC' here (require 'GHC.Utils.Encoding'). * Split 'GHC.Rename.Doc.rnHsDoc' from 'rnHsDocIdentifiersOnly'. * Updated parser, renamer, typechecker, HIE, and exact-print for new types. * Added 'HsDocString' TTG instances for 'DocNameI' to 'Haddock.Types'. * Killed the last module loop between GHC.* and LHS.*. - Only edges from LHS.* to GHC.Data.FastString now! Resolves #26971 - - - - - b7e24044 by mangoiv at 2026-07-04T04:14:56-04:00 ci: retry fetching test metrics Retry fetching test metrics to make the CI not fail if the services is temporarily unavailable - - - - - 4180af3f by Zubin Duggal at 2026-07-04T04:15:38-04:00 Bump semaphore-compat submodule to 2.0.1 This versions includes some cruicial fixes for darwin - - - - - 242d4317 by sheaf at 2026-07-04T04:16:19-04:00 Remove outdated comment in GHC.Data.ShortText There was a long comment in GHC.Data.ShortText about a workaround that was necessary when bootstrapping with GHC 9.2 and below. The actual logic has since been dropped, but the comment remained. This commit removes the vestigial comment. - - - - - 9b714c4c by Zubin Duggal at 2026-07-05T09:40:36+05:30 CorePrep: Don't speculatively evaluate bindings that we have already discovered to be absent In #25924, we segfault because speculation forces a projection out of a RUBBISH dictionary (which we generated because it absent). Solution: Don't speculate on bindings we already know are absent. Fixes 25924 - - - - - 4a59b3ee by Zubin Duggal at 2026-07-05T09:40:36+05:30 Don't make absent fillers for terminating types In #25924 we discovered that we could speculatively evaluate an absent filler for a dictionary, and project a field (a superclass selector) out of it, resulting in segfaults. Solution: Never make an absent filler or rubbish literal for a terminating type like a dictionary. mkAbsentFiller returns Nothing for isTerminatingType, so worker/wrapper and the specialiser keep the real argument instead. Some small metric decreases because we do a little less work in the simplifier now. Metric Decrease: T9872a T9872b T9872c TcPlugin_RewritePerf - - - - - 383ddcd4 by Alan Zimmerman at 2026-07-06T07:08:16-04:00 EPA: Move the 'where' annotation for PatSynBind This allows us to move it out of the MatchGroup exact print annotation too - - - - - 66d1a5d5 by fendor at 2026-07-07T16:57:56-04:00 Add 'backendInfoTableMapValidity' backend predicate Check whether the backend supports the `-finfo-table-map` flag and ignore it otherwise. Improve by-design documentation of `backendCodeOutput`. `Backend` is **abstract by design**. Make this clearer in `backendCodeOutput` which is incorrectly being used as a proxy for `Backend`. Instead, define the desired property predicates in GHC.Driver.Backend In the process, make `backendCodeOutput` total. - - - - - 74f1071d by fendor at 2026-07-07T16:57:56-04:00 Add failing test for `-finfo-table-map` and bytecode backend If you compile a module using the bytecode backend, with -finfo-table-map, then the info table map doesn't get populated for the module. This is because the -finfo-table-map code path is implemented mostly in the StgToCmm phase which isn't run when creating bytecode. Ticket #27039 - - - - - 28d63bca by mangoiv at 2026-07-07T16:59:16-04:00 ci: don't fail nightly if there have been no changes that night Fixes #27127 - - - - - 4ebfc478 by Rodrigo Mesquita at 2026-07-08T04:47:53-04:00 ttg: Using ShortText over FastString in the AST To make the AST independent of GHC, this commit replaces usages of `FastString` with `HText` in the AST, killing the last edge from Language.Haskell.* to GHC.* modules. Even though we /do/ want to use FastStrings in general -- critically in Names or Ids -- there is no particular reason for the FastStrings that occur in the AST proper to be FastStrings. Strings in the AST are typically unique and don't benefit particularly from being interned FastStrings with Uniques for fast comparison. `HText` is a type synonym for `ShortText` which uses GHC's Modified UTF-8 encoding exclusively. Modified UTF-8 must be used to represent the Haskell AST because the Haskell Report allows surrogate code points. `Data.Text.Text` functions use Standard UTF-8 which replace surrogates with a placeholder value, thus `Data.Text.Text` is unsuitable for AST strings. See the `Language.Haskell.Syntax.Text` module header for more details. Final progress towards #21592 Closes #21628 - - - - - d910b353 by Simon Peyton Jones at 2026-07-08T04:48:36-04:00 Update equality-type documenation in GHC.Builtin.Types.Prim Fix #27466 - - - - - b2530542 by Simon Peyton Jones at 2026-07-08T04:48:36-04:00 Honour -dsuppress-coercions in GHC.Core.TyCo.pprCo Fixes #27467 - - - - - 9a73179a by Facundo Domínguez at 2026-07-08T04:49:26-04:00 Add item to MR checklist asking to squash fixup commits after approval The checklist has an item that reads All commits are either individually buildable or squashed. This item could be checked immediately after sending the merge request though. If reviewers ask for amends later on, and the author amends the merge request, there was no item that would remind the contributors to squash the fixup commits before landing. This commit adds a new item After all approvals and before landing: all fixup commits are squashed with their originating commits. which should be harder to mark as done before approvals have been given. - - - - - ed09895d by Andreas Klebinger at 2026-07-08T16:53:27-04:00 Fix a profiling race condition resulting in segfaults. StgToCmm: Don't assume tagged FUN closures in closureCodeBody. When entering a closure the self/node pointer might not be tagged in some situations when a thunk is evaluated by multiple threads. So we most AND away the tag bits rather than subtracting an expected tag. Apply.cmm: Fix a race condition occuring when a thunk is mutated during GC. In stg_ap_0_fast when might need to run GC before entering a thunk. If this happens another thread or the GC itself might mutate the closure making entering it no longer valid. We now check for this. Add test and changelog for #27123 fixes. - - - - - 67c03eb2 by Cheng Shao at 2026-07-08T16:54:09-04:00 ghc-heap: fix invalid srtlen returned by peekItbl when no-TNTC This patch fixes the no-TNTC code path of `peekItbl` so that it looks at the right memory address when reading the `srt` field from the `StgInfoTable_` struct. Also adds a `T27465` regression test that reproduces the bug on no-TNTC builds before the fix. Fixes #27465. Co-authored-by: Codex <codex(a)openai.com> - - - - - 04a823e0 by Wolfgang Jeltsch at 2026-07-09T14:37:58+03:00 Add CI job `base-build-with-released-ghcs` - - - - - 294 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/merge_request_templates/Default.md - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - .gitlab/test-metrics.sh - + changelog.d/AbstractQ - + changelog.d/T21628 - + changelog.d/T27123.md - + changelog.d/fix-absent-dict-projection - + changelog.d/fix-compacting-gc-ap-27434 - + changelog.d/fix-layout-stack-fcall - + changelog.d/fix-peekitbl-no-tntc - + changelog.d/fix-unreg - + changelog.d/generically-mconcat - changelog.d/semaphore-v2 - compiler/GHC/Builtin/Types/Prim.hs - compiler/GHC/Builtin/Utils.hs - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/Cmm/LayoutStack.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Opt/WorkWrap/Utils.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/TyCo/Ppr.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Data/FastString.hs - compiler/GHC/Data/IOEnv.hs - compiler/GHC/Data/StringBuffer.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Errors/Ppr.hs - compiler/GHC/Driver/Main/Compile.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Doc.hs - − compiler/GHC/Hs/Doc.hs-boot - compiler/GHC/Hs/DocString.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Extension.hs - + compiler/GHC/Hs/Extension/Pass.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Errors/Types.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Warnings.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Parser/Types.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Doc.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Lit.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToCmm/Bind.hs - compiler/GHC/StgToCmm/Foreign.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/StgToJS/FFI.hs - compiler/GHC/Tc/Deriv.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Deriv/Generics.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Hole.hs - compiler/GHC/Tc/Errors/Hole/FitTypes.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Arrow.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Do.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Match.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Gen/Sig.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Instance/Class.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Validity.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Types/FieldLabel.hs - compiler/GHC/Types/ForeignCall.hs - compiler/GHC/Types/Literal.hs - compiler/GHC/Types/PkgQual.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Unit/Module/Env.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax.hs - compiler/Language/Haskell/Syntax/Basic.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Binds/InlinePragma.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - + compiler/Language/Haskell/Syntax/Doc.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Expr.hs-boot - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/Language/Haskell/Syntax/Module/Name.hs - + compiler/Language/Haskell/Syntax/Text.hs - compiler/Language/Haskell/Syntax/Type.hs - − compiler/Language/Haskell/Syntax/Type.hs-boot - compiler/ghc.cabal.in - hadrian/src/Flavour.hs - hadrian/src/Settings/Warnings.hs - libraries/base/changelog.md - libraries/base/tests/all.T - libraries/ghc-boot/GHC/Data/ShortText.hs - + libraries/ghc-heap/tests/T27465.hs - + libraries/ghc-heap/tests/T27465.stdout - libraries/ghc-heap/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable.hsc - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTableProf.hsc - libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs - libraries/ghc-internal/src/GHC/Internal/TH/Monad.hs - libraries/ghci/GHCi/TH.hs - libraries/semaphore-compat - libraries/template-haskell/Language/Haskell/TH/Syntax.hs - rts/Apply.cmm - rts/Capability.c - rts/Capability.h - rts/Messages.c - rts/RtsStartup.c - rts/Schedule.c - rts/Ticker.h - rts/Timer.c - rts/Timer.h - rts/include/rts/NonMoving.h - rts/include/rts/Timer.h - rts/include/stg/MiscClosures.h - rts/posix/Ticker.c - rts/sm/Compact.c - rts/sm/GC.c - rts/win32/Ticker.c - testsuite/driver/testlib.py - testsuite/tests/arityanal/should_compile/T21755.stderr - testsuite/tests/arityanal/should_compile/all.T - testsuite/tests/bytecode/TLinkable/all.T - testsuite/tests/cmm/should_compile/all.T - + testsuite/tests/cmm/should_run/T27447.hs - + testsuite/tests/cmm/should_run/T27447.stdout - + testsuite/tests/cmm/should_run/T27447_cmm.cmm - testsuite/tests/cmm/should_run/all.T - testsuite/tests/codeGen/should_compile/T25177.stderr - + testsuite/tests/concurrent/should_run/T27105.hs - testsuite/tests/concurrent/should_run/all.T - testsuite/tests/core-to-stg/T25284/Cls.hs - + testsuite/tests/core-to-stg/T25924/B.hs - + testsuite/tests/core-to-stg/T25924/Main.hs - + testsuite/tests/core-to-stg/T25924/all.T - + testsuite/tests/core-to-stg/T25924a.hs - + testsuite/tests/core-to-stg/T25924a.stdout - testsuite/tests/core-to-stg/all.T - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/deSugar/should_fail/all.T - testsuite/tests/deSugar/should_run/all.T - testsuite/tests/deriving/should_compile/all.T - testsuite/tests/dmdanal/should_compile/T18982.stderr - testsuite/tests/driver/options_ghc/Mod_fbyte_code.hs - testsuite/tests/driver/options_ghc/all.T - testsuite/tests/driver/options_ghc/options_ghc_fbyte-code.stderr - testsuite/tests/generics/GenDerivOutput.hs - testsuite/tests/generics/GenDerivOutput1_0.hs - testsuite/tests/generics/GenDerivOutput1_1.hs - testsuite/tests/generics/T10604/T10604_deriving.hs - testsuite/tests/generics/T10604/all.T - + testsuite/tests/generics/T27245.hs - + testsuite/tests/generics/T27245.stdout - testsuite/tests/generics/all.T - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/ghci/scripts/all.T - + testsuite/tests/ghci/scripts/bytecodeIPE.hs - + testsuite/tests/ghci/scripts/bytecodeIPE.script - + testsuite/tests/ghci/scripts/bytecodeIPE.stdout - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - 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/template-haskell-exports.stdout - testsuite/tests/module/mod185.stderr - testsuite/tests/numeric/should_compile/T15547.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T15279.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/parser/should_compile/all.T - + testsuite/tests/parser/should_run/StringStartsWithNull.hs - + testsuite/tests/parser/should_run/StringStartsWithNull.stdout - testsuite/tests/parser/should_run/all.T - testsuite/tests/perf/compiler/all.T - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/printer/T18052a.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - testsuite/tests/printer/all.T - testsuite/tests/profiling/perf/T23103/all.T - testsuite/tests/profiling/should_run/all.T - testsuite/tests/rts/T17574.hs - testsuite/tests/rts/T19381.hs - + testsuite/tests/rts/T27123.hs - + testsuite/tests/rts/T27434.hs - + testsuite/tests/rts/T27434.stdout - testsuite/tests/rts/all.T - testsuite/tests/rts/ipe/T24005/all.T - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/HaddockSpanIssueT24378.stdout - testsuite/tests/showIface/MagicHashInHaddocks.stdout - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/simplCore/should_compile/DataToTagFamilyScrut.stderr - testsuite/tests/simplCore/should_compile/T14978.stdout - testsuite/tests/simplCore/should_compile/T18013.stderr - testsuite/tests/simplCore/should_compile/T24229a.stderr - testsuite/tests/simplCore/should_compile/T24229b.stderr - testsuite/tests/simplCore/should_compile/T26615.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/typecheck/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Utils.hs - utils/check-exact/check-exact.cabal - utils/haddock/haddock-api/haddock-api.cabal - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Interface/RenameType.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/8df967aa4547726dbe068027d9f5f2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8df967aa4547726dbe068027d9f5f2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-cmm-atomic-load-store] compiler: fix miscompiled %load_relaxed, add missing %store_relaxed
by Cheng Shao (＠TerrorJack) 09 Jul '26

09 Jul '26

Cheng Shao pushed to branch wip/fix-cmm-atomic-load-store at Glasgow Haskell Compiler / GHC Commits: 0591305e by Cheng Shao at 2026-07-09T10:10:23+00:00 compiler: fix miscompiled %load_relaxed, add missing %store_relaxed This patch fixes the %load_relaxed cmm primop compilation logic to correctly use relaxed memory ordering, and adds the missing %store_relaxed primop. Parsing logic of %load/%store with explicit ordering is covered in the AtomicFetch test case. Fixes #27483. Co-authored-by: Codex <codex(a)openai.com> - - - - - 4 changed files: - + changelog.d/fix-cmm-atomic-load-store - compiler/GHC/Cmm/Parser.y - testsuite/tests/cmm/should_run/AtomicFetch.hs - testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm Changes: ===================================== changelog.d/fix-cmm-atomic-load-store ===================================== @@ -0,0 +1,4 @@ +section: cmm +synopsis: Fix miscompiled %load_relaxed primop, add missing %store_relaxed +issues: #27483 +mrs: !16320 ===================================== compiler/GHC/Cmm/Parser.y ===================================== @@ -1210,9 +1210,10 @@ callishMachOps platform = listToUFM $ , allWidths "pext" MO_Pext , allWidths "cmpxchg" MO_Cmpxchg , allWidths "xchg" MO_Xchg - , allWidths "load_relaxed" (\w -> MO_AtomicRead w MemOrderAcquire) + , allWidths "load_relaxed" (\w -> MO_AtomicRead w MemOrderRelaxed) , allWidths "load_acquire" (\w -> MO_AtomicRead w MemOrderAcquire) , allWidths "load_seqcst" (\w -> MO_AtomicRead w MemOrderSeqCst) + , allWidths "store_relaxed" (\w -> MO_AtomicWrite w MemOrderRelaxed) , allWidths "store_release" (\w -> MO_AtomicWrite w MemOrderRelease) , allWidths "store_seqcst" (\w -> MO_AtomicWrite w MemOrderSeqCst) , allWidths "fetch_add" (\w -> MO_AtomicRMW w AMO_Add) ===================================== testsuite/tests/cmm/should_run/AtomicFetch.hs ===================================== @@ -6,6 +6,7 @@ -- This is not a test of atomic semantics, -- just checking that GHC can parse %fetch_fooXX +-- and %load/%store with explicit ordering import GHC.Exts import GHC.Int ===================================== testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm ===================================== @@ -2,6 +2,7 @@ // This is not a test of atomic semantics, // just checking that GHC can parse %fetch_fooXX +// and %load/%store with explicit ordering cmm_foo64 (P_ p) { @@ -19,6 +20,10 @@ cmm_foo64 (P_ p) (x) = prim %fetch_xor64(q, 33 :: I64); (x) = prim %fetch_nand64(q, 127 :: I64); (x) = prim %load_seqcst64(q); + prim %store_relaxed64(q, x); + (x) = prim %load_relaxed64(q); + prim %store_release64(q, x); + (x) = prim %load_acquire64(q); return (x); } @@ -38,6 +43,10 @@ cmm_foo32 (P_ p) (x) = prim %fetch_xor32(q, 33 :: I32); (x) = prim %fetch_nand32(q, 127 :: I32); (x) = prim %load_seqcst32(q); + prim %store_relaxed32(q, x); + (x) = prim %load_relaxed32(q); + prim %store_release32(q, x); + (x) = prim %load_acquire32(q); return (x); } @@ -57,6 +66,10 @@ cmm_foo16 (P_ p) (x) = prim %fetch_xor16(q, 33 :: I16); (x) = prim %fetch_nand16(q, 127 :: I16); (x) = prim %load_seqcst16(q); + prim %store_relaxed16(q, x); + (x) = prim %load_relaxed16(q); + prim %store_release16(q, x); + (x) = prim %load_acquire16(q); return (x); } @@ -76,5 +89,9 @@ cmm_foo8 (P_ p) (x) = prim %fetch_xor8(q, 33 :: I8); (x) = prim %fetch_nand8(q, 127 :: I8); (x) = prim %load_seqcst8(q); + prim %store_relaxed8(q, x); + (x) = prim %load_relaxed8(q); + prim %store_release8(q, x); + (x) = prim %load_acquire8(q); return (x); } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0591305e319b4a66e5913a0940e25b1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0591305e319b4a66e5913a0940e25b1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-cmm-atomic-load-store] compiler: fix miscompiled %load_relaxed, add missing %store_relaxed
by Cheng Shao (＠TerrorJack) 09 Jul '26

09 Jul '26

Cheng Shao pushed to branch wip/fix-cmm-atomic-load-store at Glasgow Haskell Compiler / GHC Commits: 7fe71b15 by Cheng Shao at 2026-07-09T10:06:15+00:00 compiler: fix miscompiled %load_relaxed, add missing %store_relaxed This patch fixes the %load_relaxed cmm primop compilation logic to correctly use relaxed memory ordering, and adds the missing %store_relaxed primop. Parsing logic of %load/%store with explicit ordering is covered in the AtomicFetch test case. Fixes #27483. Co-authored-by: Codex <codex(a)openai.com> - - - - - 4 changed files: - + changelog.d/fix-cmm-atomic-load-store - compiler/GHC/Cmm/Parser.y - testsuite/tests/cmm/should_run/AtomicFetch.hs - testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm Changes: ===================================== changelog.d/fix-cmm-atomic-load-store ===================================== @@ -0,0 +1,4 @@ +section: cmm +synopsis: Fix miscompiled %load_relaxed primop, add missing %store_relaxed +issues: #27483 +mrs: !16320 ===================================== compiler/GHC/Cmm/Parser.y ===================================== @@ -1210,9 +1210,10 @@ callishMachOps platform = listToUFM $ , allWidths "pext" MO_Pext , allWidths "cmpxchg" MO_Cmpxchg , allWidths "xchg" MO_Xchg - , allWidths "load_relaxed" (\w -> MO_AtomicRead w MemOrderAcquire) + , allWidths "load_relaxed" (\w -> MO_AtomicRead w MemOrderRelaxed) , allWidths "load_acquire" (\w -> MO_AtomicRead w MemOrderAcquire) , allWidths "load_seqcst" (\w -> MO_AtomicRead w MemOrderSeqCst) + , allWidths "store_relaxed" (\w -> MO_AtomicWrite w MemOrderRelaxed) , allWidths "store_release" (\w -> MO_AtomicWrite w MemOrderRelease) , allWidths "store_seqcst" (\w -> MO_AtomicWrite w MemOrderSeqCst) , allWidths "fetch_add" (\w -> MO_AtomicRMW w AMO_Add) ===================================== testsuite/tests/cmm/should_run/AtomicFetch.hs ===================================== @@ -4,8 +4,9 @@ {-# LANGUAGE UnboxedTuples #-} {-# LANGUAGE UnliftedFFITypes #-} --- This is not a test of atomic semantics, --- just checking that GHC can parse %fetch_fooXX +-- This is not a test of atomic semantics, just checking that GHC can parse +-- %fetch_fooXX and the ordered load/store variants +-- (%load_{relaxed,acquire,seqcst}XX, %store_{relaxed,release,seqcst}XX) import GHC.Exts import GHC.Int ===================================== testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm ===================================== @@ -2,6 +2,7 @@ // This is not a test of atomic semantics, // just checking that GHC can parse %fetch_fooXX +// and %load/%store with explicit ordering cmm_foo64 (P_ p) { @@ -19,6 +20,10 @@ cmm_foo64 (P_ p) (x) = prim %fetch_xor64(q, 33 :: I64); (x) = prim %fetch_nand64(q, 127 :: I64); (x) = prim %load_seqcst64(q); + prim %store_relaxed64(q, x); + (x) = prim %load_relaxed64(q); + prim %store_release64(q, x); + (x) = prim %load_acquire64(q); return (x); } @@ -38,6 +43,10 @@ cmm_foo32 (P_ p) (x) = prim %fetch_xor32(q, 33 :: I32); (x) = prim %fetch_nand32(q, 127 :: I32); (x) = prim %load_seqcst32(q); + prim %store_relaxed32(q, x); + (x) = prim %load_relaxed32(q); + prim %store_release32(q, x); + (x) = prim %load_acquire32(q); return (x); } @@ -57,6 +66,10 @@ cmm_foo16 (P_ p) (x) = prim %fetch_xor16(q, 33 :: I16); (x) = prim %fetch_nand16(q, 127 :: I16); (x) = prim %load_seqcst16(q); + prim %store_relaxed16(q, x); + (x) = prim %load_relaxed16(q); + prim %store_release16(q, x); + (x) = prim %load_acquire16(q); return (x); } @@ -76,5 +89,9 @@ cmm_foo8 (P_ p) (x) = prim %fetch_xor8(q, 33 :: I8); (x) = prim %fetch_nand8(q, 127 :: I8); (x) = prim %load_seqcst8(q); + prim %store_relaxed8(q, x); + (x) = prim %load_relaxed8(q); + prim %store_release8(q, x); + (x) = prim %load_acquire8(q); return (x); } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fe71b1518173d1bc6e92cc4c9202cd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7fe71b1518173d1bc6e92cc4c9202cd… You're receiving this email because of your account on gitlab.haskell.org.

1 0