[commit: ghc] master: Correctly add unwinding info in manifestSp and makeFixupBlocks (6132d7c)

git at git.haskell.org git at git.haskell.org
Thu May 3 19:02:45 UTC 2018


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

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

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

commit 6132d7c5e6404936ef281a6f3be333fea780906e
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Thu May 3 12:37:00 2018 -0400

    Correctly add unwinding info in manifestSp and makeFixupBlocks
    
    In `manifestSp` the unwind info was before the relevant instruction, not
    after.  I added some notes to establish semantics.  Also removes
    redundant annotation in stg_catch_frame.
    
    For `makeFixupBlocks` it looks like we were off by `wORD_SIZE dflags`.
    I'm not sure why, but it lines up with `manifestSp`.  In fact it lines
    up so well so that I can consolidate the Sp unwind logic in
    `maybeAddUnwind`.  I detected the problems with `makeFixupBlocks` by
    running T14779b after patching D4559.
    
    Test Plan: added a new test
    
    Reviewers: bgamari, scpmw, simonmar, erikd
    
    Reviewed By: bgamari
    
    Subscribers: thomie, carter
    
    GHC Trac Issues: #14999
    
    Differential Revision: https://phabricator.haskell.org/D4606


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

6132d7c5e6404936ef281a6f3be333fea780906e
 compiler/cmm/CmmLayoutStack.hs                     | 62 +++++++--------
 compiler/cmm/Debug.hs                              | 91 +++++++++++++++++++++-
 compiler/nativeGen/Dwarf/Types.hs                  |  6 ++
 rts/Exception.cmm                                  |  1 -
 testsuite/driver/testglobals.py                    |  6 ++
 testsuite/driver/testlib.py                        |  6 ++
 testsuite/mk/test.mk                               | 14 ++++
 testsuite/tests/codeGen/should_compile/Makefile    |  5 ++
 testsuite/tests/codeGen/should_compile/T14999.cmm  | 11 +++
 .../tests/codeGen/should_compile/T14999.stdout     | 16 ++++
 testsuite/tests/codeGen/should_compile/all.T       |  5 ++
 11 files changed, 185 insertions(+), 38 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 6132d7c5e6404936ef281a6f3be333fea780906e


More information about the ghc-commits mailing list