- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/hsctxt-data-instance
by sheaf (＠sheaf) 05 Jun '26

05 Jun '26

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

1 0

[Git][ghc/ghc][wip/sjakobi/multi-caret] Read related spans from the message class in decorateDiagnostic
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/multi-caret at Glasgow Haskell Compiler / GHC Commits: 3f4a9632 by Simon Jakobi at 2026-06-05T12:35:40+02:00 Read related spans from the message class in decorateDiagnostic The related locations are already carried by the MCDiagnostic message class, so decorateDiagnostic can take them from there rather than via a separate parameter. This removes the redundant argument at the call sites and makes the message class the single source of truth for the related spans. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 2 changed files: - compiler/GHC/Driver/Errors.hs - compiler/GHC/Utils/Logger.hs Changes: ===================================== compiler/GHC/Driver/Errors.hs ===================================== @@ -47,7 +47,7 @@ printMessages logger msg_opts opts = mapM_ (printMessage logger msg_opts opts) . printMessage :: forall a. (Diagnostic a) => Logger -> DiagnosticOpts a -> DiagOpts -> MsgEnvelope a -> IO () printMessage logger msg_opts opts message | log_diags_as_json = do - decorated <- decorateDiagnostic logflags messageClass location relatedSpans doc + decorated <- decorateDiagnostic logflags messageClass location doc let rendered :: String rendered = renderWithContext (log_default_user_context logflags) decorated ===================================== compiler/GHC/Utils/Logger.hs ===================================== @@ -424,8 +424,8 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg MCInfo -> printErrs msg MCFatal -> printErrs msg MCDiagnostic SevIgnore _ _ _ -> pure () -- suppress the message - MCDiagnostic _sev _rea _code relatedSpans -> - decorateDiagnostic logflags msg_class srcSpan relatedSpans msg >>= printErrs + MCDiagnostic{} -> + decorateDiagnostic logflags msg_class srcSpan msg >>= printErrs where printOut = defaultLogActionHPrintDoc logflags False out printErrs = defaultLogActionHPrintDoc logflags False err @@ -465,13 +465,19 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg -- `defaultLogActionWithHandles`) -- -- This story is tracked by #24113. -decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> [SrcSpan] -> SDoc -> IO SDoc -decorateDiagnostic logflags msg_class srcSpan relatedSpans msg = addCaret +decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> SDoc -> IO SDoc +decorateDiagnostic logflags msg_class srcSpan msg = addCaret where -- Pretty print the warning flag, if any (#10752) message :: SDoc message = mkLocMessageWarningGroups (log_show_warn_groups logflags) msg_class srcSpan msg + -- The related locations are carried by the 'MCDiagnostic' message class. + relatedSpans :: [SrcSpan] + relatedSpans = case msg_class of + MCDiagnostic _ _ _ spans -> spans + _ -> [] + -- The primary span is always caret'd, with the related spans drawn as -- additional carets. Dedup so the primary isn't drawn twice when it -- also appears among the related spans. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4a96323f7e2826bc5cc4ccad16730… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4a96323f7e2826bc5cc4ccad16730… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/multi-caret] Centralize primary/caret span merge in decorateDiagnostic
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/multi-caret at Glasgow Haskell Compiler / GHC Commits: 518b59ad by Simon Jakobi at 2026-06-05T12:13:29+02:00 Centralize primary/caret span merge in decorateDiagnostic Move the nub (srcSpan :| relatedSpans) merge inside decorateDiagnostic so callers pass the bare related spans rather than pre-injecting the primary span. This stops passing the primary span twice at each call site and keeps the source span model in one place. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 2 changed files: - compiler/GHC/Driver/Errors.hs - compiler/GHC/Utils/Logger.hs Changes: ===================================== compiler/GHC/Driver/Errors.hs ===================================== @@ -15,7 +15,6 @@ import GHC.Utils.Json import GHC.Utils.Error import GHC.Utils.Outputable import GHC.Utils.Logger -import Data.List.NonEmpty (NonEmpty(..), nub) reportError :: Logger -> NamePprCtx -> DiagOpts -> SrcSpan -> SDoc -> IO () reportError logger nameContext opts span doc = do @@ -48,7 +47,7 @@ printMessages logger msg_opts opts = mapM_ (printMessage logger msg_opts opts) . printMessage :: forall a. (Diagnostic a) => Logger -> DiagnosticOpts a -> DiagOpts -> MsgEnvelope a -> IO () printMessage logger msg_opts opts message | log_diags_as_json = do - decorated <- decorateDiagnostic logflags messageClass location sourceSpans doc + decorated <- decorateDiagnostic logflags messageClass location relatedSpans doc let rendered :: String rendered = renderWithContext (log_default_user_context logflags) decorated @@ -84,9 +83,6 @@ printMessage logger msg_opts opts message relatedSpans :: [SrcSpan] relatedSpans = diagnosticRelatedLocations diagnostic - sourceSpans :: NonEmpty SrcSpan - sourceSpans = nub (location :| relatedSpans) - severity :: Severity severity = errMsgSeverity message ===================================== compiler/GHC/Utils/Logger.hs ===================================== @@ -425,7 +425,7 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg MCFatal -> printErrs msg MCDiagnostic SevIgnore _ _ _ -> pure () -- suppress the message MCDiagnostic _sev _rea _code relatedSpans -> - decorateDiagnostic logflags msg_class srcSpan (nub (srcSpan :| relatedSpans)) msg >>= printErrs + decorateDiagnostic logflags msg_class srcSpan relatedSpans msg >>= printErrs where printOut = defaultLogActionHPrintDoc logflags False out printErrs = defaultLogActionHPrintDoc logflags False err @@ -465,13 +465,20 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg -- `defaultLogActionWithHandles`) -- -- This story is tracked by #24113. -decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> NonEmpty SrcSpan -> SDoc -> IO SDoc -decorateDiagnostic logflags msg_class srcSpan sourceSpans msg = addCaret +decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> [SrcSpan] -> SDoc -> IO SDoc +decorateDiagnostic logflags msg_class srcSpan relatedSpans msg = addCaret where -- Pretty print the warning flag, if any (#10752) message :: SDoc message = mkLocMessageWarningGroups (log_show_warn_groups logflags) msg_class srcSpan msg + -- The primary span is always caret'd, with the related spans drawn as + -- additional carets. Dedup so the primary isn't drawn twice when it + -- also appears among the related spans. + -- See Note [The source span model for diagnostics] in GHC.Types.Error. + sourceSpans :: NonEmpty SrcSpan + sourceSpans = nub (srcSpan :| relatedSpans) + addCaret :: IO SDoc addCaret = do caretDiagnostic <- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/518b59ad457ee71e6d4d5dbbf183d6a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/518b59ad457ee71e6d4d5dbbf183d6a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T26964] Report the module in -fcheck-prim-bounds failures
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T26964 at Glasgow Haskell Compiler / GHC Commits: e35ce402 by Simon Jakobi at 2026-06-05T02:48:49+02:00 Report the module in -fcheck-prim-bounds failures A failing bounds-checked primop now reports the Haskell module being compiled alongside the primop name and access details, e.g. readSmallArray#: array access out of bounds in module Main: index -1 is not within [0, 5). The module string is rendered in StgToCmm from stgToCmmThisModule and passed as an extra argument to the rtsOutOfBoundsAccess and rtsMemcpyRangeOverlap RTS helpers. The DEBUG ASSERT_IN_BOUNDS path in PrimOps.cmm has no user module and passes "<RTS>". Adds a cross-module regression test (T26964Module) asserting the module reported is the one containing the failing primop, not its caller. - - - - - 10 changed files: - compiler/GHC/StgToCmm/Prim.hs - rts/PrimOps.cmm - rts/RtsMessages.c - rts/include/rts/Messages.h - testsuite/tests/codeGen/should_fail/T26964.stderr - + testsuite/tests/codeGen/should_fail/T26964Module.hs - + testsuite/tests/codeGen/should_fail/T26964Module.stderr - + testsuite/tests/codeGen/should_fail/T26964ModuleA.hs - testsuite/tests/codeGen/should_fail/T26964b.stderr - testsuite/tests/codeGen/should_fail/all.T Changes: ===================================== compiler/GHC/StgToCmm/Prim.hs ===================================== @@ -3625,10 +3625,12 @@ emitCheckedMemcpyCall dst src n align = do doCheck platform = do name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName nameLbl <- newStringCLit name + modLbl <- getCurrentModuleCLit overlapCheckFailed <- getCode $ emitCCallNeverReturns [] (mkLblExpr mkMemcpyRangeOverlapLabel) - [ (CmmLit nameLbl, AddrHint) ] + [ (CmmLit nameLbl, AddrHint) + , (CmmLit modLbl, AddrHint) ] emit =<< mkCmmIfThen' rangesOverlap overlapCheckFailed (Just False) where rangesOverlap = (checkDiff dst src `or` checkDiff src dst) `ne` zero @@ -3740,11 +3742,20 @@ whenCheckBounds a = do False -> pure () True -> a +-- | Render the module currently being code-generated as a string literal, for +-- use in @-fcheck-prim-bounds@ failure diagnostics. +getCurrentModuleCLit :: FCode CmmLit +getCurrentModuleCLit = do + mod <- getModuleName + ctx <- getContext + newStringCLit (renderWithContext ctx (ppr mod)) + -- | Emit a call to the RTS @rtsOutOfBoundsAccess@ bounds-check failure -- handler, passing the offending index, the number of accessed elements and -- the array size, so that the runtime can produce an informative error -- message. The name of the offending primop is read from the code generator --- environment (see 'withCurrentPrimOpName'). +-- environment (see 'withCurrentPrimOpName'), and the module being compiled is +-- read from the 'StgToCmmConfig'. emitBoundsCheckFailed :: CmmExpr -- ^ accessed index -> CmmExpr -- ^ number of accessed elements -> CmmExpr -- ^ array size (in elements) @@ -3752,12 +3763,14 @@ emitBoundsCheckFailed :: CmmExpr -- ^ accessed index emitBoundsCheckFailed idx count sz = do name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName nameLbl <- newStringCLit name + modLbl <- getCurrentModuleCLit emitCCallNeverReturns [] (mkLblExpr mkOutOfBoundsAccessLabel) [ (idx, NoHint) , (count, NoHint) , (sz, NoHint) - , (CmmLit nameLbl, AddrHint) ] + , (CmmLit nameLbl, AddrHint) + , (CmmLit modLbl, AddrHint) ] emitBoundsCheck :: CmmExpr -- ^ accessed index -> CmmExpr -- ^ array size (in elements) ===================================== rts/PrimOps.cmm ===================================== @@ -93,7 +93,7 @@ import CLOSURE ghc_hs_iface; // the index reported here may be in bytes. count is 1 since these checks cover // a single access. #define ASSERT_IN_BOUNDS(op, ind, sz) \ - if (ind >= sz) { ccall rtsOutOfBoundsAccess(ind, 1, sz, op); } + if (ind >= sz) { ccall rtsOutOfBoundsAccess(ind, 1, sz, op, "<RTS>"); } #else #define ASSERT_IN_BOUNDS(op, ind, sz) #endif ===================================== rts/RtsMessages.c ===================================== @@ -352,32 +352,31 @@ rtsBadAlignmentBarf(void) } void -rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) +rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op, const char *module) { if (count <= 1) { - errorBelch("%s: array access out of bounds:\n" + errorBelch("%s: array access out of bounds in module %s:\n" " index %" FMT_Int " is not within [0, %" FMT_Word ").\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op, index, size); + op, module, index, size); } else { - errorBelch("%s: array access out of bounds:\n" + errorBelch("%s: array access out of bounds in module %s:\n" " range of %" FMT_Word " elements starting at index %" FMT_Int " is not within [0, %" FMT_Word ").\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op, count, index, size); + op, module, count, index, size); } stg_exit(EXIT_FAILURE); } void -rtsMemcpyRangeOverlap(const char *op) +rtsMemcpyRangeOverlap(const char *op, const char *module) { - errorBelch("%s: overlapping source and destination ranges in a " - "memcpy-using operation.\n" + errorBelch("%s: overlapping source and destination ranges in module %s.\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op); + op, module); stg_exit(EXIT_FAILURE); } ===================================== rts/include/rts/Messages.h ===================================== @@ -108,5 +108,5 @@ extern RtsMsgFunction rtsSysErrorMsgFn; /* Used by code generator */ void rtsBadAlignmentBarf(void) STG_NORETURN; -void rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) STG_NORETURN; -void rtsMemcpyRangeOverlap(const char *op) STG_NORETURN; +void rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op, const char *module) STG_NORETURN; +void rtsMemcpyRangeOverlap(const char *op, const char *module) STG_NORETURN; ===================================== testsuite/tests/codeGen/should_fail/T26964.stderr ===================================== @@ -1,3 +1,3 @@ -readSmallArray#: array access out of bounds: +readSmallArray#: array access out of bounds in module Main: index -1 is not within [0, 5). This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/T26964Module.hs ===================================== @@ -0,0 +1,6 @@ +module Main where + +import T26964ModuleA (bad) + +main :: IO () +main = bad ===================================== testsuite/tests/codeGen/should_fail/T26964Module.stderr ===================================== @@ -0,0 +1,3 @@ +readSmallArray#: array access out of bounds in module T26964ModuleA: + index -1 is not within [0, 5). +This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/T26964ModuleA.hs ===================================== @@ -0,0 +1,17 @@ +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE MagicHash #-} + +-- The failing -fcheck-prim-bounds primop is emitted while code-generating this +-- helper module, so the runtime diagnostic should report T26964ModuleA, not the +-- Main module that merely calls 'bad'. + +module T26964ModuleA (bad) where + +import GHC.Exts +import GHC.IO + +{-# NOINLINE bad #-} +bad :: IO () +bad = IO $ \s0 -> + case newSmallArray# 5# () s0 of + (# s1, marr #) -> readSmallArray# marr (-1#) s1 ===================================== testsuite/tests/codeGen/should_fail/T26964b.stderr ===================================== @@ -1,3 +1,3 @@ -copyMutableByteArray#: array access out of bounds: +copyMutableByteArray#: array access out of bounds in module Main: range of 4 elements starting at index 6 is not within [0, 8). This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/all.T ===================================== @@ -42,3 +42,9 @@ test('T26964', test('T26964b', [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], compile_and_run, ['-fcheck-prim-bounds']) +# T26964Module checks that the reported module is the one containing the failing +# primop (the helper T26964ModuleA), not the Main module that calls it. +test('T26964Module', + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix), + extra_files(['T26964ModuleA.hs'])], + multimod_compile_and_run, ['T26964Module', '-fcheck-prim-bounds']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e35ce4028800b8b7117fa3cbf223ba8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e35ce4028800b8b7117fa3cbf223ba8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][ghc-9.12] 3 commits: release engineering: update sources to make it work at all
by Magnus (＠MangoIV) 05 Jun '26

05 Jun '26

Magnus pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC Commits: 347c77f7 by mangoiv at 2026-06-05T10:19:58+02:00 release engineering: update sources to make it work at all - - - - - 6c4f3d68 by mangoiv at 2026-06-05T10:50:42+02:00 release candidate 9.12.5: set release to no - - - - - a0a26f80 by mangoiv at 2026-06-05T11:01:21+02:00 bootstrap plans: move to proper file name - - - - - 7 changed files: - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/nix/sources.json - .gitlab/rel_eng/nix/sources.nix - .gitlab/rel_eng/upload.sh - configure.ac - hadrian/bootstrap/plan-9_12_5.json → hadrian/bootstrap/plan-9_12_4.json - hadrian/bootstrap/plan-bootstrap-9_12_5.json → hadrian/bootstrap/plan-bootstrap-9_12_4.json Changes: ===================================== .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py ===================================== @@ -3,6 +3,7 @@ from pathlib import Path import subprocess import gitlab import json +import traceback logging.basicConfig(level=logging.INFO) @@ -154,6 +155,7 @@ def fetch_artifacts(release: str, pipeline_id: int, bindist.replace(dest) except Exception as e: logging.error(f'Error fetching job {job.name}: {e}') + traceback.print_exc() pass def main(): ===================================== .gitlab/rel_eng/nix/sources.json ===================================== @@ -1,44 +1,26 @@ { - "binutils-gdb": { - "branch": "master", - "repo": "https://sourceware.org/git/binutils-gdb.git", - "rev": "49c843e6d2d0577200e7c1d2d02855f21a3a9dde", - "type": "git" - }, - "gdb-walkers": { - "branch": "master", - "description": "Bring mdb walkers to gdb, also add other helpful commands.", - "homepage": "", - "owner": "hardenedapple", - "repo": "gdb-walkers", - "rev": "c0701c4c87852bd09e21ca313c48dd4a649cfd0d", - "sha256": "1sd61a90lg8bkddl8lp15qady1wvbjmhjgm0d3lb813nwimlka9y", - "type": "tarball", - "url": "https://github.com/hardenedapple/gdb-walkers/archive/c0701c4c87852bd09e21ca…", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "niv": { "branch": "master", "description": "Easy dependency management for Nix projects", "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", - "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", + "rev": "e9519949d2b39bc9574b10f6ba216d65f014874e", + "sha256": "1mv379lsy030k2kh7000xwxxz4rzqk416yvmccsgsqnczs06r678", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0…", + "url": "https://github.com/nmattia/niv/archive/e9519949d2b39bc9574b10f6ba216d65f014…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { - "branch": "nixos-22.11", + "branch": "nixos-25.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a", - "sha256": "00s89np0sqr3jxxp5h9nrpqy30fy4vsrmis6mmryrrmjqh09lpfv", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "sha256": "0v6bd1xk8a2aal83karlvc853x44dg1n4nk08jg3dajqyy0s98np", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2d10e73416ec1449ef74aeac7faf2cf8c5…", + "url": "https://github.com/NixOS/nixpkgs/archive/ac62194c3917d5f474c1a844b6fd6da2db…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "processor-trace": { @@ -47,22 +29,10 @@ "homepage": "", "owner": "01org", "repo": "processor-trace", - "rev": "c848a85c3104e2f5780741f85de5c9e65476ece2", - "sha256": "1ml8g6pm2brlcqp90yvgc780xf64d6k2km7fiqs88wvhlwsl7vzf", - "type": "tarball", - "url": "https://github.com/01org/processor-trace/archive/c848a85c3104e2f5780741f85d…", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "rr": { - "branch": "master", - "description": "Record and Replay Framework", - "homepage": "http://rr-project.org/", - "owner": "rr-debugger", - "repo": "rr", - "rev": "e77b5f8ca4b360daffd31cf72cb6b093fa9e0b62", - "sha256": "sha256:1gxphqcv1yw2ffmjp0d2cv0mpccr00pf9jhf44rq57jqdsvlfn2c", + "rev": "911e654580e373c5a4d7e30bc84169fc3c50a128", + "sha256": "0fak9f7qh8yszb2wyygzp0j0y0wabf0k673vm4j9cl026h2vpx3z", "type": "tarball", - "url": "https://github.com/rr-debugger/rr/archive/3f87444659d1f063397fabc7791ed3b13…", + "url": "https://github.com/01org/processor-trace/archive/911e654580e373c5a4d7e30bc8…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } ===================================== .gitlab/rel_eng/nix/sources.nix ===================================== @@ -10,33 +10,34 @@ let let name' = sanitizeName name + "-src"; in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; name = name'; } + else + pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; fetch_tarball = pkgs: name: spec: let name' = sanitizeName name + "-src"; in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; fetch_git = name: spec: let ref = - if spec ? ref then spec.ref else + spec.ref or ( if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - submodules = if spec ? submodules then spec.submodules else false; + if spec ? tag then "refs/tags/${spec.tag}" else + abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!" + ); + submodules = spec.submodules or false; submoduleArg = let nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; emptyArgWithWarning = - if submodules == true + if submodules then builtins.trace ( @@ -44,15 +45,15 @@ let + "but your nix's (${builtins.nixVersion}) builtins.fetchGit " + "does not support them" ) - {} - else {}; + { } + else { }; in - if nixSupportsSubmodules - then { inherit submodules; } - else emptyArgWithWarning; + if nixSupportsSubmodules + then { inherit submodules; } + else emptyArgWithWarning; in - builtins.fetchGit - ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); + builtins.fetchGit + ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); fetch_local = spec: spec.path; @@ -86,16 +87,16 @@ let hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; hasThisAsNixpkgsPath = <nixpkgs> == ./.; in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import <nixpkgs> {} - else - abort - '' - Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; + if builtins.hasAttr "nixpkgs" sources + then sourcesNixpkgs + else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then + import <nixpkgs> { } + else + abort + '' + Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; # The actual fetching function. fetch = pkgs: name: spec: @@ -115,13 +116,13 @@ let # the path directly as opposed to the fetched source. replace = name: drv: let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; + saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name; ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; in - if ersatz == "" then drv else - # this turns the string into an actual Nix path (for both absolute and - # relative paths) - if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; + if ersatz == "" then drv else + # this turns the string into an actual Nix path (for both absolute and + # relative paths) + if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; # Ports of functions for older nix versions @@ -132,7 +133,7 @@ let ); # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fece… - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); + range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1); # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fece… stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); @@ -143,43 +144,46 @@ let concatStrings = builtins.concatStringsSep ""; # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d… - optionalAttrs = cond: as: if cond then as else {}; + optionalAttrs = cond: as: if cond then as else { }; # fetchTarball version that is compatible between all the versions of Nix builtins_fetchTarball = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchTarball; in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; + if lessThan nixVersion "1.12" then + fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchTarball attrs; # fetchurl version that is compatible between all the versions of Nix builtins_fetchurl = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchurl; in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; + if lessThan nixVersion "1.12" then + fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchurl attrs; # Create the final "sources" from the config mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; + mapAttrs + ( + name: spec: + if builtins.hasAttr "outPath" spec + then + abort + "The values in sources.json should not have an 'outPath' attribute" + else + spec // { outPath = replace name (fetch config.pkgs name spec); } + ) + config.sources; # The "config" used by the fetchers mkConfig = { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) + , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile) , system ? builtins.currentSystem , pkgs ? mkPkgs sources system }: rec { @@ -191,4 +195,4 @@ let }; in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } +mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); } ===================================== .gitlab/rel_eng/upload.sh ===================================== @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash #! nix-shell -i bash -p moreutils lzip zip lftp gnupg set -Eeuo pipefail ===================================== configure.ac ===================================== @@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.4], [glasgow-ha AC_CONFIG_MACRO_DIRS([m4]) # Set this to YES for a released version, otherwise NO -: ${RELEASE=YES} +: ${RELEASE=NO} # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line # above. If this is not a released version, then we will append the ===================================== hadrian/bootstrap/plan-9_12_5.json → hadrian/bootstrap/plan-9_12_4.json ===================================== ===================================== hadrian/bootstrap/plan-bootstrap-9_12_5.json → hadrian/bootstrap/plan-bootstrap-9_12_4.json ===================================== View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e76917b659dc5d8cd16d319b066ab6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e76917b659dc5d8cd16d319b066ab6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: Deduplicate --only test names
by Marge Bot (＠marge-bot) 05 Jun '26

05 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 18f6138a by Simon Jakobi at 2026-06-04T20:20:31-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 1 changed file: - testsuite/driver/runtests.py Changes: ===================================== testsuite/driver/runtests.py ===================================== @@ -133,7 +133,7 @@ if args.unexpected_output_dir: config.unexpected_output_dir = Path(args.unexpected_output_dir) if args.only: - config.only = args.only + config.only = set(args.only) config.run_only_some_tests = True if args.skip: View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18f6138a01d73807afe9a09c5464a44… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18f6138a01d73807afe9a09c5464a44… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Hadrian: convert env variable ACLOCAL_PATH to unix paths.
by Marge Bot (＠marge-bot) 05 Jun '26

05 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a3b431f3 by David Eichmann at 2026-06-04T10:10:19+00:00 Hadrian: convert env variable ACLOCAL_PATH to unix paths. Convert ACLOCAL_PATH to a unix style path when invoking autoreconf. Autoreconf doesn't handle windows paths. See Note [Autoreconf unix paths from ACLOCAL_PATH]. Fixes #27311 - - - - - 3 changed files: - boot - hadrian/src/Hadrian/Oracles/Path.hs - hadrian/src/Rules/BinaryDist.hs Changes: ===================================== boot ===================================== @@ -52,9 +52,8 @@ def autoreconf(): # Run autoreconf on everything that needs it. processes = {} if os.name == 'nt': - # Get the normalized ACLOCAL_PATH for Windows - # This is necessary since on Windows this will be a Windows - # path, which autoreconf doesn't know doesn't know how to handle. + # Convert ACLOCAL_PATH env variable to unix style paths on Windows + # See Note [Autoreconf unix paths from ACLOCAL_PATH] ac_local = os.getenv('ACLOCAL_PATH', '') ac_local_arg = re.sub(r';', r':', ac_local) ac_local_arg = re.sub(r'\\', r'/', ac_local_arg) ===================================== hadrian/src/Hadrian/Oracles/Path.hs ===================================== @@ -1,6 +1,7 @@ {-# LANGUAGE TypeFamilies #-} module Hadrian.Oracles.Path ( - lookupInPath, fixAbsolutePathOnWindows, pathOracle + lookupInPath, fixAbsolutePathOnWindows, fixUnixPathsOnWindows, + pathOracle ) where import Control.Monad @@ -33,6 +34,14 @@ fixAbsolutePathOnWindows path = else return path +-- | Fix a unix path list on Windows: +-- * "C:\\foo\\bar;C:\\msys2\\bin" => "/c/foo/bar:/c/msys2/bin" +fixUnixPathsOnWindows :: FilePath -> Action FilePath +fixUnixPathsOnWindows paths = + if isWindows + then askOracle $ UnixPathList paths + else return paths + newtype LookupInPath = LookupInPath String deriving (Binary, Eq, Hashable, NFData, Show) type instance RuleResult LookupInPath = String @@ -41,6 +50,10 @@ newtype WindowsPath = WindowsPath FilePath deriving (Binary, Eq, Hashable, NFData, Show) type instance RuleResult WindowsPath = String +newtype UnixPathList = UnixPathList FilePath + deriving (Binary, Eq, Hashable, NFData, Show) +type instance RuleResult UnixPathList = String + -- | Oracles for looking up paths. These are slow and require caching. pathOracle :: Rules () pathOracle = do @@ -50,6 +63,12 @@ pathOracle = do putVerbose $ "| Windows path mapping: " ++ path ++ " => " ++ windowsPath return windowsPath + void $ addOracleCache $ \(UnixPathList paths) -> do + Stdout out <- quietly $ cmd ["cygpath", "-p", "-u", paths] + let unixPaths = unifyPath $ dropWhileEnd isSpace out + putVerbose $ "| Unix path mapping: " ++ paths ++ " => " ++ unixPaths + return unixPaths + void $ addOracleCache $ \(LookupInPath name) -> do path <- liftIO getSearchPath exes <- liftIO (findExecutablesInDirectories path name) ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -3,18 +3,19 @@ module Rules.BinaryDist where import CommandLine import Context +import Data.Either +import qualified Data.Set as Set import Expression +import Hadrian.Oracles.Path (fixUnixPathsOnWindows) +import Oracles.Flavour import Oracles.Setting import Packages +import Rules.Generate (generateSettings) import Settings +import qualified System.Directory.Extra as IO import Settings.Program (programContext) import Target import Utilities -import qualified System.Directory.Extra as IO -import Data.Either -import qualified Data.Set as Set -import Oracles.Flavour -import Rules.Generate (generateSettings) {- Note [Binary distributions] @@ -343,7 +344,25 @@ bindistRules = do ghcRoot <- topDirectory copyFile (ghcRoot -/- "aclocal.m4") (ghcRoot -/- "distrib" -/- "aclocal.m4") copyDirectory (ghcRoot -/- "m4") (ghcRoot -/- "distrib") - buildWithCmdOptions [] $ + + -- Note [Autoreconf unix paths from ACLOCAL_PATH] + -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + -- On Windows, autoreconf fails when the ACLOCAL_PATH env variable contains Windows- + -- style paths. This happens because MSYS2 automatically converts env variables to + -- Windows-style paths. To fix this, we convert ACLOCAL_PATH back to Unix style. + -- This is done both in the boot Python script and here when building a bindist. + win_host <- isWinHost + env <- if not win_host + then pure [] + else do + aclocalPathMay <- getEnv "ACLOCAL_PATH" + case aclocalPathMay of + Nothing -> pure [] + Just aclocalPath -> do + unixAclocalPath <- fixUnixPathsOnWindows aclocalPath + pure [AddEnv "ACLOCAL_PATH" unixAclocalPath] + + buildWithCmdOptions env $ target (vanillaContext Stage1 ghc) (Autoreconf $ ghcRoot -/- "distrib") [] [] -- We clean after ourselves, moving the configure script we generated in -- our bindist dir View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a3b431f3cb46f4c23f7401ca195afe3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a3b431f3cb46f4c23f7401ca195afe3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Hadrian: convert env variable ACLOCAL_PATH to unix paths.
by Marge Bot (＠marge-bot) 04 Jun '26

04 Jun '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: a3b431f3 by David Eichmann at 2026-06-04T10:10:19+00:00 Hadrian: convert env variable ACLOCAL_PATH to unix paths. Convert ACLOCAL_PATH to a unix style path when invoking autoreconf. Autoreconf doesn't handle windows paths. See Note [Autoreconf unix paths from ACLOCAL_PATH]. Fixes #27311 - - - - - fcfa0834 by Simon Jakobi at 2026-06-04T16:19:21-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 4 changed files: - boot - hadrian/src/Hadrian/Oracles/Path.hs - hadrian/src/Rules/BinaryDist.hs - testsuite/driver/runtests.py Changes: ===================================== boot ===================================== @@ -52,9 +52,8 @@ def autoreconf(): # Run autoreconf on everything that needs it. processes = {} if os.name == 'nt': - # Get the normalized ACLOCAL_PATH for Windows - # This is necessary since on Windows this will be a Windows - # path, which autoreconf doesn't know doesn't know how to handle. + # Convert ACLOCAL_PATH env variable to unix style paths on Windows + # See Note [Autoreconf unix paths from ACLOCAL_PATH] ac_local = os.getenv('ACLOCAL_PATH', '') ac_local_arg = re.sub(r';', r':', ac_local) ac_local_arg = re.sub(r'\\', r'/', ac_local_arg) ===================================== hadrian/src/Hadrian/Oracles/Path.hs ===================================== @@ -1,6 +1,7 @@ {-# LANGUAGE TypeFamilies #-} module Hadrian.Oracles.Path ( - lookupInPath, fixAbsolutePathOnWindows, pathOracle + lookupInPath, fixAbsolutePathOnWindows, fixUnixPathsOnWindows, + pathOracle ) where import Control.Monad @@ -33,6 +34,14 @@ fixAbsolutePathOnWindows path = else return path +-- | Fix a unix path list on Windows: +-- * "C:\\foo\\bar;C:\\msys2\\bin" => "/c/foo/bar:/c/msys2/bin" +fixUnixPathsOnWindows :: FilePath -> Action FilePath +fixUnixPathsOnWindows paths = + if isWindows + then askOracle $ UnixPathList paths + else return paths + newtype LookupInPath = LookupInPath String deriving (Binary, Eq, Hashable, NFData, Show) type instance RuleResult LookupInPath = String @@ -41,6 +50,10 @@ newtype WindowsPath = WindowsPath FilePath deriving (Binary, Eq, Hashable, NFData, Show) type instance RuleResult WindowsPath = String +newtype UnixPathList = UnixPathList FilePath + deriving (Binary, Eq, Hashable, NFData, Show) +type instance RuleResult UnixPathList = String + -- | Oracles for looking up paths. These are slow and require caching. pathOracle :: Rules () pathOracle = do @@ -50,6 +63,12 @@ pathOracle = do putVerbose $ "| Windows path mapping: " ++ path ++ " => " ++ windowsPath return windowsPath + void $ addOracleCache $ \(UnixPathList paths) -> do + Stdout out <- quietly $ cmd ["cygpath", "-p", "-u", paths] + let unixPaths = unifyPath $ dropWhileEnd isSpace out + putVerbose $ "| Unix path mapping: " ++ paths ++ " => " ++ unixPaths + return unixPaths + void $ addOracleCache $ \(LookupInPath name) -> do path <- liftIO getSearchPath exes <- liftIO (findExecutablesInDirectories path name) ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -3,18 +3,19 @@ module Rules.BinaryDist where import CommandLine import Context +import Data.Either +import qualified Data.Set as Set import Expression +import Hadrian.Oracles.Path (fixUnixPathsOnWindows) +import Oracles.Flavour import Oracles.Setting import Packages +import Rules.Generate (generateSettings) import Settings +import qualified System.Directory.Extra as IO import Settings.Program (programContext) import Target import Utilities -import qualified System.Directory.Extra as IO -import Data.Either -import qualified Data.Set as Set -import Oracles.Flavour -import Rules.Generate (generateSettings) {- Note [Binary distributions] @@ -343,7 +344,25 @@ bindistRules = do ghcRoot <- topDirectory copyFile (ghcRoot -/- "aclocal.m4") (ghcRoot -/- "distrib" -/- "aclocal.m4") copyDirectory (ghcRoot -/- "m4") (ghcRoot -/- "distrib") - buildWithCmdOptions [] $ + + -- Note [Autoreconf unix paths from ACLOCAL_PATH] + -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + -- On Windows, autoreconf fails when the ACLOCAL_PATH env variable contains Windows- + -- style paths. This happens because MSYS2 automatically converts env variables to + -- Windows-style paths. To fix this, we convert ACLOCAL_PATH back to Unix style. + -- This is done both in the boot Python script and here when building a bindist. + win_host <- isWinHost + env <- if not win_host + then pure [] + else do + aclocalPathMay <- getEnv "ACLOCAL_PATH" + case aclocalPathMay of + Nothing -> pure [] + Just aclocalPath -> do + unixAclocalPath <- fixUnixPathsOnWindows aclocalPath + pure [AddEnv "ACLOCAL_PATH" unixAclocalPath] + + buildWithCmdOptions env $ target (vanillaContext Stage1 ghc) (Autoreconf $ ghcRoot -/- "distrib") [] [] -- We clean after ourselves, moving the configure script we generated in -- our bindist dir ===================================== testsuite/driver/runtests.py ===================================== @@ -133,7 +133,7 @@ if args.unexpected_output_dir: config.unexpected_output_dir = Path(args.unexpected_output_dir) if args.only: - config.only = args.only + config.only = set(args.only) config.run_only_some_tests = True if args.skip: View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e834d92ab335c45f940995570181bd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e834d92ab335c45f940995570181bd… You're receiving this email because of your account on gitlab.haskell.org.

1 0

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

04 Jun '26

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

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Fix AArch64 clobbering bug for MUL2
by Marge Bot (＠marge-bot) 04 Jun '26

04 Jun '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: c2989784 by sheaf at 2026-06-04T13:07:45-04:00 Fix AArch64 clobbering bug for MUL2 On AArch64, the code generator could clobber one of the input operands when computing the lower bits of a MUL2 operation. This rendered invalid the subsequent computation of the high bits. This commit fixes that by using a temporary register. The register allocator can remove the redundant move in the common case when the registers do not conflict. Fixes #27046 - - - - - e834d92a by Simon Jakobi at 2026-06-04T13:07:46-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 6 changed files: - + changelog.d/T27046 - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - testsuite/driver/runtests.py - + testsuite/tests/codeGen/should_run/T27046.hs - + testsuite/tests/codeGen/should_run/T27046_cmm.cmm - testsuite/tests/codeGen/should_run/all.T Changes: ===================================== changelog.d/T27046 ===================================== @@ -0,0 +1,9 @@ +section: compiler +issues: #27046 +mrs: !16031 +synopsis: + Avoid AArch64 register clobbering bug in MUL2 +description: + Fixes an issue in which, on AArch64, code generation for the MUL2 operation + could clobber one of the input operands when computing the lower bits, which + rendered invalid the subsequent computation of the high bits. ===================================== compiler/GHC/CmmToAsm/AArch64/CodeGen.hs ===================================== @@ -2300,11 +2300,19 @@ genCCall target dest_regs arg_regs = do let lo = getRegisterReg platform (CmmLocal dst_lo) hi = getRegisterReg platform (CmmLocal dst_hi) nd = getRegisterReg platform (CmmLocal dst_needed) + + -- Generate a fresh virtual register for the low word computation. + -- This avoids clobbering reg_a or reg_b in the first MUL instruction, + -- which could for example happen if 'lo' and 'reg_a' are the same + -- virtual register. + tmp_lo <- getNewRegNat II64 + return $ code_x `appOL` code_y `snocOL` - MUL II64 (OpReg W64 lo) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` + MUL II64 (OpReg W64 tmp_lo) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` SMULH (OpReg W64 hi) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` + MOV (OpReg W64 lo) (OpReg W64 tmp_lo) `snocOL` -- Are all high bits equal to the sign bit of the low word? -- nd = (hi == ASR(lo,width-1)) ? 1 : 0 CMP (OpReg W64 hi) (OpRegShift W64 lo SASR (widthInBits w - 1)) `snocOL` ===================================== testsuite/driver/runtests.py ===================================== @@ -133,7 +133,7 @@ if args.unexpected_output_dir: config.unexpected_output_dir = Path(args.unexpected_output_dir) if args.only: - config.only = args.only + config.only = set(args.only) config.run_only_some_tests = True if args.skip: ===================================== testsuite/tests/codeGen/should_run/T27046.hs ===================================== @@ -0,0 +1,29 @@ +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE ForeignFunctionInterface, GHCForeignImportPrim, UnliftedFFITypes #-} + +module Main where + +import Control.Monad + ( unless ) +import Data.Bits + ( shiftL ) +import GHC.Exts + ( Int64# ) +import GHC.Int + ( Int64(..) ) + +foreign import prim "test_mul2_clobber" + test_mul2_clobber :: Int64# -> Int64# -> Int64# + +main :: IO () +main = do + let + I64# x = 1 `shiftL` 32 + hi = I64# $ test_mul2_clobber x x + + unless ( hi == 1 ) $ + error $ unlines + [ "Incorrect result for Mul2 operation." + , "Expected high word: 1" + , " Actual high word: " ++ show hi + ] ===================================== testsuite/tests/codeGen/should_run/T27046_cmm.cmm ===================================== @@ -0,0 +1,13 @@ +#include "Cmm.h" + +// Test for #27046 +test_mul2_clobber (bits64 x, bits64 y) +{ + bits64 hi, nd; + + // Deliberately alias the destination 'lo' with the source 'x' + // This forces the NCG to use the same virtual register for both. + (nd, hi, x) = prim %mul2_64(x, y); + + return (hi); +} ===================================== testsuite/tests/codeGen/should_run/all.T ===================================== @@ -260,6 +260,7 @@ test('T25364', normal, compile_and_run, ['']) test('T26061', normal, compile_and_run, ['']) test('T26537', normal, compile_and_run, ['-O2 -fregs-graph']) test('T24016', normal, compile_and_run, ['-O1 -fPIC']) +test('T27046', [req_cmm], compile_and_run, ['T27046_cmm.cmm']) # Check that GHC-generated finalizers run on Darwin. The Apple linker doesn't # support --wrap, so we can't intercept hs_spt_remove directly. Instead we View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c19aa850a1a18161cfb25ecf4781fa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c19aa850a1a18161cfb25ecf4781fa… You're receiving this email because of your account on gitlab.haskell.org.

1 0