[commit: ghc] wip/cross-constr-cse: more to fix (fd301b6)

git at git.haskell.org git at git.haskell.org
Sun Jul 30 13:51:19 UTC 2017


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

On branch  : wip/cross-constr-cse
Link       : http://ghc.haskell.org/trac/ghc/changeset/fd301b69096415f7bb01f95c2ea2d22f12d4991c/ghc

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

commit fd301b69096415f7bb01f95c2ea2d22f12d4991c
Author: Gabor Greif <ggreif at gmail.com>
Date:   Sat Jul 29 23:05:24 2017 +0200

    more to fix


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

fd301b69096415f7bb01f95c2ea2d22f12d4991c
 compiler/simplStg/StgCse.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/simplStg/StgCse.hs b/compiler/simplStg/StgCse.hs
index c1ec54b..ee89137 100644
--- a/compiler/simplStg/StgCse.hs
+++ b/compiler/simplStg/StgCse.hs
@@ -113,8 +113,8 @@ newtype ConAppMap a = CAM { un_cam :: DNameEnv (ListMap StgArgMap a) }
 newtype LaxDataCon = Lax DataCon
 
 instance NamedThing LaxDataCon where
-  getName (Lax dc) | isVanillaDataCon dc && not hasStrict && not unpacked = mkFCallName uniq "%%%HALLO" -- FIXME
-    where uniq = mkUniqueGrimily . negate $ dataConTag dc * 10000 + length (dataConOrigArgTys dc)
+  getName (Lax dc) | isVanillaDataCon dc && not hasStrict && not unpacked = mkFCallName uniq "" -- FIXME: is there a better way?
+    where uniq = mkUniqueGrimily . negate $ dataConTag dc * 1048576 + length (dataConOrigArgTys dc) -- FIXME
           hasStrict = any (\case HsLazy -> False; _ -> True) (dataConImplBangs dc)
           unpacked = isUnboxedTupleCon dc || isUnboxedSumCon dc
   getName (Lax dc) = getName dc



More information about the ghc-commits mailing list