X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FstgSyn%2FCoreToStg.lhs;h=370393b2167334a10b6965029850dcf507a82ff5;hb=d2ce0f52d42edf32bb9f13796e6ba6edba8bd516;hp=f49f092b64031e12b22501bcf161c898cf0cf95f;hpb=7854ec4b11e117f8514553890851d14a66690fbb;p=ghc-hetmet.git

diff --git a/compiler/stgSyn/CoreToStg.lhs b/compiler/stgSyn/CoreToStg.lhs
index f49f092..370393b 100644
--- a/compiler/stgSyn/CoreToStg.lhs
+++ b/compiler/stgSyn/CoreToStg.lhs
@@ -445,7 +445,7 @@ mkStgAltType bndr alts
    _is_poly_alt_tycon tc
 	=  isFunTyCon tc
         || isPrimTyCon tc   -- "Any" is lifted but primitive
-	|| isOpenTyCon tc   -- Type family; e.g. arising from strict
+	|| isFamilyTyCon tc   -- Type family; e.g. arising from strict
 			    -- function application where argument has a
 			    -- type-family type
 
@@ -534,7 +534,7 @@ coreToStgApp _ f args = do
 				    StgOpApp (StgPrimOp op) args' res_ty
 
 		-- A call to some primitive Cmm function.
-		FCallId (CCall (CCallSpec (PackageTarget lbl (Just pkgId)) PrimCallConv _))
+		FCallId (CCall (CCallSpec (StaticTarget lbl (Just pkgId)) PrimCallConv _))
 		                 -> ASSERT( saturated )
 				    StgOpApp (StgPrimCallOp (PrimCall lbl pkgId)) args' res_ty
 
@@ -1120,7 +1120,7 @@ myCollectArgs expr
     go (Cast e _)       as = go e as
     go (Note _ e)       as = go e as
     go (Lam b e)        as
-       | isTyVar b         = go e as	-- Note [Collect args]
+       | isTyCoVar b         = go e as	-- Note [Collect args]
     go _                _  = pprPanic "CoreToStg.myCollectArgs" (ppr expr)
 \end{code}