X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=eaa8ee64ad8fa3526098cc74ff9d6c75f11cb642;hb=44faeb9742640d3498eb4482f98eb1255607c4d6;hp=e69000b50f32319d42edbfd3060e6ce77d0c14ba;hpb=e30e5834fd8c1c3a7d28fc66e99b91a84993bde8;p=libfirm

diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c
index e69000b50..eaa8ee64a 100644
--- a/ir/opt/scalar_replace.c
+++ b/ir/opt/scalar_replace.c
@@ -131,7 +131,7 @@ static int is_const_sel(ir_node *sel) {
 	for (i = 0; i < n; ++i) {
 		ir_node *idx = get_Sel_index(sel, i);
 
-		if (get_irn_op(idx) != op_Const)
+		if (!is_Const(idx))
 			return 0;
 	}
 	return 1;
@@ -488,12 +488,11 @@ typedef struct _env_t {
  */
 static void topologic_walker(ir_node *node, void *ctx) {
 	env_t        *env = ctx;
-	ir_op        *op = get_irn_op(node);
 	ir_node      *adr, *block, *mem, *val;
 	ir_mode      *mode;
 	unsigned     vnum;
 
-	if (op == op_Load) {
+	if (is_Load(node)) {
 		/* a load, check if we can resolve it */
 		adr = get_Load_ptr(node);
 
@@ -537,7 +536,7 @@ static void topologic_walker(ir_node *node, void *ctx) {
 		set_Tuple_pred(node, pn_Load_res,       val);
 		set_Tuple_pred(node, pn_Load_X_regular, new_Jmp());
 		set_Tuple_pred(node, pn_Load_X_except,  new_Bad());
-	} else if (op == op_Store) {
+	} else if (is_Store(node)) {
 		DB((dbg, SET_LEVEL_3, "  checking %+F for replacement ", node));
 
 		/* a Store always can be replaced */