irgopt.c: comparison of types does not take care of compatibilities

irprog.c: avoid endless loop

[r443]

diff --git a/ir/ir/irgopt.c b/ir/ir/irgopt.c
index 6b37758..d76ad26 100644 (file)
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -431,7 +431,7 @@ void inline_method(ir_node *call, ir_graph *called_graph) {
 
   /** Check preconditions **/
   assert(get_irn_op(call) == op_Call);
-  assert(get_Call_type(call) == get_entity_type(get_irg_ent(called_graph)));
+  /* assert(get_Call_type(call) == get_entity_type(get_irg_ent(called_graph))); */
   assert(get_type_tpop(get_Call_type(call)) == type_method);
   if (called_graph == current_ir_graph) return;
 

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index be5ca48..18d4658 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -140,7 +140,6 @@ INLINE void remove_irp_type_from_list (type *typ) {
 
 void remove_irp_type(type *typ) {
   remove_irp_type_from_list (typ);
-  free_type(typ);
 }
 
 int get_irp_n_types (void) {

diff --git a/ir/ir/old_fctnames.h b/ir/ir/old_fctnames.h
index 9dfde31..56522df 100644 (file)
--- a/ir/ir/old_fctnames.h
+++ b/ir/ir/old_fctnames.h
@@ -39,4 +39,6 @@
 #define get_class_n_supertype get_class_n_supertypes
 #define get_struct_n_member   get_struct_n_members
 
+#define get_method_n_res(X) get_method_n_ress(X)
+
 #endif