Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • compiler/GHC/CmmToAsm/LA64/CodeGen.hs
    ... ... @@ -1972,9 +1972,17 @@ genCCall target dest_regs arg_regs = do
    1972 1972 
                   (val, fmt_val, code_val) <- getSomeReg val_reg
    1973 1973 
                   let instrs = case ord of
    1974 1974 
                           MemOrderRelaxed -> unitOL $ ann moDescr (ST fmt_val (OpReg w val) (OpAddr $ AddrReg p))
    1975 
    -                      -- implement with AMSWAPDB
    1976 
    -                      MemOrderRelease -> unitOL $ ann moDescr (AMSWAPDB fmt_val (OpReg w zeroReg) (OpReg w val) (OpReg w p))
    1977 
    -                      MemOrderSeqCst  -> unitOL $ ann moDescr (AMSWAPDB fmt_val (OpReg w zeroReg) (OpReg w val) (OpReg w p))
    1975 
    +                      -- AMSWAP_DB* insns implentment a fully functional synchronization barrier, like DBAR 0x0.
    1976 
    +                      -- This is terrible. And AMSWAPDB only supports ISA version greater than LA64V1_0. So,
    1977 
    +                      -- implement with DBAR
    1978 
    +                      MemOrderRelease -> toOL [
    1979 
    +                                                ann moDescr (DBAR HintRelease),
    1980 
    +                                                ST fmt_val (OpReg w val) (OpAddr $ AddrReg p)
    1981 
    +                                              ]
    1982 
    +                      MemOrderSeqCst  -> toOL [
    1983 
    +                                                ann moDescr (DBAR HintSeqcst),
    1984 
    +                                                ST fmt_val (OpReg w val) (OpAddr $ AddrReg p)
    1985 
    +                                              ]
    1978 1986 
                           _ ->  panic $ "Unexpected MemOrderAcquire on an AtomicWrite" ++ show mo
    1979 1987 
                       moDescr = (text . show) mo
    1980 1988 
                       code =

  • hadrian/stack.yaml
    1 
    -# GHC's configure script reports that GHC versions 9.6 and greater are required
    1 
    +# GHC's configure script reports that GHC versions 9.10 and greater are required
    2 2 
     # to build GHC from source.
    3 
    -resolver: lts-22.44 # GHC 9.6.7
    3 
    +resolver: lts-24.2 # GHC 9.10.2
    4 4
    5 5 
     packages:
    6 6 
     - '.'

  • hadrian/stack.yaml.lock
    1 1 
     # This file was autogenerated by Stack.
    2 2 
     # You should not edit this file by hand.
    3 3 
     # For more information, please see the documentation at:
    4 
    -#   https://docs.haskellstack.org/en/stable/lock_files
    4 
    +#   https://docs.haskellstack.org/en/stable/topics/lock_files
    5 5
    6 6 
     packages:
    7 7 
     - completed:
    ... ... @@ -40,9 +40,9 @@ packages:
    40 40 
       original:
    41 41 
         hackage: filepath-1.4.300.2
    42 42 
     - completed:
    43 
    -    hackage: process-1.6.25.0@sha256:092ab61596e914d21983aa2e9206a74c4faa38a5a636446b5c954305821cb496,2749
    43 
    +    hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640
    44 44 
         pantry-tree:
    45 
    -      sha256: bdab416d3c454ad716d4fab1ced490cc75330658c1c7c66a0b6f4b3e5125017b
    45 
    +      sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b
    46 46 
           size: 1790
    47 47 
       original:
    48 48 
         hackage: process-1.6.25.0
    ... ... @@ -55,7 +55,7 @@ packages:
    55 55 
         hackage: unix-2.8.5.1
    56 56 
     snapshots:
    57 57 
     - completed:
    58 
    -    sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9
    59 
    -    size: 721141
    60 
    -    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/44.yaml
    61 
    -  original: lts-22.44
    58 
    +    sha256: cd28bd74375205718f1d5fa221730a9c17a203059708b1eb95f4b20d68bf82d9
    59 
    +    size: 724943
    60 
    +    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/2.yaml
    61 
    +  original: lts-24.2

  • libraries/base/src/System/Console/GetOpt.hs
    ... ... @@ -315,7 +315,7 @@ arguments:
    315 315 
     >    module Opts1 where
    316 316 
     >
    317 317 
     >    import System.Console.GetOpt
    318 
    ->    import GHC.Internal.Data.Maybe ( fromMaybe )
    318 
    +>    import Data.Maybe ( fromMaybe )
    319 319 
     >
    320 320 
     >    data Flag
    321 321 
     >     = Verbose  | Version
    ... ... @@ -356,7 +356,7 @@ A different approach is to group the option values in a record of type
    356 356 
     >    module Opts2 where
    357 357 
     >
    358 358 
     >    import System.Console.GetOpt
    359 
    ->    import GHC.Internal.Data.Maybe ( fromMaybe )
    359 
    +>    import Data.Maybe ( fromMaybe )
    360 360 
     >
    361 361 
     >    data Options = Options
    362 362 
     >     { optVerbose     :: Bool

  • libraries/text
    1 
    -Subproject commit f1a05704a153ecc6a9bd45f6df8dd99820e74a2d
    1 
    +Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help