[commit: ghc] master: nativeGen: Consistently use blockLbl to generate CLabels from BlockIds (8b007ab)

[git at git.haskell.org]

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

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

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

commit 8b007abbeb3045900a11529d907a835080129176
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Sep 19 10:58:36 2017 -0400

    nativeGen: Consistently use blockLbl to generate CLabels from BlockIds
    
    This fixes #14221, where the NCG and the DWARF code were apparently
    giving two different names to the same block.
    
    Test Plan: Validate with DWARF support enabled.
    
    Reviewers: simonmar, austin
    
    Subscribers: rwbarton, thomie
    
    GHC Trac Issues: #14221
    
    Differential Revision: https://phabricator.haskell.org/D3977


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

8b007abbeb3045900a11529d907a835080129176
 compiler/cmm/BlockId.hs                  | 2 +-
 compiler/nativeGen/PPC/CodeGen.hs        | 5 ++---
 compiler/nativeGen/PPC/Ppr.hs            | 9 +++++----
 compiler/nativeGen/SPARC/CodeGen.hs      | 3 +--
 compiler/nativeGen/SPARC/Ppr.hs          | 9 +++++----
 compiler/nativeGen/SPARC/ShortcutJump.hs | 4 +---
 compiler/nativeGen/X86/CodeGen.hs        | 5 ++---
 compiler/nativeGen/X86/Ppr.hs            | 7 ++++---
 8 files changed, 21 insertions(+), 23 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 8b007abbeb3045900a11529d907a835080129176