Simon Jakobi pushed to branch wip/sjakobi/T27534 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • testsuite/tests/rts/T17088.hs
    ... ... @@ -2,6 +2,9 @@
    2 2
     {-# LANGUAGE MagicHash     #-}
    
    3 3
     {-# LANGUAGE UnboxedTuples #-}
    
    4 4
     
    
    5
    +-- Lambda lifting removes the closure shape needed to reproduce #17088.
    
    6
    +{-# OPTIONS_GHC -fno-stg-lift-lams #-}
    
    7
    +
    
    5 8
     module Main (main) where
    
    6 9
     
    
    7 10
     import Data.Word
    
    ... ... @@ -27,7 +30,9 @@ instance Show Bytes where
    27 30
     bytesAllocRet :: Int -> IO Bytes
    
    28 31
     bytesAllocRet (I# sz) =
    
    29 32
       IO $ \s -> case newAlignedPinnedByteArray# sz 8# s of
    
    30
    -               (# s', mba #) -> (# s', Bytes mba #)
    
    33
    +               (# s', mba #) ->
    
    34
    +                 case writeWord8Array# mba 0# (wordToWord8# 0##) s' of
    
    35
    +                   s'' -> (# s'', Bytes mba #)
    
    31 36
     
    
    32 37
     ------------------------------------------------------------------------
    
    33 38
     
    

  • testsuite/tests/rts/all.T
    ... ... @@ -540,8 +540,11 @@ test('RestartEventLogging',
    540 540
          compile_and_run, ['RestartEventLogging_c.c'])
    
    541 541
     
    
    542 542
     test('T17088',
    
    543
    -     [extra_ways(['compacting_gc']), extra_run_opts('+RTS -A256k -RTS')],
    
    544
    -     compile_and_run, ['-rtsopts -O2'])
    
    543
    +     [ only_ways(['compacting_gc'])
    
    544
    +     , extra_ways(['compacting_gc'])
    
    545
    +     , extra_run_opts('+RTS -A128k -RTS')
    
    546
    +     ],
    
    547
    +     compile_and_run, ['-rtsopts -O1'])
    
    545 548
     
    
    546 549
     test('T15427', js_broken(22374), compile_and_run, [''])
    
    547 550