X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FRegAllocLinear.hs;h=918d7c64c5d578e3b0cc60bc02311741d2887b3d;hb=987530c1d23a59b986a54ba2bc9e198061fdcae9;hp=bc538a82fa3f3f45da623d9afa3b703f924fce22;hpb=dafaa80f1f849ba18bb2852914b74f86c0331bba;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/RegAllocLinear.hs b/compiler/nativeGen/RegAllocLinear.hs
index bc538a8..918d7c6 100644
--- a/compiler/nativeGen/RegAllocLinear.hs
+++ b/compiler/nativeGen/RegAllocLinear.hs
@@ -88,6 +88,7 @@ module RegAllocLinear (
 
 #include "HsVersions.h"
 
+import BlockId
 import MachRegs
 import MachInstrs
 import RegAllocInfo
@@ -796,7 +797,7 @@ joinToTargets block_live new_blocks instr (dest:dests) = do
 	       delta <- getDeltaR
 	       
                let graph = makeRegMovementGraph adjusted_assig dest_assig
-	       let sccs  = stronglyConnCompR graph
+	       let sccs  = stronglyConnCompFromEdgedVerticesR graph
 	       fixUpInstrs <- mapM (handleComponent delta instr) sccs
 
 	       block_id <- getUniqueR
@@ -808,7 +809,7 @@ joinToTargets block_live new_blocks instr (dest:dests) = do
 	       joinToTargets block_live (block : new_blocks) instr' dests
 
 
--- | Construct a graph of register/spill movements.
+-- | Construct a graph of register\/spill movements.
 --
 -- 	We cut some corners by
 -- 	a) not handling cyclic components
@@ -826,7 +827,7 @@ makeRegMovementGraph adjusted_assig dest_assig
 	 = expandNode vreg src
 	 $ lookupWithDefaultUFM_Directly
            	dest_assig
-                (panic "RegisterAlloc.joinToTargets")
+                (panic "RegAllocLinear.makeRegMovementGraph")
 		vreg
 
    in	[ node 	| (vreg, src) <- ufmToList adjusted_assig
@@ -900,7 +901,7 @@ handleComponent delta instr (CyclicSCC ((vreg, (InReg sreg),dsts):rest))
  = do
 	spill_id <- getUniqueR
 	(_, slot) 		<- spillR (RealReg sreg) spill_id
-	remainingFixUps 	<- mapM (handleComponent delta instr) (stronglyConnCompR rest)
+	remainingFixUps 	<- mapM (handleComponent delta instr) (stronglyConnCompFromEdgedVerticesR rest)
 	restoreAndFixInstr 	<- getRestoreMoves dsts slot
 	return ([instr] ++ concat remainingFixUps ++ restoreAndFixInstr)