[commit: ghc] ghc-7.2: Don't export SRT labels (51f9121)

Ian Lynagh igloo at earth.li
Wed Jul 6 00:11:27 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.2

http://hackage.haskell.org/trac/ghc/changeset/51f91215d4047f3399bd7defaad2580ceaa53c30

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

commit 51f91215d4047f3399bd7defaad2580ceaa53c30
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Mon Jul 4 17:44:43 2011 +0100

    Don't export SRT labels

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

 compiler/cmm/CLabel.hs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 3451c7d..fa2cb48 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -691,7 +691,7 @@ externallyVisibleCLabel (PlainModuleInitLabel _)= True
 externallyVisibleCLabel (RtsLabel _)            = True
 externallyVisibleCLabel (CmmLabel _ _ _)	= True
 externallyVisibleCLabel (ForeignLabel{})	= True
-externallyVisibleCLabel (IdLabel name _ _)	= isExternalName name
+externallyVisibleCLabel (IdLabel name _ info)	= isExternalName name && externallyVisibleIdLabel info
 externallyVisibleCLabel (CC_Label _)		= True
 externallyVisibleCLabel (CCS_Label _)		= True
 externallyVisibleCLabel (DynamicLinkerLabel _ _)  = False
@@ -699,6 +699,10 @@ externallyVisibleCLabel (HpcTicksLabel _)	= True
 externallyVisibleCLabel (LargeBitmapLabel _)    = False
 externallyVisibleCLabel (LargeSRTLabel _)	= False
 
+externallyVisibleIdLabel :: IdLabelInfo -> Bool
+externallyVisibleIdLabel SRT = False
+externallyVisibleIdLabel _   = True
+
 -- -----------------------------------------------------------------------------
 -- Finding the "type" of a CLabel 
 





More information about the Cvs-ghc mailing list