Implement better magic to handle changing control dependencies when welding blocks

[libfirm] / ir / opt / opt_polymorphy.c

diff --git a/ir/opt/opt_polymorphy.c b/ir/opt/opt_polymorphy.c
index 1d31f68..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;
@@ -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)    ||