From: Sebastian Buchwald <Sebastian.Buchwald@kit.edu>
Date: Mon, 16 Aug 2010 07:49:38 +0000 (+0000)
Subject: Rename reorder_node to reorder_node_after_edge_deletion.
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=c54176dc094374c8a913a92d81272dd0f5ad6f6a;hp=8290626415406f13f47a0ef51c9cfef868fe05ab;p=libfirm

Rename reorder_node to reorder_node_after_edge_deletion.

[r27931]
---

diff --git a/heuristical_co_ld.c b/heuristical_co_ld.c
index 875c69f6c..82717cb7b 100644
--- a/heuristical_co_ld.c
+++ b/heuristical_co_ld.c
@@ -252,7 +252,7 @@ static void apply_RN_co_without_selection(pbqp *pbqp, plist_t *rpeo)
 			continue;
 
 		disconnect_edge(neighbor, edge);
-		reorder_node(neighbor);
+		reorder_node_after_edge_deletion(neighbor);
 	}
 
 	/* Remove node from old bucket */
diff --git a/optimal.c b/optimal.c
index 37fdc952c..c4ea1c106 100644
--- a/optimal.c
+++ b/optimal.c
@@ -620,7 +620,7 @@ void apply_RM(pbqp *pbqp, pbqp_node *node)
 	merged_node = node;
 }
 
-void reorder_node(pbqp_node *node)
+void reorder_node_after_edge_deletion(pbqp_node *node)
 {
 	unsigned    degree     = pbqp_node_get_degree(node);
 	/* Assume node lost one incident edge. */
@@ -631,12 +631,6 @@ void reorder_node(pbqp_node *node)
 	/* Same bucket as before */
 	if (degree > 2) return;
 
-	if (!node_bucket_contains(node_buckets[old_degree], node)) {
-		/* Old arity is new arity, so we have nothing to do. */
-		assert(node_bucket_contains(node_buckets[degree], node));
-		return;
-	}
-
 	/* Delete node from old bucket... */
 	node_bucket_remove(&node_buckets[old_degree], node);
 
@@ -1041,7 +1035,7 @@ void apply_RI(pbqp *pbqp)
 	}
 #endif
 
-	reorder_node(other_node);
+	reorder_node_after_edge_deletion(other_node);
 
 #if KAPS_STATISTIC
 	pbqp->num_r1++;
@@ -1177,8 +1171,8 @@ void apply_RII(pbqp *pbqp)
 		/* Free local matrix. */
 		obstack_free(&pbqp->obstack, mat);
 
-		reorder_node(src_node);
-		reorder_node(tgt_node);
+		reorder_node_after_edge_deletion(src_node);
+		reorder_node_after_edge_deletion(tgt_node);
 	}
 
 #if	KAPS_DUMP
diff --git a/optimal.h b/optimal.h
index 7f001d35b..43fd5e7ee 100644
--- a/optimal.h
+++ b/optimal.h
@@ -49,7 +49,7 @@ pbqp_node *get_node_with_max_degree(void);
 void initial_simplify_edges(pbqp *pbqp);
 void select_alternative(pbqp_node *node, unsigned selected_index);
 void simplify_edge(pbqp *pbqp, pbqp_edge *edge);
-void reorder_node(pbqp_node *node);
+void reorder_node_after_edge_deletion(pbqp_node *node);
 
 int node_is_reduced(pbqp_node *node);
 
diff --git a/pbqp_edge.c b/pbqp_edge.c
index d0b7904ae..351f157a5 100644
--- a/pbqp_edge.c
+++ b/pbqp_edge.c
@@ -31,6 +31,7 @@
 
 #include "kaps.h"
 #include "matrix.h"
+#include "optimal.h"
 #include "pbqp_edge.h"
 #include "pbqp_edge_t.h"
 #include "pbqp_node.h"
@@ -95,8 +96,8 @@ void delete_edge(pbqp_edge *edge)
 	edge->src = NULL;
 	edge->tgt = NULL;
 
-	reorder_node(src_node);
-	reorder_node(tgt_node);
+	reorder_node_after_edge_deletion(src_node);
+	reorder_node_after_edge_deletion(tgt_node);
 }
 
 unsigned is_deleted(pbqp_edge *edge)