add the constructor name field to the info table for RTS constructors

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index bd35072..2b7605e 100644 (file)
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -224,7 +224,7 @@ info        :: { ExtFCode (CLabel, [CmmLit],[CmmLit]) }
        
        | 'INFO_TABLE_CONSTR' '(' NAME ',' INT ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
                -- ptrs, nptrs, tag, closure type, description, type
-               { stdInfo $3 $5 $7 $9 $11 $13 $15 }
+               { conInfo $3 $5 $7 $9 $11 $13 $15 }
        
        | 'INFO_TABLE_SELECTOR' '(' NAME ',' INT ',' INT ',' STRING ',' STRING ')'
                -- selector, closure type, description, type
@@ -716,6 +716,13 @@ stdInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str =
   basicInfo name (packHalfWordsCLit ptrs nptrs) 
        srt_bitmap cl_type desc_str ty_str
 
+conInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str = do
+  (lbl, info1, _) <- basicInfo name (packHalfWordsCLit ptrs nptrs) 
+                       srt_bitmap cl_type desc_str ty_str
+  desc_lit <- code $ mkStringCLit desc_str
+  let desc_field = makeRelativeRefTo lbl desc_lit
+  return (lbl, info1, [desc_field])
+
 basicInfo name layout srt_bitmap cl_type desc_str ty_str = do
   lit1 <- if opt_SccProfilingOn 
                   then code $ mkStringCLit desc_str

diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
index da48005..0d6925b 100644 (file)
--- a/compiler/codeGen/CgInfoTbls.hs
+++ b/compiler/codeGen/CgInfoTbls.hs
@@ -21,7 +21,7 @@ module CgInfoTbls (
        getConstrTag,
        infoTable, infoTableClosureType,
        infoTablePtrs, infoTableNonPtrs,
-       funInfoTable
+       funInfoTable, makeRelativeRefTo
   ) where