little cleanup

[libfirm] / ir / tr / trvrfy.c

diff --git a/ir/tr/trvrfy.c b/ir/tr/trvrfy.c
index 6e051e3..bb9c998 100644 (file)
--- a/ir/tr/trvrfy.c
+++ b/ir/tr/trvrfy.c
@@ -41,18 +41,18 @@ static int check_class(type *tp) {
       entity *ovw = get_entity_overwrites(mem, j);
       /*printf(" overwrites: "); DDME(ovw);*/
       /* Check whether ovw is member of one of tp's supertypes. If so,
-     the representation is correct. */
-      found = false;
+         the representation is correct. */
+      found = 0;
       for (k = 0; k < get_class_n_supertypes(tp); k++) {
-    if (get_class_member_index(get_class_supertype(tp, k), ovw) >= 0) {
-      found = true;
-      break;
-    }
+        if (get_class_member_index(get_class_supertype(tp, k), ovw) >= 0) {
+          found = 1;
+          break;
+        }
       }
       if (!found) {
-    DDMT(tp); DDME(mem);
-    assert(found && "overwrites an entity not contained in direct supertype");
-    return error_ent_not_cont;
+        DDMT(tp); DDME(mem);
+        assert(found && "overwrites an entity not contained in direct supertype");
+        return error_ent_not_cont;
       }
     }
 
@@ -122,7 +122,7 @@ static void on_irg_storage(ir_node *n, void *env) {
 }
 
 /**
- * checks wheater a given constant IR node is NOT on the
+ * checks whether a given constant IR node is NOT on the
  * constant IR graph.
  */
 static int constant_on_wrong_irg(ir_node *n) {
@@ -145,14 +145,14 @@ static int constants_on_wrong_irg(entity *ent) {
     int i;
     for (i = 0; i < get_compound_ent_n_values(ent); i++) {
       if (constant_on_wrong_irg(get_compound_ent_value(ent, i)))
-    return 1;
+        return 1;
     }
   } else {
     /* Might not be set if entity belongs to a description or is external allocated. */
     if (get_atomic_ent_value(ent))
       return constant_on_wrong_irg(get_atomic_ent_value(ent));
     else if (get_entity_visibility(ent) != visibility_external_allocated)
-      assert((is_class_type(get_entity_owner(ent)) &&
+      assert((is_Class_type(get_entity_owner(ent)) &&
           get_class_peculiarity(get_entity_owner(ent)) == peculiarity_description) &&
          "Value in constant atomic entity not set.");
   }
@@ -168,27 +168,51 @@ static int constants_on_wrong_irg(entity *ent) {
  *  != 0    else
  */
 static int check_entity(entity *ent) {
+  int rem_vpi;
+  type *tp = get_entity_type(ent);
+  type *owner = get_entity_owner(ent);
+
   current_ir_graph =  get_const_code_irg();
   if (constants_on_wrong_irg(ent)) {
     assert(0 && "Contants placed on wrong IRG");
     return error_const_on_wrong_irg;
   }
 
-  int rem_vpi = get_visit_pseudo_irgs();
+  rem_vpi = get_visit_pseudo_irgs();
   set_visit_pseudo_irgs(1);
   if ((get_entity_peculiarity(ent) == peculiarity_existent) &&
       (get_entity_visibility(ent) != visibility_external_allocated) &&
-      (is_method_type(get_entity_type(ent)))                &&
+      (is_Method_type(get_entity_type(ent)))                &&
       (!get_entity_irg(ent) || !(is_ir_graph(get_entity_irg(ent))))) {
     assert(0 && "Method ents with pec_exist must have an irg");
     return error_existent_entity_without_irg;
   }
   set_visit_pseudo_irgs(rem_vpi);
 
+  /* Originally, this test assumed, that only method entities have
+     pec_inh.  As I changed this, I have to test for method type before
+     doing the test. */
   if (get_entity_peculiarity(ent) == peculiarity_inherited) {
-    entity *impl = get_SymConst_entity(get_atomic_ent_value(ent));
-    assert(get_entity_peculiarity(impl) == peculiarity_existent &&
-           "inherited entities must have constant pointing to existent entity.");
+    if (is_Method_type(get_entity_type(ent))) {
+      entity *impl = get_SymConst_entity(get_atomic_ent_value(ent));
+      assert(get_entity_peculiarity(impl) == peculiarity_existent &&
+            "inherited method entities must have constant pointing to existent entity.");
+    }
+  }
+
+  /* Entities in global type are not dynamic or automatic allocated. */
+  if (owner == get_glob_type()) {
+    assert(get_entity_allocation(ent) != allocation_dynamic &&
+          get_entity_allocation(ent) != allocation_automatic);
+  }
+
+  if (get_entity_variability(ent) != variability_uninitialized) {
+    if (is_atomic_type(tp)) {
+      ir_node *val = get_atomic_ent_value(ent);
+      if (val)
+        assert(get_irn_mode(val) == get_type_mode(tp) &&
+              "Mode of constant in entity must match type.");
+    }
   }
 
   return no_error;