X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=ce862ea90ff4aa276e3498e6c9b1e89dd8a8e5da;hb=8f355cb9b3d20c10f71d1b1e17cbf59a51ced83b;hp=ccc0daf8aeeaf84d0e5a523e362a325d756f6f8a;hpb=610842b9c143b08f8939c14628a58720ec8e20b8;p=libfirm

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index ccc0daf8a..ce862ea90 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -1577,34 +1577,27 @@ static ir_node *equivalent_node_CopyB(ir_node *n) {
  * Optimize Bounds(idx, idx, upper) into idx.
  */
 static ir_node *equivalent_node_Bound(ir_node *n) {
-	ir_node *idx   = get_Bound_index(n);
-	ir_node *lower = get_Bound_lower(n);
+	ir_node *idx  = get_Bound_index(n);
+	ir_node *pred = skip_Proj(idx);
 	int ret_tuple = 0;
 
-	/* By definition lower < upper, so if idx == lower -->
-	lower <= idx && idx < upper */
-	if (idx == lower) {
-		/* Turn Bound into a tuple (mem, jmp, bad, idx) */
-		ret_tuple = 1;
-	} else {
-		ir_node *pred = skip_Proj(idx);
-
-		if (get_irn_op(pred) == op_Bound) {
+	if (is_Bound(pred)) {
+		/*
+		 * idx was Bounds checked in the same MacroBlock previously,
+		 * it is still valid if lower <= pred_lower && pred_upper <= upper.
+		 */
+		ir_node *lower = get_Bound_lower(n);
+		ir_node *upper = get_Bound_upper(n);
+		if (get_Bound_lower(pred) == lower &&
+			get_Bound_upper(pred) == upper &&
+			get_irn_MacroBlock(n) == get_irn_MacroBlock(pred)) {
 			/*
-			 * idx was Bounds_check previously, it is still valid if
-			 * lower <= pred_lower && pred_upper <= upper.
+			 * One could expect that we simply return the previous
+			 * Bound here. However, this would be wrong, as we could
+			 * add an exception Proj to a new location then.
+			 * So, we must turn in into a tuple.
 			 */
-			ir_node *upper = get_Bound_upper(n);
-			if (get_Bound_lower(pred) == lower &&
-				get_Bound_upper(pred) == upper) {
-				/*
-				 * One could expect that we simply return the previous
-				 * Bound here. However, this would be wrong, as we could
-				 * add an exception Proj to a new location then.
-				 * So, we must turn in into a tuple.
-				 */
-				ret_tuple = 1;
-			}
+			ret_tuple = 1;
 		}
 	}
 	if (ret_tuple) {