X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FGraphOps.hs;h=1fa4199aa22c9b2ac99ca9cda8c1b68adb2761f5;hp=87e77bfc83b15297de0aaaa007f71194854af07d;hb=f8f0e76ad302fda30196ebc9230e5fcbc97be537;hpb=f9288086f935c97812b2d80defcff38baf7b6a6c

diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index 87e77bf..1fa4199 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -61,14 +61,14 @@ addNode k node graph
  	-- add back conflict edges from other nodes to this one
  	map_conflict	
 		= foldUniqSet 
-			(adjustUFM (\n -> n { nodeConflicts = addOneToUniqSet (nodeConflicts n) k}))
+			(adjustUFM_C (\n -> n { nodeConflicts = addOneToUniqSet (nodeConflicts n) k}))
 			(graphMap graph)
 			(nodeConflicts node)
 			
 	-- add back coalesce edges from other nodes to this one
 	map_coalesce
 		= foldUniqSet
-			(adjustUFM (\n -> n { nodeCoalesce = addOneToUniqSet (nodeCoalesce n) k}))
+			(adjustUFM_C (\n -> n { nodeCoalesce = addOneToUniqSet (nodeCoalesce n) k}))
 			map_conflict
 			(nodeCoalesce node)
 	
@@ -420,8 +420,7 @@ freezeNode
 freezeNode k
   = graphMapModify
   $ \fm ->
-    let
-    	-- freeze all the edges in the node to be frozen
+    let	-- freeze all the edges in the node to be frozen
     	Just node = lookupUFM fm k
 	node'	= node
 		{ nodeCoalesce		= emptyUniqSet }
@@ -431,11 +430,11 @@ freezeNode k
 	-- update back edges pointing to this node
 	freezeEdge k node
 	 = if elementOfUniqSet k (nodeCoalesce node)
-	 	then node
-			{ nodeCoalesce		= delOneFromUniqSet (nodeCoalesce node) k }
-		else	panic "GraphOps.freezeNode: edge to freeze wasn't in the coalesce set"
+	 	then node { nodeCoalesce = delOneFromUniqSet (nodeCoalesce node) k }
+		else node 	-- panic "GraphOps.freezeNode: edge to freeze wasn't in the coalesce set"
+				-- If the edge isn't actually in the coelesce set then just ignore it.
 
-	fm2	= foldUniqSet (adjustUFM (freezeEdge k)) fm1
+	fm2	= foldUniqSet (adjustUFM_C (freezeEdge k)) fm1
 	   		$ nodeCoalesce node
 
     in	fm2
@@ -605,7 +604,7 @@ setColor
 	
 setColor u color
  	= graphMapModify
- 	$ adjustUFM
+ 	$ adjustUFM_C
 		(\n -> n { nodeColor = Just color })
 		u 
 	
@@ -622,13 +621,14 @@ adjustWithDefaultUFM f def k map
 		map
 		k def
 		
-{-# INLINE adjustUFM #-}
-adjustUFM 
+-- Argument order different from UniqFM's adjustUFM
+{-# INLINE adjustUFM_C #-}
+adjustUFM_C 
 	:: Uniquable k
 	=> (a -> a)
 	-> k -> UniqFM a -> UniqFM a
 
-adjustUFM f k map
+adjustUFM_C f k map
  = case lookupUFM map k of
  	Nothing	-> map
 	Just a	-> addToUFM map k (f a)