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

diff --git a/compiler/stgSyn/CoreToStg.lhs b/compiler/stgSyn/CoreToStg.lhs
index d11dc75..b2d7257 100644
--- a/compiler/stgSyn/CoreToStg.lhs
+++ b/compiler/stgSyn/CoreToStg.lhs
@@ -12,7 +12,8 @@ module CoreToStg ( coreToStg, coreExprToStg ) where
 #include "HsVersions.h"
 
 import CoreSyn
-import CoreUtils	( rhsIsStatic, manifestArity, exprType, findDefault )
+import CoreUtils	( rhsIsStatic, exprType, findDefault )
+import CoreArity	( manifestArity )
 import StgSyn
 
 import Type
@@ -33,6 +34,8 @@ import Outputable
 import MonadUtils
 import FastString
 import Util
+import ForeignCall
+import PrimOp		( PrimCall(..) )
 \end{code}
 
 %************************************************************************
@@ -523,10 +526,15 @@ coreToStgApp _ f args = do
 	--	   two regardless.
 
 	res_ty = exprType (mkApps (Var f) args)
-	app = case globalIdDetails f of
+	app = case idDetails f of
       		DataConWorkId dc | saturated -> StgConApp dc args'
 	        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
 		FCallId call	 -> ASSERT( saturated )
 				    StgOpApp (StgFCallOp call (idUnique f)) args' res_ty
                 TickBoxOpId {}   -> pprPanic "coreToStg TickBox" $ ppr (f,args')