Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 57d3b4a8 by Andrew Lelechenko at 2025-08-05T18:36:31-04:00 hadrian: bump Stackage snapshot to LTS 24.2 / GHC 9.10.2 In line with #25693 we should use GHC 9.10 as a boot compiler, while Hadrian stack.yaml was stuck on GHC 9.6. - - - - - c2a78cea by Peng Fan at 2025-08-05T18:37:27-04:00 NCG/LA64: implement atomic write with finer-grained DBAR hints Signed-off-by: Peng Fan <fanpeng@loongson.cn> - - - - - 6482e6b1 by Andrew Lelechenko at 2025-08-05T19:12:09-04:00 Bump submodule text to 2.1.3 - - - - - 084314bf by Nikolaos Chatzikonstantinou at 2025-08-05T19:12:12-04:00 docs: fix internal import in getopt examples This external-facing doc example shouldn't mention GHC internals when using 'fromMaybe'. - - - - - 5 changed files: - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - hadrian/stack.yaml - hadrian/stack.yaml.lock - libraries/base/src/System/Console/GetOpt.hs - libraries/text Changes: ===================================== compiler/GHC/CmmToAsm/LA64/CodeGen.hs ===================================== @@ -1972,9 +1972,17 @@ genCCall target dest_regs arg_regs = do (val, fmt_val, code_val) <- getSomeReg val_reg let instrs = case ord of MemOrderRelaxed -> unitOL $ ann moDescr (ST fmt_val (OpReg w val) (OpAddr $ AddrReg p)) - -- implement with AMSWAPDB - MemOrderRelease -> unitOL $ ann moDescr (AMSWAPDB fmt_val (OpReg w zeroReg) (OpReg w val) (OpReg w p)) - MemOrderSeqCst -> unitOL $ ann moDescr (AMSWAPDB fmt_val (OpReg w zeroReg) (OpReg w val) (OpReg w p)) + -- AMSWAP_DB* insns implentment a fully functional synchronization barrier, like DBAR 0x0. + -- This is terrible. And AMSWAPDB only supports ISA version greater than LA64V1_0. So, + -- implement with DBAR + MemOrderRelease -> toOL [ + ann moDescr (DBAR HintRelease), + ST fmt_val (OpReg w val) (OpAddr $ AddrReg p) + ] + MemOrderSeqCst -> toOL [ + ann moDescr (DBAR HintSeqcst), + ST fmt_val (OpReg w val) (OpAddr $ AddrReg p) + ] _ -> panic $ "Unexpected MemOrderAcquire on an AtomicWrite" ++ show mo moDescr = (text . show) mo code = ===================================== hadrian/stack.yaml ===================================== @@ -1,6 +1,6 @@ -# GHC's configure script reports that GHC versions 9.6 and greater are required +# GHC's configure script reports that GHC versions 9.10 and greater are required # to build GHC from source. -resolver: lts-22.44 # GHC 9.6.7 +resolver: lts-24.2 # GHC 9.10.2 packages: - '.' ===================================== hadrian/stack.yaml.lock ===================================== @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: - completed: @@ -40,9 +40,9 @@ packages: original: hackage: filepath-1.4.300.2 - completed: - hackage: process-1.6.25.0@sha256:092ab61596e914d21983aa2e9206a74c4faa38a5a636446b5c954305821cb496,2749 + hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640 pantry-tree: - sha256: bdab416d3c454ad716d4fab1ced490cc75330658c1c7c66a0b6f4b3e5125017b + sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b size: 1790 original: hackage: process-1.6.25.0 @@ -55,7 +55,7 @@ packages: hackage: unix-2.8.5.1 snapshots: - completed: - sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 - size: 721141 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/maste... - original: lts-22.44 + sha256: cd28bd74375205718f1d5fa221730a9c17a203059708b1eb95f4b20d68bf82d9 + size: 724943 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/maste... + original: lts-24.2 ===================================== libraries/base/src/System/Console/GetOpt.hs ===================================== @@ -315,7 +315,7 @@ arguments:

module Opts1 where

import System.Console.GetOpt -> import GHC.Internal.Data.Maybe ( fromMaybe ) +> import Data.Maybe ( fromMaybe )

data Flag = Verbose | Version @@ -356,7 +356,7 @@ A different approach is to group the option values in a record of type module Opts2 where

import System.Console.GetOpt -> import GHC.Internal.Data.Maybe ( fromMaybe ) +> import Data.Maybe ( fromMaybe )

data Options = Options { optVerbose :: Bool

===================================== libraries/text ===================================== @@ -1 +1 @@ -Subproject commit f1a05704a153ecc6a9bd45f6df8dd99820e74a2d +Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b919f5892f7d4033b6d62d3ec099c2... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b919f5892f7d4033b6d62d3ec099c2... You're receiving this email because of your account on gitlab.haskell.org.