X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=c2cecb135541755428bf95090f081897abbfa566;hb=c25b0f5781313f72027722783ce6286978bdd757;hp=ac9fe39cf4ed62b1443e9de8b7d304d56db0a14b;hpb=8829c3217ea4a00be8af74a260f8ca79367361f2;p=libfirm

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index ac9fe39cf..c2cecb135 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -722,10 +722,16 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
 static ir_node *equivalent_node_Block(ir_node *n)
 {
 	ir_node *oldn = n;
-	int n_preds   = get_Block_n_cfgpreds(n);
+	int     n_preds;
 
-	/* The Block constructor does not call optimize, but mature_immBlock
-	calls the optimization. */
+	/* don't optimize dead blocks */
+	if (is_Block_dead(n))
+		return n;
+
+	n_preds = get_Block_n_cfgpreds(n);
+
+	/* The Block constructor does not call optimize, but mature_immBlock()
+	   calls the optimization. */
 	assert(get_Block_matured(n));
 
 	/* Straightening: a single entry Block following a single exit Block
@@ -5016,7 +5022,7 @@ static int node_cmp_attr_Free(ir_node *a, ir_node *b) {
 static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) {
 	const symconst_attr *pa = get_irn_symconst_attr(a);
 	const symconst_attr *pb = get_irn_symconst_attr(b);
-	return (pa->num        != pb->num)
+	return (pa->kind       != pb->kind)
 	    || (pa->sym.type_p != pb->sym.type_p)
 	    || (pa->tp         != pb->tp);
 }  /* node_cmp_attr_SymConst */