[commit: ghc] master: Revert "Properly generate info tables for static closures in C--." (126b0c4)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/126b0c410f2596d1bf7ba6a1af872487c5bb2b52/ghc

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

commit 126b0c410f2596d1bf7ba6a1af872487c5bb2b52
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Oct 20 16:01:39 2014 -0700

    Revert "Properly generate info tables for static closures in C--."
    
    This reverts commit 178eb9060f369b216f3f401196e28eab4af5624d.


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

126b0c410f2596d1bf7ba6a1af872487c5bb2b52
 compiler/cmm/CmmParse.y | 3 +--
 compiler/cmm/SMRep.lhs  | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 31b1198..3bd0053 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -496,8 +496,7 @@ info    :: { CmmParse (CLabel, Maybe CmmInfoTable, [LocalReg]) }
                           ty  = Constr (fromIntegral $9)  -- Tag
                                        (stringToWord8s $13)
                           rep = mkRTSRep (fromIntegral $11) $
-                                  mkHeapRep dflags (fromIntegral $11 == cONSTR_NOCAF_STATIC)
-                                                  (fromIntegral $5)
+                                  mkHeapRep dflags False (fromIntegral $5)
                                                   (fromIntegral $7) ty
                       return (mkCmmEntryLabel pkg $3,
                               Just $ CmmInfoTable { cit_lbl = mkCmmInfoLabel pkg $3
diff --git a/compiler/cmm/SMRep.lhs b/compiler/cmm/SMRep.lhs
index 1d0b9b0..53c9d0a 100644
--- a/compiler/cmm/SMRep.lhs
+++ b/compiler/cmm/SMRep.lhs
@@ -41,7 +41,7 @@ module SMRep (
 
         -- ** RTS closure types
         rtsClosureType, rET_SMALL, rET_BIG,
-        aRG_GEN, aRG_GEN_BIG, cONSTR_NOCAF_STATIC,
+        aRG_GEN, aRG_GEN_BIG,
 
         -- ** Arrays
         card, cardRoundUp, cardTableSizeB, cardTableSizeW,
@@ -473,12 +473,11 @@ rtsClosureType rep
       _ -> panic "rtsClosureType"
 
 -- We export these ones
-rET_SMALL, rET_BIG, aRG_GEN, aRG_GEN_BIG, cONSTR_NOCAF_STATIC :: Int
+rET_SMALL, rET_BIG, aRG_GEN, aRG_GEN_BIG :: Int
 rET_SMALL   = RET_SMALL
 rET_BIG     = RET_BIG
 aRG_GEN     = ARG_GEN
 aRG_GEN_BIG = ARG_GEN_BIG
-cONSTR_NOCAF_STATIC = CONSTR_NOCAF_STATIC
 \end{code}
 
 Note [Static NoCaf constructors]