Fixed wrong array declaration

[libfirm] / ir / opt / opt_polymorphy.c

diff --git a/ir/opt/opt_polymorphy.c b/ir/opt/opt_polymorphy.c
index ee55ff6..c11be8c 100644 (file)
--- a/ir/opt/opt_polymorphy.c
+++ b/ir/opt/opt_polymorphy.c
@@ -28,7 +28,7 @@
  * If we find a dynamic type this means that the pointer always points
  * to an object of this type during runtime.   We resolved polymorphy.
  */
-static type *get_dynamic_type(ir_node *ptr) {
+static ir_type *get_dynamic_type(ir_node *ptr) {
   ptr = skip_Cast(skip_Proj(ptr));
   if (get_irn_op(ptr) == op_Alloc)
     return get_Alloc_type(ptr);
@@ -41,7 +41,7 @@ static type *get_dynamic_type(ir_node *ptr) {
 ir_node *transform_node_Sel(ir_node *node)
 {
   ir_node *new_node, *ptr;
-  type    *dyn_tp;
+  ir_type *dyn_tp;
   entity  *ent = get_Sel_entity(node);
 
   if (get_irp_phase_state() == phase_building) return node;
@@ -63,7 +63,7 @@ ir_node *transform_node_Sel(ir_node *node)
     } else {
       ir_node *rem_block = get_cur_block();
       set_cur_block(get_nodes_block(node));
-      new_node = copy_const_value(get_atomic_ent_value(ent));
+      new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(ent));
       set_cur_block(rem_block);
       DBG_OPT_POLY(node, new_node);
     }
@@ -86,7 +86,7 @@ ir_node *transform_node_Sel(ir_node *node)
 
     rem_block = get_cur_block();
     set_cur_block(get_nodes_block(node));
-    new_node = copy_const_value(get_atomic_ent_value(called_ent));
+    new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(called_ent));
     set_cur_block(rem_block);
     DBG_OPT_POLY(node, new_node);
 
@@ -108,14 +108,14 @@ ir_node *transform_node_Load(ir_node *n)
 {
   ir_node *field_ptr, *new_node, *ptr;
   entity  *ent;
-  type    *dyn_tp;
+  ir_type *dyn_tp;
 
   if (!(get_opt_optimize() && get_opt_dyn_meth_dispatch()))
     return n;
 
   field_ptr = get_Load_ptr(n);
 
-  if (get_irn_op(field_ptr) != op_Sel) return n;
+  if (! is_Sel(field_ptr)) return n;
 
   ent = get_Sel_entity(field_ptr);
   if ((get_entity_allocation(ent) != allocation_static)    ||
@@ -125,7 +125,7 @@ ir_node *transform_node_Load(ir_node *n)
   /* If the entity is a leave in the inheritance tree,
      we can replace the Sel by a constant. */
   if ((get_irp_phase_state() != phase_building) && (get_entity_n_overwrittenby(ent) == 0)) {
-    new_node = copy_const_value(get_atomic_ent_value(ent));
+    new_node = copy_const_value(get_irn_dbg_info(n), get_atomic_ent_value(ent));
     DBG_OPT_POLY(field_ptr, new_node);
 
     return new_node;
@@ -143,7 +143,7 @@ ir_node *transform_node_Load(ir_node *n)
     /* called_ent may not be description: has no Address/Const to Call! */
     assert(get_entity_peculiarity(loaded_ent) != peculiarity_description);
 
-    new_node = copy_const_value(get_atomic_ent_value(loaded_ent));
+    new_node = copy_const_value(get_irn_dbg_info(n), get_atomic_ent_value(loaded_ent));
     DBG_OPT_POLY(field_ptr, new_node);
 
     return new_node;