X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmBind.hs;h=dbeab2b337503363c6dd690c336e8256dee8818a;hb=b48fc016e9b15c465ba2c2f1d42b6221bcd19b45;hp=b4415eb1f0340132e87ad3d1f71e47be6dd9b57c;hpb=5892af0e08fdb890b5a0b9a64346d9f7773a6ed8;p=ghc-hetmet.git

diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs
index b4415eb..dbeab2b 100644
--- a/compiler/codeGen/StgCmmBind.hs
+++ b/compiler/codeGen/StgCmmBind.hs
@@ -17,7 +17,6 @@ module StgCmmBind (
 
 import StgCmmExpr
 import StgCmmMonad
-import StgCmmExpr
 import StgCmmEnv
 import StgCmmCon
 import StgCmmHeap
@@ -394,21 +393,22 @@ closureCodeBody top_lvl bndr cl_info cc args arity body fv_details
 
 	-- Emit the main entry code
         ; emitClosureProcAndInfoTable top_lvl bndr cl_info args $ \(node, arg_regs) -> do
-    	        -- Emit the slow-entry code (for entering a closure through a PAP)
-	        { mkSlowEntryCode cl_info arg_regs
-
-		; let lf_info = closureLFInfo cl_info
-		      node_points = nodeMustPointToIt lf_info
-		; tickyEnterFun cl_info
-		; whenC node_points (ldvEnterClosure cl_info)
-		; granYield arg_regs node_points
-
-			-- Main payload
-		; entryHeapCheck node arity arg_regs $ do
-		{ enterCostCentre cl_info cc body
+                    -- Emit the slow-entry code (for entering a closure through a PAP)
+                { mkSlowEntryCode cl_info arg_regs
+
+                ; let lf_info = closureLFInfo cl_info
+                      node_points = nodeMustPointToIt lf_info
+                ; tickyEnterFun cl_info
+                ; whenC node_points (ldvEnterClosure cl_info)
+                ; granYield arg_regs node_points
+
+                        -- Main payload
+                ; entryHeapCheck (if node_points then Just node else Nothing) arity arg_regs $ do
+                { enterCostCentre cl_info cc body
                 ; fv_bindings <- mapM bind_fv fv_details
-		; load_fvs node lf_info fv_bindings -- Load free vars out of closure *after*
-		; cgExpr body }}	    -- heap check, to reduce live vars over check
+                -- Load free vars out of closure *after*
+                ; if node_points then load_fvs node lf_info fv_bindings else return ()
+                ; cgExpr body }}	    -- heap check, to reduce live vars over check
 
   }
 
@@ -459,10 +459,11 @@ thunkCode cl_info fv_details cc node arity body
 	; granThunk node_points
 
         -- Heap overflow check
-	; entryHeapCheck node arity [] $ do
+	; entryHeapCheck (if node_points then Just node else Nothing) arity [] $ do
       	{	-- Overwrite with black hole if necessary
 		-- but *after* the heap-overflow check
-	  whenC (blackHoleOnEntry cl_info && node_points)
+	  dflags <- getDynFlags
+	; whenC (blackHoleOnEntry dflags cl_info && node_points)
  	        (blackHoleIt cl_info)
 
 		-- Push update frame