simplify confusing entity/owner interfaces. There is no public way anymore to add...

[libfirm] / ir / opt / convopt.c

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 4787c3f..1935475 100644 (file)
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -173,9 +173,13 @@ static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 
 static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
-       ir_mode *mode = get_irn_mode(node);
-       size_t   arity;
-       size_t   i;
+       ir_mode  *mode = get_irn_mode(node);
+       size_t    arity;
+       size_t    conv_arity;
+       size_t    i;
+       ir_node  *new_node;
+       ir_graph *irg;
+       ir_node **ins;
 
        if (mode == dest_mode)
                return node;
@@ -218,9 +222,14 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                return place_conv(node, dest_mode);
        }
 
+       // We want to create a new node with the right mode
+       arity = get_irn_arity(node);
+       irg = get_irn_irg(node);
+       ins = ALLOCAN(ir_node *, arity);
+
        // The shift count does not participate in the conv optimisation
-       arity = is_Shl(node) ? 1 : get_irn_arity(node);
-       for (i = 0; i < arity; i++) {
+       conv_arity = is_Shl(node) ? 1 : arity;
+       for (i = 0; i < conv_arity; i++) {
                ir_node *pred = get_irn_n(node, i);
                ir_node *transformed;
                if (get_conv_costs(pred, dest_mode) > 0) {
@@ -228,10 +237,23 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                } else {
                        transformed = conv_transform(pred, dest_mode);
                }
-               set_irn_n(node, i, transformed);
+               ins[i] = transformed;
+       }
+
+       for (i = conv_arity; i < arity; i++) {
+               ins[i] = get_irn_n(node, i);
        }
-       set_irn_mode(node, dest_mode);
-       return node;
+
+       new_node = new_ir_node(get_irn_dbg_info(node),
+                               irg,
+                               get_nodes_block(node),
+                               get_irn_op(node),
+                               dest_mode,
+                               arity,
+                               ins);
+       copy_node_attr(irg, node, new_node);
+
+       return new_node;
 }
 
 /* TODO, backends (at least ia32) can't handle it at the moment,
@@ -284,8 +306,10 @@ static void conv_opt_walker(ir_node *node, void *data)
 
        transformed = conv_transform(pred, mode);
        if (node != transformed) {
+               vrp_attr *vrp;
+
                exchange(node, transformed);
-               vrp_attr *vrp = vrp_get_info(transformed);
+               vrp = vrp_get_info(transformed);
                if (vrp && vrp->valid) {
                        vrp->range_type = VRP_VARYING;
                        vrp->bits_set = tarval_convert_to(vrp->bits_set, mode);