[project @ 2004-10-04 05:54:04 by dons]

[ghc-hetmet.git] / ghc / compiler / codeGen / CgCon.lhs

diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs
index 3cd67e4..7dc5d75 100644 (file)
--- a/ghc/compiler/codeGen/CgCon.lhs
+++ b/ghc/compiler/codeGen/CgCon.lhs
@@ -45,7 +45,7 @@ import CostCentre     ( currentOrSubsumedCCS, dontCareCCS, CostCentreStack,
                          currentCCS )
 import Constants       ( mIN_INTLIKE, mAX_INTLIKE, mIN_CHARLIKE, mAX_CHARLIKE )
 import TyCon           ( TyCon, tyConDataCons, isEnumerationTyCon, tyConName )
-import DataCon         ( DataCon, dataConRepArgTys, isNullaryDataCon,
+import DataCon         ( DataCon, dataConRepArgTys, isNullaryRepDataCon,
                          isUnboxedTupleCon, dataConWorkId, 
                          dataConName, dataConRepArity
                        )
@@ -296,7 +296,7 @@ cgReturnDataCon con amodes
              ->    -- Ho! We know the constructor so we can
                    -- go straight to the right alternative
                 case assocMaybe alts (dataConTagZ con) of {
-                   Just join_lbl -> build_it_then (jump_to join_lbl) ;
+                   Just join_lbl -> build_it_then (jump_to join_lbl);
                    Nothing
                        -- Special case!  We're returning a constructor to the default case
                        -- of an enclosing case.  For example:
@@ -317,7 +317,7 @@ cgReturnDataCon con amodes
               | otherwise -> build_it_then (emitKnownConReturnCode con)
        }
   where
-    jump_to lbl = stmtC (CmmJump (CmmLit (CmmLabel lbl)) [])
+    jump_to lbl = stmtC (CmmJump (CmmLit lbl) [])
     build_it_then return_code
       = do {   -- BUILD THE OBJECT IN THE HEAP
                -- The first "con" says that the name bound to this
@@ -404,7 +404,7 @@ static closure, for a constructor.
 cgDataCon :: DataCon -> Code
 cgDataCon data_con
   = do {     -- Don't need any dynamic closure code for zero-arity constructors
-         whenC (not (isNullaryDataCon data_con))
+         whenC (not (isNullaryRepDataCon data_con))
                (emit_info dyn_cl_info tickyEnterDynCon)
 
                -- Dynamic-Closure first, to reduce forward references