always generate program wide unique names for top-level binders

grin-compiler · May 17, 2020 · d6c20a0 · d6c20a0
1 parent 1464dca
commit d6c20a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/external-stg-util/src/Stg/Reconstruct.hs b/external-stg-util/src/Stg/Reconstruct.hs
@@ -76,6 +76,7 @@ reconLocalBinder BinderMap{..} SBinder{..} = -- HINT: local binders only
   , binderUnitId      = bmUnitId
   , binderModule      = bmModule
   , binderScope       = LocalScope
+  , binderTopLevel    = False
   }
 
 reconDataCon :: UnitId -> ModuleName -> TyCon -> SDataCon -> DataCon
@@ -110,6 +111,7 @@ mkTopBinder u m scope SBinder{..} =
   , binderUnitId      = u
   , binderModule      = m
   , binderScope       = scope
+  , binderTopLevel    = True
   }
 
 reconModule :: SModule -> Module

diff --git a/external-stg/Stg/Syntax.hs b/external-stg/Stg/Syntax.hs
@@ -181,6 +181,7 @@ data Binder
     , binderDetails   :: !IdDetails
     , binderUnitId    :: !UnitId
     , binderModule    :: !ModuleName
+    , binderTopLevel  :: !Bool
     }
   deriving (Eq, Ord, Generic, Show)
 
@@ -191,11 +192,20 @@ data Scope
   | ForeignExported -- ^ visible for foreign libraries
   deriving (Eq, Ord, Generic, Show)
 
+tyConUniqueName :: TyCon -> Name
+tyConUniqueName TyCon{..} = getUnitId tcUnitId <> "_" <> getModuleName tcModule <> "." <> tcName
+
+dataConUniqueName :: DataCon -> Name
+dataConUniqueName DataCon{..} = getUnitId dcUnitId <> "_" <> getModuleName dcModule <> "." <> dcName
+
 binderUniqueName :: Binder -> Name
 binderUniqueName Binder{..} = case binderScope of
-  LocalScope  -> binderName <> BS8.pack ('.' : show u)
-  GlobalScope -> getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName <> BS8.pack ('.' : show u)
-  _           -> getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName
+  LocalScope      -> if binderTopLevel
+                      then getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName <> BS8.pack ('.' : show u)
+                      else binderName <> BS8.pack ('.' : show u)
+  GlobalScope     -> getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName <> BS8.pack ('.' : show u)
+  HaskellExported -> getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName
+  ForeignExported -> getUnitId binderUnitId <> "_" <> getModuleName binderModule <> "." <> binderName
   where
     BinderId u = binderId