From: Michael Beck <beck@ipd.info.uni-karlsruhe.de>
Date: Mon, 7 Jan 2008 12:51:20 +0000 (+0000)
Subject: ensure, that every Block has a MacroBlock header
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=101b941dfac6b2dee0308aeaee95cbef97516c7f;p=libfirm

ensure, that every Block has a MacroBlock header

[r17181]
---

diff --git a/ir/ir/irgopt.c b/ir/ir/irgopt.c
index 149716704..ad794eb1b 100644
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -339,9 +339,13 @@ static void copy_node(ir_node *n, void *env) {
 		get_irn_mode(n),
 		new_arity,
 		get_irn_in(n) + 1);
-		/* Copy the attributes.  These might point to additional data.  If this
-		was allocated on the old obstack the pointers now are dangling.  This
-	frees e.g. the memory of the graph_arr allocated in new_immBlock. */
+	/* Copy the attributes.  These might point to additional data.  If this
+	   was allocated on the old obstack the pointers now are dangling.  This
+	   frees e.g. the memory of the graph_arr allocated in new_immBlock. */
+	if (op == op_Block) {
+		/* we cannot allow blocks WITHOUT macroblock input */
+		set_irn_n(nn, -1, get_irn_n(n, -1));
+	}
 	copy_node_attr(n, nn);
 
 #ifdef DEBUG_libfirm
@@ -378,7 +382,9 @@ static void copy_preds(ir_node *n, void *env) {
 			set_irn_n(nn, -1, nn);
 		} else {
 			/* get the macro block header */
-			set_irn_n(nn, -1, get_new_node(mbh));
+			ir_node *nmbh = get_new_node(mbh);
+			assert(nmbh != NULL);
+			set_irn_n(nn, -1, nmbh);
 		}
 
 		/* Don't copy Bad nodes. */