[commit: ghc] ghc-8.6: Revert "Revert "Merge FUN_STATIC closure with its SRT"" (c0eb1ab)

Wed Sep 19 18:25:22 UTC 2018

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

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/c0eb1abf20f88a8a7c32bf8cd6ef0bf6ab505c71/ghc

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

commit c0eb1abf20f88a8a7c32bf8cd6ef0bf6ab505c71
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Sep 18 11:45:23 2018 -0400

    Revert "Revert "Merge FUN_STATIC closure with its SRT""

    This reverts commit 6f2596b432a9915d648286195b48c48ccdd14a2c.

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

c0eb1abf20f88a8a7c32bf8cd6ef0bf6ab505c71
 compiler/cmm/Cmm.hs                  |   7 +-
 compiler/cmm/CmmBuildInfoTables.hs   | 224 +++++++++++++++++++++--------------
 compiler/cmm/CmmInfo.hs              |   3 +-
 compiler/cmm/CmmParse.y              |  12 +-
 compiler/codeGen/StgCmmBind.hs       |  22 ++--
 compiler/codeGen/StgCmmClosure.hs    |  19 ++-
 includes/rts/storage/ClosureMacros.h |   3 -
 rts/RetainerProfile.c                |   2 +-
 rts/sm/Compact.c                     |   2 +-
 rts/sm/Evac.c                        |   4 +-
 rts/sm/Sanity.c                      |   2 +-
 rts/sm/Scav.c                        |   6 +-
 12 files changed, 184 insertions(+), 122 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 c0eb1abf20f88a8a7c32bf8cd6ef0bf6ab505c71