X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDsBinds.lhs;h=27d41476e1ce993ad58bd843ab9cd40f77f9b293;hp=9fb2eaf37e559ef9ae0f6b7e999bd3f50e6a15c5;hb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;hpb=49c98d143c382a1341e1046f5ca00819a25691ba

diff --git a/compiler/deSugar/DsBinds.lhs b/compiler/deSugar/DsBinds.lhs
index 9fb2eaf..27d4147 100644
--- a/compiler/deSugar/DsBinds.lhs
+++ b/compiler/deSugar/DsBinds.lhs
@@ -28,6 +28,7 @@ import HsSyn		-- lots of things
 import CoreSyn		-- lots of things
 import CoreUtils
 
+import TcHsSyn		( mkArbitraryType )	-- Mis-placed?
 import OccurAnal
 import CostCentre
 import Module
@@ -88,9 +89,10 @@ dsHsBind auto_scc rest (VarBind var expr)
     addDictScc var core_expr	`thenDs` \ core_expr' ->
     returnDs ((var, core_expr') : rest)
 
-dsHsBind auto_scc rest (FunBind { fun_id = L _ fun, fun_matches = matches, fun_co_fn = co_fn })
+dsHsBind auto_scc rest (FunBind { fun_id = L _ fun, fun_matches = matches, fun_co_fn = co_fn, fun_tick = tick })
   = matchWrapper (FunRhs (idName fun)) matches		`thenDs` \ (args, body) ->
-    dsCoercion co_fn (return (mkLams args body))	`thenDs` \ rhs ->
+    mkOptTickBox tick body 				`thenDs` \ body' ->
+    dsCoercion co_fn (return (mkLams args body'))	`thenDs` \ rhs ->
     returnDs ((fun,rhs) : rest)
 
 dsHsBind auto_scc rest (PatBind { pat_lhs = pat, pat_rhs = grhss, pat_rhs_ty = ty })
@@ -178,7 +180,7 @@ dsHsBind auto_scc rest (AbsBinds all_tyvars dicts exports binds)
 
 	      mk_bind ((tyvars, global, local, prags), n)	-- locals !! n == local
 	        = 	-- Need to make fresh locals to bind in the selector, because
-		      	-- some of the tyvars will be bound to voidTy
+		      	-- some of the tyvars will be bound to 'Any'
 		  do { locals' <- newSysLocalsDs (map substitute local_tys)
 		     ; tup_id  <- newSysLocalDs  (substitute tup_ty)
 		     ; mb_specs <- mapM (dsSpec all_tyvars dicts tyvars global local core_bind) 
@@ -191,7 +193,7 @@ dsHsBind auto_scc rest (AbsBinds all_tyvars dicts exports binds)
 		     ; returnDs ((global', rhs) : spec_binds) }
 	        where
 	          mk_ty_arg all_tyvar | all_tyvar `elem` tyvars = mkTyVarTy all_tyvar
-	      			      | otherwise		= voidTy
+	      			      | otherwise		= mkArbitraryType all_tyvar
 	          ty_args    = map mk_ty_arg all_tyvars
 	          substitute = substTyWith all_tyvars ty_args
 
@@ -266,11 +268,11 @@ dsSpec all_tvs dicts tvs poly_id mono_id mono_bind
 				(mkVarApps (Var spec_id) bndrs)
 	}
   where
-	-- Bind to voidTy any of all_ptvs that aren't 
+	-- Bind to Any any of all_ptvs that aren't 
 	-- relevant for this particular function 
     fix_up body | null void_tvs = body
 		| otherwise	= mkTyApps (mkLams void_tvs body) 
-					   (map (const voidTy) void_tvs)
+					   (map mkArbitraryType void_tvs)
     void_tvs = all_tvs \\ tvs
 
     msg = hang (ptext SLIT("Specialisation too complicated to desugar; ignored"))