[commit: ghc] master: BlockId: remove BlockMap and BlockSet synonyms (2bb099e)

[git at git.haskell.org]

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

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

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

commit 2bb099e5ccd7255f9742cb8bc5d512cd92d035b6
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Thu Dec 8 16:34:10 2016 -0500

    BlockId: remove BlockMap and BlockSet synonyms
    
    This continues removal of `BlockId` module in favor of Hoopl's `Label`.
    Most of the changes here are mechanical, apart from the orphan
    `Outputable` instances for `LabelMap` and `LabelSet`.  For now I've
    moved them to `cmm/Hoopl`, since it's already trying to manage all
    imports from Hoopl (to avoid any collisions).
    
    Signed-off-by: Michal Terepeta <michal.terepeta at gmail.com>
    
    Test Plan: validate
    
    Reviewers: bgamari, austin, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2800


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

2bb099e5ccd7255f9742cb8bc5d512cd92d035b6
 compiler/cmm/BlockId.hs                            | 15 ---------
 compiler/cmm/Cmm.hs                                |  6 ++--
 compiler/cmm/CmmBuildInfoTables.hs                 | 15 +++++----
 compiler/cmm/CmmCommonBlockElim.hs                 |  8 ++---
 compiler/cmm/CmmContFlowOpt.hs                     | 20 ++++++------
 compiler/cmm/CmmLayoutStack.hs                     | 36 +++++++++++-----------
 compiler/cmm/CmmLint.hs                            |  5 ++-
 compiler/cmm/CmmLive.hs                            |  2 +-
 compiler/cmm/CmmProcPoint.hs                       | 10 +++---
 compiler/cmm/CmmSink.hs                            |  7 ++---
 compiler/cmm/CmmUtils.hs                           |  6 ++--
 compiler/cmm/Hoopl.hs                              |  8 +++++
 compiler/cmm/Hoopl/Dataflow.hs                     |  1 -
 compiler/nativeGen/AsmCodeGen.hs                   | 10 +++---
 compiler/nativeGen/Instruction.hs                  |  9 +++---
 compiler/nativeGen/NCGMonad.hs                     |  1 +
 compiler/nativeGen/PPC/Instr.hs                    |  5 +--
 compiler/nativeGen/PPC/Ppr.hs                      |  4 +--
 compiler/nativeGen/RegAlloc/Graph/Spill.hs         |  1 +
 compiler/nativeGen/RegAlloc/Graph/SpillClean.hs    |  1 +
 compiler/nativeGen/RegAlloc/Graph/SpillCost.hs     |  2 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |  1 +
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |  1 +
 compiler/nativeGen/RegAlloc/Liveness.hs            |  7 +++--
 compiler/nativeGen/SPARC/Ppr.hs                    |  4 +--
 compiler/nativeGen/X86/Instr.hs                    |  5 +--
 compiler/nativeGen/X86/Ppr.hs                      |  4 +--
 27 files changed, 96 insertions(+), 98 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 2bb099e5ccd7255f9742cb8bc5d512cd92d035b6