Added stack checks to the CPS algorithm

[ghc-hetmet.git] / compiler / cmm / CmmProcPoint.hs

diff --git a/compiler/cmm/CmmProcPoint.hs b/compiler/cmm/CmmProcPoint.hs
index c814862..15a723a 100644 (file)
--- a/compiler/cmm/CmmProcPoint.hs
+++ b/compiler/cmm/CmmProcPoint.hs
@@ -5,7 +5,7 @@ module CmmProcPoint (
 #include "HsVersions.h"
 
 import Cmm
-import CmmCPSData
+import CmmBrokenBlock
 import Dataflow
 
 import UniqSet
@@ -39,15 +39,16 @@ calculateOwnership blocks_ufm proc_points blocks =
       unknown_block = panic "unknown BlockId in selectStackFormat"
 
 calculateProcPoints :: [BrokenBlock] -> UniqSet BlockId
-calculateProcPoints blocks = calculateProcPoints' init_proc_points blocks
+calculateProcPoints blocks =
+    calculateProcPoints' init_proc_points blocks
     where
       init_proc_points = mkUniqSet $
                          map brokenBlockId $
                          filter always_proc_point blocks
       always_proc_point BrokenBlock {
-                              brokenBlockEntry = FunctionEntry _ _ } = True
+                              brokenBlockEntry = FunctionEntry _ _ _ } = True
       always_proc_point BrokenBlock {
-                              brokenBlockEntry = ContinuationEntry _ } = True
+                              brokenBlockEntry = ContinuationEntry _ _ } = True
       always_proc_point _ = False
 
 calculateProcPoints' :: UniqSet BlockId -> [BrokenBlock] -> UniqSet BlockId