X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FMkId.lhs;h=8562ea7ba286f7a4fc51b8c3cf0b884fd539f2db;hb=973539a893ff512a3e9ac408c1583a080de0abf4;hp=c112a2ab0e2a9f3da88a009885325a47689e3a47;hpb=53ce311e219dcccf4d205f573c16e23a5c44265e;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/MkId.lhs b/ghc/compiler/basicTypes/MkId.lhs
index c112a2a..8562ea7 100644
--- a/ghc/compiler/basicTypes/MkId.lhs
+++ b/ghc/compiler/basicTypes/MkId.lhs
@@ -72,8 +72,8 @@ import Id		( idType, mkGlobalId, mkVanillaGlobal, mkSysLocal,
 import IdInfo		( IdInfo, noCafNoTyGenIdInfo,
 			  setUnfoldingInfo, 
 			  setArityInfo, setSpecInfo, setCafInfo,
-			  newStrictnessFromOld, setAllStrictnessInfo,
-			  GlobalIdDetails(..), CafInfo(..), CprInfo(..)
+			  setAllStrictnessInfo,
+			  GlobalIdDetails(..), CafInfo(..)
 			)
 import NewDemand	( mkStrictSig, strictSigResInfo, DmdResult(..),
 			  mkTopDmdType, topDmd, evalDmd, lazyDmd, 
@@ -640,7 +640,7 @@ mkPrimOpId :: PrimOp -> Id
 mkPrimOpId prim_op 
   = id
   where
-    (tyvars,arg_tys,res_ty, arity, strict_info) = primOpSig prim_op
+    (tyvars,arg_tys,res_ty, arity, strict_sig) = primOpSig prim_op
     ty   = mkForAllTys tyvars (mkFunTys arg_tys res_ty)
     name = mkPrimOpIdName prim_op
     id   = mkGlobalId (PrimOpId prim_op) name ty info
@@ -648,8 +648,7 @@ mkPrimOpId prim_op
     info = noCafNoTyGenIdInfo
 	   `setSpecInfo`	rules
 	   `setArityInfo` 	arity
-	   `setAllStrictnessInfo`	Just (newStrictnessFromOld name arity strict_info NoCPRInfo)
-	-- Until we modify the primop generation code
+	   `setAllStrictnessInfo` Just strict_sig
 
     rules = foldl (addRule id) emptyCoreRules (primOpRules prim_op)