Merge in new code generator branch.

[ghc-hetmet.git] / compiler / nativeGen / RegAlloc / Graph / SpillClean.hs

diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs b/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
index ef4f088..38c33b7 100644 (file)
--- a/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
@@ -33,7 +33,7 @@ import Instruction
 import Reg
 
 import BlockId
 import Reg
 
 import BlockId

-import Cmm
+import OldCmm

 import UniqSet
 import UniqFM
 import Unique
 import UniqSet
 import UniqFM
 import Unique

@@ -47,7 +47,6 @@ import Data.Set                       (Set)
 import qualified Data.Map      as Map
 import qualified Data.Set      as Set
 
 import qualified Data.Map      as Map
 import qualified Data.Set      as Set
 

-

 --
 type Slot = Int
 
 --
 type Slot = Int
 

@@ -291,10 +290,10 @@ cleanTopBackward cmm
        CmmData{}
         -> return cmm
        
        CmmData{}
         -> return cmm
        

-       CmmProc info label params sccs
+       CmmProc info label sccs

         | LiveInfo _ _ _ liveSlotsOnEntry <- info
         -> do  sccs'   <- mapM (mapSCCM (cleanBlockBackward liveSlotsOnEntry)) sccs
         | LiveInfo _ _ _ liveSlotsOnEntry <- info
         -> do  sccs'   <- mapM (mapSCCM (cleanBlockBackward liveSlotsOnEntry)) sccs

-               return  $ CmmProc info label params sccs' 
+               return  $ CmmProc info label sccs' 

 
 
 cleanBlockBackward 
 
 
 cleanBlockBackward