X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAlloc%2FGraph%2FSpillCost.hs;h=330a410312f9d2d631707c60651c3b7b5ed8349b;hb=f8f0e76ad302fda30196ebc9230e5fcbc97be537;hp=0dc25f58d219ab7476c5eb6e28779b47f0a1dd39;hpb=09732d3c8ba3b8ab3ebfc5596cc8fdd7f2bb100f;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
index 0dc25f5..330a410 100644
--- a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
@@ -24,7 +24,7 @@ import Reg
 import GraphBase
 
 import BlockId
-import Cmm
+import OldCmm
 import UniqFM
 import UniqSet
 import Digraph		(flattenSCCs)
@@ -71,7 +71,7 @@ slurpSpillCostInfo cmm
 	= execState (countCmm cmm) zeroSpillCostInfo
  where
 	countCmm CmmData{}		= return ()
-	countCmm (CmmProc info _ _ sccs)
+	countCmm (CmmProc info _ sccs)
 		= mapM_ (countBlock info)
 		$ flattenSCCs sccs
 
@@ -79,7 +79,7 @@ slurpSpillCostInfo cmm
 	--	the info table from the CmmProc
  	countBlock info (BasicBlock blockId instrs)
 		| LiveInfo _ _ (Just blockLive) _ <- info
-		, Just rsLiveEntry  <- lookupBlockEnv blockLive blockId
+		, Just rsLiveEntry  <- mapLookup blockId blockLive
 		, rsLiveEntry_virt  <- takeVirtuals rsLiveEntry
 		= countLIs rsLiveEntry_virt instrs