fix wrong types

[r28061]

diff --git a/ir/ana/trouts.c b/ir/ana/trouts.c
index 0b0abc2..dfda263 100644 (file)
--- a/ir/ana/trouts.c
+++ b/ir/ana/trouts.c
@@ -456,7 +456,7 @@ void add_type_pointertype_to(const ir_type *tp, ir_type *ptp)
        assert(ptp && is_Pointer_type(ptp));
 
        pts = get_type_pointertype_array(tp);
-       ARR_APP1(ir_node *, pts, ptp);
+       ARR_APP1(ir_type*, pts, ptp);
        set_type_pointertype_array(tp, pts);
 }
 
@@ -503,7 +503,7 @@ void  add_type_arraytype_of(const ir_type *tp, ir_type *atp)
        assert(atp && is_Array_type(atp));
 
        pts = get_type_arraytype_array(tp);
-       ARR_APP1(ir_node *, pts, atp);
+       ARR_APP1(ir_type*, pts, atp);
        set_type_arraytype_array(tp, pts);
 }
 

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index b70a83d..640287a 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -2095,7 +2095,7 @@ static void process_block(ir_node *block, void *env)
        /* build an index map for all nodes in the current block */
        i            = 0;
        n            = get_irn_n_edges(block);
-       NEW_ARR_A(int *, rss->idx_map, n);
+       NEW_ARR_A(int, rss->idx_map, n);
        foreach_out_edge(block, edge) {
                ir_node *irn      = get_edge_src_irn(edge);
                rss->idx_map[i++] = get_irn_idx(irn);

diff --git a/ir/ir/irio.c b/ir/ir/irio.c
index 97096ef..25fa21e 100644 (file)
--- a/ir/ir/irio.c
+++ b/ir/ir/irio.c
@@ -1456,7 +1456,7 @@ static int read_node_header(io_env_t *env, long *nodenr, long **preds,
        *nodename = read_word(env);
        *nodenr   = read_long(env);
 
-       ARR_RESIZE(ir_node *, *preds, 0);
+       ARR_RESIZE(long, *preds, 0);
 
        EXPECT('[');
        for (numpreds = 0; !feof(env->file); numpreds++) {

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index fc91c81..6efc3d5 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -113,7 +113,7 @@ static void ASM_copy_attr(ir_graph *irg, const ir_node *old_node,
        default_copy_attr(irg, old_node, new_node);
        new_node->attr.assem.input_constraints  = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.input_constraints);
        new_node->attr.assem.output_constraints = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.output_constraints);
-       new_node->attr.assem.clobbers = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.clobbers);
+       new_node->attr.assem.clobbers = DUP_ARR_D(ident*, irg->obst, old_node->attr.assem.clobbers);
 }
 
 /**

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index d68d8fc..09faa9d 100644 (file)
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -103,7 +103,7 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used)
        walker_env_t   wenv;
 
        /* we use the ir_op generic pointers here */
-       NEW_ARR_A(const i_instr_record *, i_map, n_ops);
+       NEW_ARR_A(i_instr_record *, i_map, n_ops);
        memset((void *)i_map, 0, sizeof(*i_map) * n_ops);
 
        /* fill a map for faster search */

diff --git a/ir/tr/compound_path.c b/ir/tr/compound_path.c
index d5585f9..9d7c19d 100644 (file)
--- a/ir/tr/compound_path.c
+++ b/ir/tr/compound_path.c
@@ -241,8 +241,8 @@ void remove_compound_ent_value(ir_entity *ent, ir_entity *value_ent)
                                ent->attr.cmpd_attr.val_paths[i] = ent->attr.cmpd_attr.val_paths[i+1];
                                ent->attr.cmpd_attr.values[i]    = ent->attr.cmpd_attr.values[i+1];
                        }
-                       ARR_SETLEN(ir_entity*, ent->attr.cmpd_attr.val_paths, n - 1);
-                       ARR_SETLEN(ir_node*,   ent->attr.cmpd_attr.values,    n - 1);
+                       ARR_SETLEN(compound_graph_path*, ent->attr.cmpd_attr.val_paths, n - 1);
+                       ARR_SETLEN(ir_node*,             ent->attr.cmpd_attr.values,    n - 1);
                        break;
                }
        }

diff --git a/ir/tr/type.c b/ir/tr/type.c
index 7de89da..4788449 100644 (file)
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -907,7 +907,7 @@ void remove_class_subtype(ir_type *clss, ir_type *subtype)
                if (clss->attr.ca.subtypes[i] == subtype) {
                        for (; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
                                clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
-                       ARR_SETLEN(ir_entity*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
+                       ARR_SETLEN(ir_type*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
                        break;
                }
 }
@@ -963,7 +963,7 @@ void remove_class_supertype(ir_type *clss, ir_type *supertype)
                if (clss->attr.ca.supertypes[i] == supertype) {
                        for (; i < (ARR_LEN(clss->attr.ca.supertypes))-1; i++)
                                clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
-                       ARR_SETLEN(ir_entity*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1);
+                       ARR_SETLEN(ir_type*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1);
                        break;
                }
 }