Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • rts/sm/Storage.h
    ... ... @@ -213,7 +213,8 @@ extern StgIndStatic * debug_caf_list;
    213 213
     extern StgIndStatic * revertible_caf_list;
    
    214 214
     
    
    215 215
     INLINE_HEADER void clear_blocks(bdescr *bd) {
    
    216
    -   memset(bd->start, 0, BLOCK_SIZE * bd->blocks);
    
    216
    +  memset(bd->start, RtsFlags.DebugFlags.zero_on_gc ? 0xaa : 0,
    
    217
    +         BLOCK_SIZE * bd->blocks);
    
    217 218
     }
    
    218 219
     
    
    219 220
     #include "EndPrivate.h"

  • testsuite/tests/ffi/should_run/all.T
    ... ... @@ -188,8 +188,8 @@ test('ffi023', [ omit_ghci,
    188 188
     test('rts_clearMemory', [
    
    189 189
          # We only care about different GC configurations under the
    
    190 190
          # single-threaded RTS for the time being.
    
    191
    -     only_ways(['normal', 'optasm' ,'g1', 'nursery_chunks', 'nonmoving', 'compacting_gc']),
    
    192
    -     extra_ways(['g1', 'nursery_chunks', 'nonmoving', 'compacting_gc']),
    
    191
    +     only_ways(['normal', 'optasm' ,'g1', 'nursery_chunks', 'nonmoving', 'compacting_gc', 'sanity']),
    
    192
    +     extra_ways(['g1', 'nursery_chunks', 'nonmoving', 'compacting_gc', 'sanity']),
    
    193 193
          # On windows, nonmoving way fails with bad exit code (2816)
    
    194 194
          when(opsys('mingw32'), fragile(23091)),
    
    195 195
          req_c,