X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmm.hs;h=52809da5028614c1e6ad9924b3601156590ff992;hb=e95ee1f718c6915c478005aad8af81705357d6ab;hp=ae4fa1b623532199ee21a87f73e516d26b91e61a;hpb=31a9d04804d9cacda35695c5397590516b964964;p=ghc-hetmet.git

diff --git a/compiler/codeGen/StgCmm.hs b/compiler/codeGen/StgCmm.hs
index ae4fa1b..52809da 100644
--- a/compiler/codeGen/StgCmm.hs
+++ b/compiler/codeGen/StgCmm.hs
@@ -41,7 +41,6 @@ import IdInfo
 import Type
 import DataCon
 import Name
-import OccName
 import TyCon
 import Module
 import ErrUtils
@@ -113,7 +112,7 @@ cgTopBinding dflags (StgRec pairs, _srts)
   = do	{ let (bndrs, rhss) = unzip pairs
 	; bndrs' <- mapFCs (maybeExternaliseId dflags) bndrs
 	; let pairs' = zip bndrs' rhss
-	; fixC (\ new_binds -> do 
+	; fixC_(\ new_binds -> do 
 		{ addBindsC new_binds
 		; mapFCs ( \ (b,e) -> cgTopRhs b e ) pairs' })
 	; return () }
@@ -330,11 +329,12 @@ cgDataCon data_con
 	    (dyn_cl_info, arg_things) = layOutDynConstr data_con arg_reps
 
 	    emit_info cl_info ticky_code
-		= emitClosureAndInfoTable cl_info [] $ mk_code ticky_code
+		= emitClosureAndInfoTable cl_info NativeDirectCall []
+                                        $ mk_code ticky_code
 
 	    mk_code ticky_code
 	      = 	-- NB: We don't set CC when entering data (WDP 94/06)
- 	        do { ticky_code
+ 	        do { _ <- ticky_code
 		   ; ldvEnter (CmmReg nodeReg)
 		   ; tickyReturnOldCon (length arg_things)
 		   ; emitReturn [cmmOffsetB (CmmReg nodeReg)