projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add EVENT_CREATE_SPARK_THREAD to replace EVENT_SPARK_TO_THREAD
[ghc-hetmet.git]
/
compiler
/
utils
/
GraphOps.hs
diff --git
a/compiler/utils/GraphOps.hs
b/compiler/utils/GraphOps.hs
index
8183e0b
..
17c14d0
100644
(file)
--- a/
compiler/utils/GraphOps.hs
+++ b/
compiler/utils/GraphOps.hs
@@
-335,6
+335,9
@@
coalesceNodes aggressive triv graph (k1, k2)
, not $ elementOfUniqSet kMin (nodeConflicts nMax)
, not $ elementOfUniqSet kMax (nodeConflicts nMin)
, not $ elementOfUniqSet kMin (nodeConflicts nMax)
, not $ elementOfUniqSet kMax (nodeConflicts nMin)
+ -- can't coalesce the same node
+ , nodeId nMin /= nodeId nMax
+
= coalesceNodes_merge aggressive triv graph kMin kMax nMin nMax
-- don't do the coalescing after all
= coalesceNodes_merge aggressive triv graph kMin kMax nMin nMax
-- don't do the coalescing after all
@@
-350,9
+353,6
@@
coalesceNodes_merge aggressive triv graph kMin kMax nMin nMax
| not (isNothing (nodeColor nMin) && isNothing (nodeColor nMax))
= error "GraphOps.coalesceNodes: can't coalesce colored nodes."
| not (isNothing (nodeColor nMin) && isNothing (nodeColor nMax))
= error "GraphOps.coalesceNodes: can't coalesce colored nodes."
- | nodeId nMin == nodeId nMax
- = error "GraphOps.coalesceNodes: can't coalesce the same node."
-
---
| otherwise
= let
---
| otherwise
= let