From fd8a24fdce1ff65c4d8f89955b8dd0dc4511ccc8 Mon Sep 17 00:00:00 2001 From: "benl@ouroborus.net" Date: Fri, 2 Jul 2010 05:33:19 +0000 Subject: [PATCH] NCG: Don't worry about trying to re-freeze missing coalescences --- compiler/utils/GraphOps.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs index 87e77bf..388b968 100644 --- a/compiler/utils/GraphOps.hs +++ b/compiler/utils/GraphOps.hs @@ -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,9 +430,9 @@ 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 $ nodeCoalesce node -- 1.7.10.4