[commit: ghc] master: TysWiredIn: Use dataConWorkerUnique instead of incrUnique (9306db0)
git at git.haskell.org
git at git.haskell.org
Wed Aug 31 18:29:32 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/9306db051ff5835b453d55f32783d081ac79ec28/ghc
>---------------------------------------------------------------
commit 9306db051ff5835b453d55f32783d081ac79ec28
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Wed Aug 31 13:53:04 2016 -0400
TysWiredIn: Use dataConWorkerUnique instead of incrUnique
Test Plan: Validate
Reviewers: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2465
>---------------------------------------------------------------
9306db051ff5835b453d55f32783d081ac79ec28
compiler/basicTypes/Unique.hs | 1 -
compiler/prelude/TysWiredIn.hs | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/compiler/basicTypes/Unique.hs b/compiler/basicTypes/Unique.hs
index 0bbf861..c933d61 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 1028478..b334967 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
{-
More information about the ghc-commits
mailing list