X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FstgSyn%2FCoreToStg.lhs;h=edda60300710a82d4de874124aa8740199820f42;hp=b2d725796d1250eeec37179d62e72b849f91c966;hb=6e9c0431a7cf2bf1a48f01db48c6a1d41fe15a09;hpb=cbbee4e8727c583daf32d9bf17f00afaa839ef10

diff --git a/compiler/stgSyn/CoreToStg.lhs b/compiler/stgSyn/CoreToStg.lhs
index b2d7257..edda603 100644
--- a/compiler/stgSyn/CoreToStg.lhs
+++ b/compiler/stgSyn/CoreToStg.lhs
@@ -437,7 +437,7 @@ mkStgAltType bndr alts
 		    | isUnLiftedTyCon tc     -> PrimAlt tc
 		    | isHiBootTyCon tc	     -> look_for_better_tycon
 		    | isAlgTyCon tc 	     -> AlgAlt tc
-		    | otherwise		     -> ASSERT( _is_poly_alt_tycon tc )
+		    | otherwise		     -> ASSERT2( _is_poly_alt_tycon tc, ppr tc )
 						PolyAlt
 	Nothing				     -> PolyAlt
 
@@ -528,15 +528,20 @@ coreToStgApp _ f args = do
 	res_ty = exprType (mkApps (Var f) args)
 	app = case idDetails f of
       		DataConWorkId dc | saturated -> StgConApp dc args'
+
+		-- Some primitive operator that might be implemented as a library call.
 	        PrimOpId op  	 -> ASSERT( saturated )
 				    StgOpApp (StgPrimOp op) args' res_ty
-		FCallId (CCall (CCallSpec (StaticTarget lbl) PrimCallConv _))
-                                 -- prim calls are represented as FCalls in core,
-                                 -- but in stg we distinguish them
-				 -> ASSERT( saturated )
-                                    StgOpApp (StgPrimCallOp (PrimCall lbl)) args' res_ty
+
+		-- A call to some primitive Cmm function.
+		FCallId (CCall (CCallSpec (StaticTarget lbl (Just pkgId)) PrimCallConv _))
+		                 -> ASSERT( saturated )
+				    StgOpApp (StgPrimCallOp (PrimCall lbl pkgId)) args' res_ty
+
+		-- A regular foreign call.
 		FCallId call	 -> ASSERT( saturated )
 				    StgOpApp (StgFCallOp call (idUnique f)) args' res_ty
+
                 TickBoxOpId {}   -> pprPanic "coreToStg TickBox" $ ppr (f,args')
 		_other      	 -> StgApp f args'