diff options
| author | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
|---|---|---|
| committer | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
| commit | 84c2ad99582391005b5e873198b15e9e9eb4f78d (patch) | |
| tree | caa8c2f2ec7e97fbb4977263c6817c9af5025cf4 /compiler/cmm/BlockId.hs | |
| parent | 8ddb47cfcf5776e9a3c55fd37947c8a95e00fa12 (diff) | |
| parent | e68b439fe5de61b9a2ca51af472185c62ccb8b46 (diff) | |
| download | haskell-wip/T13904.tar.gz | |
update to current master againwip/T13904
Diffstat (limited to 'compiler/cmm/BlockId.hs')
| -rw-r--r-- | compiler/cmm/BlockId.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/compiler/cmm/BlockId.hs b/compiler/cmm/BlockId.hs index 8f11ad194b..4f4e0e8c53 100644 --- a/compiler/cmm/BlockId.hs +++ b/compiler/cmm/BlockId.hs @@ -8,14 +8,15 @@ module BlockId , blockLbl, infoTblLbl ) where +import GhcPrelude + import CLabel import IdInfo import Name import Unique import UniqSupply -import Hoopl.Label (Label, uniqueToLbl) -import Hoopl.Unique (intToUnique) +import Hoopl.Label (Label, mkHooplLabel) ---------------------------------------------------------------- --- Block Ids, their environments, and their sets @@ -32,13 +33,14 @@ compilation unit in which it appears. type BlockId = Label mkBlockId :: Unique -> BlockId -mkBlockId unique = uniqueToLbl $ intToUnique $ getKey unique +mkBlockId unique = mkHooplLabel $ getKey unique newBlockId :: MonadUnique m => m BlockId newBlockId = mkBlockId <$> getUniqueM blockLbl :: BlockId -> CLabel -blockLbl label = mkEntryLabel (mkFCallName (getUnique label) "block") NoCafRefs +blockLbl label = mkLocalBlockLabel (getUnique label) infoTblLbl :: BlockId -> CLabel -infoTblLbl label = mkInfoTableLabel (mkFCallName (getUnique label) "block") NoCafRefs +infoTblLbl label + = mkBlockInfoTableLabel (mkFCallName (getUnique label) "block") NoCafRefs |