From 2bb099e5ccd7255f9742cb8bc5d512cd92d035b6 Mon Sep 17 00:00:00 2001 From: Michal Terepeta Date: Thu, 8 Dec 2016 16:34:10 -0500 Subject: 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 Test Plan: validate Reviewers: bgamari, austin, simonmar Reviewed By: simonmar Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2800 --- compiler/cmm/Cmm.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/cmm/Cmm.hs') diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs index 3195935fa2..39c2d390d5 100644 --- a/compiler/cmm/Cmm.hs +++ b/compiler/cmm/Cmm.hs @@ -57,7 +57,7 @@ type CmmProgram = [CmmGroup] type GenCmmGroup d h g = [GenCmmDecl d h g] type CmmGroup = GenCmmGroup CmmStatics CmmTopInfo CmmGraph -type RawCmmGroup = GenCmmGroup CmmStatics (BlockEnv CmmStatics) CmmGraph +type RawCmmGroup = GenCmmGroup CmmStatics (LabelMap CmmStatics) CmmGraph ----------------------------------------------------------------------------- -- CmmDecl, GenCmmDecl @@ -94,7 +94,7 @@ type CmmDecl = GenCmmDecl CmmStatics CmmTopInfo CmmGraph type RawCmmDecl = GenCmmDecl CmmStatics - (BlockEnv CmmStatics) + (LabelMap CmmStatics) CmmGraph ----------------------------------------------------------------------------- @@ -114,7 +114,7 @@ type CmmBwdRewrite f = BwdRewrite UniqSM CmmNode f -- Info Tables ----------------------------------------------------------------------------- -data CmmTopInfo = TopInfo { info_tbls :: BlockEnv CmmInfoTable +data CmmTopInfo = TopInfo { info_tbls :: LabelMap CmmInfoTable , stack_info :: CmmStackInfo } topInfoTable :: GenCmmDecl a CmmTopInfo (GenCmmGraph n) -> Maybe CmmInfoTable -- cgit v1.2.1