X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldstopt.c;h=0416d5ac6ac03a98e140a40bdd92e9ca7953662e;hb=762b472fc81c73cf7a1b0041b8cd286b7206d79d;hp=6fd5f49f9841ae12c03336b60498ba2ffd4e971a;hpb=10e58f9669ea6c77e82bd3bc12c4ac5bbaa6bb15;p=libfirm

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 6fd5f49f9..0416d5ac6 100644
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -74,7 +74,7 @@ typedef struct walk_env_t {
 
 /** A Load/Store info. */
 typedef struct ldst_info_t {
-	ir_node  *projs[MAX_PROJ];    /**< list of Proj's of this node */
+	ir_node  *projs[MAX_PROJ+1];  /**< list of Proj's of this node */
 	ir_node  *exc_block;          /**< the exception block if available */
 	int      exc_idx;             /**< predecessor index in the exception block */
 	unsigned visited;             /**< visited counter for breaking loops */
@@ -1096,8 +1096,9 @@ ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c)
 		if (is_reinterpret_cast(c_mode, l_mode)) {
 			/* copy the value from the const code irg and cast it */
 			res = new_rd_Conv(dbgi, block, res, l_mode);
+		} else {
+			return NULL;
 		}
-		return NULL;
 	}
 	return res;
 }
@@ -1167,7 +1168,7 @@ static unsigned optimize_load(ir_node *load)
 			}
 
 			if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
-				if (ent->initializer != NULL) {
+				if (has_entity_initializer(ent)) {
 					/* new style initializer */
 					value = find_compound_ent_value(ptr);
 				} else if (entity_has_compound_ent_values(ent)) {
@@ -1678,7 +1679,7 @@ static void do_load_store_optimize(ir_node *n, void *env)
 		break;
 
 	default:
-		;
+		break;
 	}
 }  /* do_load_store_optimize */
 
@@ -2196,15 +2197,15 @@ static void do_dfs(ir_graph *irg, loop_env *env)
 		ir_node *pred = get_Block_cfgpred(endblk, i);
 
 		pred = skip_Proj(pred);
-		if (is_Return(pred))
+		if (is_Return(pred)) {
 			dfs(get_Return_mem(pred), env);
-		else if (is_Raise(pred))
+		} else if (is_Raise(pred)) {
 			dfs(get_Raise_mem(pred), env);
-		else if (is_fragile_op(pred))
+		} else if (is_fragile_op(pred)) {
 			dfs(get_fragile_op_mem(pred), env);
-		else if (is_Bad(pred))
-			/* ignore non-optimized block predecessor */;
-		else {
+		} else if (is_Bad(pred)) {
+			/* ignore non-optimized block predecessor */
+		} else {
 			assert(0 && "Unknown EndBlock predecessor");
 		}
 	}