[commit: ghc] master: rts/LdvProfile.c: Fix NULL dereference on shutdown (bcfee21)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bcfee2181e7b7edfea3473ec408a3a2a1815ecff/ghc

>---------------------------------------------------------------

commit bcfee2181e7b7edfea3473ec408a3a2a1815ecff
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Apr 29 07:15:53 2016 +1000

    rts/LdvProfile.c: Fix NULL dereference on shutdown
    
    Test Plan: validate
    
    Reviewers: carter, austin, simonmar, bgamari
    
    Reviewed By: simonmar, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2154
    
    GHC Trac Issues: #11978


>---------------------------------------------------------------

bcfee2181e7b7edfea3473ec408a3a2a1815ecff
 rts/LdvProfile.c                                                      | 3 +++
 testsuite/tests/profiling/should_run/T11978a.hs                       | 2 ++
 .../should_run/T5594.stdout => profiling/should_run/T11978a.stdout}   | 0
 testsuite/tests/profiling/should_run/all.T                            | 4 ++++
 4 files changed, 9 insertions(+)

diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c
index 2330d74..4a2ee42 100644
--- a/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
@@ -178,6 +178,9 @@ processNurseryForDead( void )
     StgPtr p;
     bdescr *bd;
 
+    if (MainCapability.r.rNursery == NULL)
+        return;
+
     for (bd = MainCapability.r.rNursery->blocks; bd != NULL; bd = bd->link) {
         p = bd->start;
         while (p < bd->free) {
diff --git a/testsuite/tests/profiling/should_run/T11978a.hs b/testsuite/tests/profiling/should_run/T11978a.hs
new file mode 100644
index 0000000..bb859f3
--- /dev/null
+++ b/testsuite/tests/profiling/should_run/T11978a.hs
@@ -0,0 +1,2 @@
+main :: IO ()
+main = putStrLn "Hello!"
diff --git a/testsuite/tests/ffi/should_run/T5594.stdout b/testsuite/tests/profiling/should_run/T11978a.stdout
similarity index 100%
copy from testsuite/tests/ffi/should_run/T5594.stdout
copy to testsuite/tests/profiling/should_run/T11978a.stdout
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index c6ce6d4..1f74a27 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -106,3 +106,7 @@ test('T11627b', [ extra_run_opts('+RTS -i0 -RTS')  # census after each GC
                 ]
                 , compile_and_run
                 , [''])
+
+test('T11978a',
+     [only_ways(['profthreaded']), extra_run_opts('+RTS -hb -N10')],
+     compile_and_run, [''])