summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2016-08-31 13:53:04 -0400
committerBen Gamari <ben@smart-cactus.org>2016-08-31 14:28:31 -0400
commit9306db051ff5835b453d55f32783d081ac79ec28 (patch)
tree55cdc3fd85074a52b7363d5a20480fdd12ee612a
parenta07a3ffa3efda6f7ebe68841e15ef89ac0d313b1 (diff)
downloadhaskell-9306db051ff5835b453d55f32783d081ac79ec28.tar.gz
TysWiredIn: Use dataConWorkerUnique instead of incrUnique
Test Plan: Validate Reviewers: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2465
-rw-r--r--compiler/basicTypes/Unique.hs1
-rw-r--r--compiler/prelude/TysWiredIn.hs4
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/basicTypes/Unique.hs b/compiler/basicTypes/Unique.hs
index 0bbf86110e..c933d613da 100644
--- a/compiler/basicTypes/Unique.hs
+++ b/compiler/basicTypes/Unique.hs
@@ -31,7 +31,6 @@ module Unique (
getKey, -- Used in Var, UniqFM, Name only!
mkUnique, unpkUnique, -- Used in BinIface only
- incrUnique, -- Used for renumbering
deriveUnique, -- Ditto
newTagUnique, -- Used in CgCase
initTyVarUnique,
diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index 102847833e..b334967009 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -489,7 +489,7 @@ pcDataConWithFixity :: Bool -- ^ declared infix?
-> [Type] -- ^ args
-> TyCon
-> DataCon
-pcDataConWithFixity infx n = pcDataConWithFixity' infx n (incrUnique (nameUnique n))
+pcDataConWithFixity infx n = pcDataConWithFixity' infx n (dataConWorkerUnique (nameUnique n))
NoRRI
-- The Name's unique is the first of two free uniques;
-- the first is used for the datacon itself,
@@ -535,7 +535,7 @@ pcDataConWithFixity' declared_infix dc_name wrk_key rri tyvars ex_tyvars arg_tys
-- used for RuntimeRep and friends
pcSpecialDataCon :: Name -> [Type] -> TyCon -> RuntimeRepInfo -> DataCon
pcSpecialDataCon dc_name arg_tys tycon rri
- = pcDataConWithFixity' False dc_name (incrUnique (nameUnique dc_name)) rri
+ = pcDataConWithFixity' False dc_name (dataConWorkerUnique (nameUnique dc_name)) rri
[] [] arg_tys tycon
{-