[commit: ghc] master: More fixes for #5654 (3a18baf)

[git at git.haskell.org]

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

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

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

commit 3a18baff06abc193569b1b76358da26375b3c8d6
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Dec 20 14:32:11 2016 +0000

    More fixes for #5654
    
    * In stg_ap_0_fast, if we're evaluating a thunk, the thunk might
      evaluate to a function in which case we may have to adjust its CCS.
    
    * The interpreter has its own implementation of stg_ap_0_fast, so we
      have to do the same shenanigans with creating empty PAPs and copying
      PAPs there.
    
    * GHCi creates Cost Centres as children of CCS_MAIN, which enterFunCCS()
      wrongly assumed to imply that they were CAFs.  Now we use the is_caf
      flag for this, which we have to correctly initialise when we create a
      Cost Centre in GHCi.


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

3a18baff06abc193569b1b76358da26375b3c8d6
 includes/stg/MiscClosures.h                        |  1 +
 rts/Apply.cmm                                      | 27 ++++++++
 rts/Interpreter.c                                  | 72 ++++++++++++++++++++--
 rts/Printer.c                                      |  5 ++
 rts/Profiling.c                                    |  6 +-
 rts/StgMiscClosures.cmm                            | 10 +++
 testsuite/tests/codeGen/should_run/cgrun057.stderr |  2 +-
 .../tests/profiling/should_run/T680.prof.sample    | 65 ++++++++++---------
 testsuite/tests/profiling/should_run/all.T         |  3 +-
 .../should_run/toplevel_scc_1.prof.sample          | 41 ++++++------
 10 files changed, 170 insertions(+), 62 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3a18baff06abc193569b1b76358da26375b3c8d6