X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firdom.c;h=1dee09df4bd5847486687661797fb3963cc4e056;hb=c59d37f47fdab6d74f1da6738b2d3f3373a378b9;hp=a878a410b570fbade5637b837881ae169054735b;hpb=e07b61c6ed5d198a484761f8a40a4f26520d964d;p=libfirm

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index a878a410b..1dee09df4 100644
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -24,20 +24,16 @@
  * @date      2.2002
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "irouts.h"
 
 #include "xmalloc.h"
 #include "irgwalk.h"
 #include "irdom_t.h"
-#include "irgraph_t.h"   /* To access state field. */
+#include "irgraph_t.h"
 #include "irnode_t.h"
 #include "ircons_t.h"
 #include "array_t.h"
@@ -360,7 +356,7 @@ void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
 	/* The root of the dominator tree should be the Start block. */
 	ir_node *root = get_irg_start_block(irg);
 
-  assert(irg->dom_state == dom_consistent
+	assert(irg->dom_state == dom_consistent
 			&& "The dominators of the irg must be consistent");
 	assert(root && "The start block of the graph is NULL?");
 	assert(get_dom_info(root)->idom == NULL
@@ -507,7 +503,11 @@ static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
 	/* Iterate */
 	for (i = get_Block_n_cfg_outs_ka(bl) - 1; i >= 0; --i) {
 		ir_node *pred = get_Block_cfg_out_ka(bl, i);
-		assert(is_Block(pred));
+		/* can happen for half-optimized dead code (I've seen this in student
+		   projects */
+		if (!is_Block(pred))
+			continue;
+
 		init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
 	}
 }
@@ -579,14 +579,14 @@ static void dom_compress(tmp_dom_info *v) {
  * if V is a root, return v, else return the vertex u, not being the
  * root, with minimum u->semi on the path from v to its root.
  */
-INLINE static tmp_dom_info *dom_eval(tmp_dom_info *v) {
+inline static tmp_dom_info *dom_eval(tmp_dom_info *v) {
 	if (!v->ancestor) return v;
 	dom_compress (v);
 	return v->label;
 }
 
 /** make V W's ancestor */
-INLINE static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
+inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
 	w->ancestor = v;
 }
 
@@ -636,18 +636,19 @@ static int init_construction(ir_graph *irg, irg_walk_func *pre) {
 		for (i = j = 0; i < arity; i++) {
 			ir_node *pred = get_End_keepalive(end, i);
 
-			if (is_Block(pred)) {
-				if (Block_block_visited(pred))
+			if (!is_Block(pred)) {
+				pred = get_nodes_block(pred);
+				if (!is_Block(pred)) {
+					/* a node which has a bad block input: kill it */
 					continue;
-
-				/* we found an endless loop */
-				dec_irg_block_visited(irg);
-				irg_block_walk(pred, pre, NULL, &n_blocks);
+				}
 			}
+			dec_irg_block_visited(irg);
+			irg_block_walk(pred, pre, NULL, &n_blocks);
 			in[j++] = pred;
 		}
 		if (j != arity) {
-			/* we kill some Block keep-alives */
+			/* we kill some keep-alives */
 			set_End_keepalives(end, j, in);
 			set_irg_outs_inconsistent(irg);
 		}