minor changes to Cmm left over from September 2007

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

diff --git a/compiler/cmm/StackColor.hs b/compiler/cmm/StackColor.hs
index e3b6ba8..6de602a 100644 (file)
--- a/compiler/cmm/StackColor.hs
+++ b/compiler/cmm/StackColor.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -Wall -fno-warn-name-shadowing #-}
+
 module StackColor where
 
 import StackPlacements
@@ -9,8 +9,8 @@ import DFMonad
 import qualified GraphOps
 import MachOp
 import ZipCfg
-import ZipCfgCmm
-import ZipDataflow
+import ZipCfgCmmRep
+import ZipDataflow0
 
 import Maybes
 import Panic
@@ -23,7 +23,7 @@ type M = ExtendWithSpills Middle
 
 foldConflicts :: (RegSet -> a -> a) -> a -> LGraph M Last -> a
 foldConflicts f z g =
-  let env = runDFA dualLiveLattice (run_b_anal dualLiveness g >> allFacts)
+  let env = runDFA dualLiveLattice (run_b_anal dualLiveness g >> getAllFacts)
       lookup id = lookupBlockEnv env id `orElse` fact_bot dualLiveLattice
       f' dual z = f (on_stack dual) z
   in  fold_edge_facts_b f' dualLiveness g lookup z