Clean up new_const_code_irg() a bit.

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index ec5d4d9..0358e49 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -25,10 +25,9 @@
  */
 #include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
+#include "pset_new.h"
 #include "ident.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
@@ -920,11 +919,48 @@ found:
                end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
                edges_notify_edge(end, idx, old, NULL, irg);
        }
+       /* now n - 1 keeps, 1 block input */
        ARR_RESIZE(ir_node *, end->in, (n - 1) + 1 + END_KEEPALIVE_OFFSET);
 }
 
-void
-free_End(ir_node *end) {
+/* remove Bads, NoMems and doublets from the keep-alive set */
+void remove_End_Bads_and_doublets(ir_node *end) {
+       pset_new_t keeps;
+       int        idx, n = get_End_n_keepalives(end);
+       ir_graph   *irg;
+
+       if (n <= 0)
+               return;
+
+       irg = get_irn_irg(end);
+       pset_new_init(&keeps);
+
+       for (idx = n - 1; idx >= 0; --idx) {
+               ir_node *ka = get_End_keepalive(end, idx);
+
+               if (is_Bad(ka) || is_NoMem(ka) || pset_new_contains(&keeps, ka)) {
+                       /* remove the edge */
+                       edges_notify_edge(end, idx, NULL, ka, irg);
+
+                       if (idx != n - 1) {
+                               /* exchange with the last one */
+                               ir_node *old = end->in[1 + END_KEEPALIVE_OFFSET + n - 1];
+                               edges_notify_edge(end, n - 1, NULL, old, irg);
+                               end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
+                               edges_notify_edge(end, idx, old, NULL, irg);
+                       }
+                       --n;
+               } else {
+                       pset_new_insert(&keeps, ka);
+               }
+       }
+       /* n keeps, 1 block input */
+       ARR_RESIZE(ir_node *, end->in, n + 1 + END_KEEPALIVE_OFFSET);
+
+       pset_new_destroy(&keeps);
+}
+
+void free_End(ir_node *end) {
        assert(is_End(end));
        end->kind = k_BAD;
        DEL_ARR_F(end->in);