Set the outs to inconsistent at the end of transform_irg().

[libfirm] / ir / ana / irmemory.c

diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c
index a4bb3b3..0cc2913 100644 (file)
--- a/ir/ana/irmemory.c
+++ b/ir/ana/irmemory.c
@@ -98,7 +98,7 @@ static ir_alias_relation check_const(ir_node *cns, int size) {
        tarval *tv_size;
 
        if (size == 0)
-               return classify_tarval(tv) != TV_CLASSIFY_NULL ? no_alias : may_alias;
+               return tarval_is_null(tv) ? may_alias : no_alias;
        tv_size = new_tarval_from_long(size, get_tarval_mode(tv));
        return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? no_alias : may_alias;
 }  /* check_const */
@@ -118,10 +118,69 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size)
                tarval *tv1 = get_Const_tarval(idx1);
                tarval *tv2 = get_Const_tarval(idx2);
                tarval *tv, *tv_size;
+               ir_mode *m1, *m2;
 
                if (size == 0)
                        return tv1 == tv2 ? sure_alias : no_alias;
 
+               /* arg, modes may be different */
+               m1 = get_tarval_mode(tv1);
+               m2 = get_tarval_mode(tv2);
+               if (m1 != m2) {
+                       int size = get_mode_size_bits(m1) - get_mode_size_bits(m2);
+
+                       if (size < 0) {
+                               /* m1 is a small mode, cast up */
+                               m1 = mode_is_signed(m1) ? find_signed_mode(m2) : find_unsigned_mode(m2);
+                               if (m1 == NULL) {
+                                       /* should NOT happen, but if it does we give up here */
+                                       return may_alias;
+                               }
+                               tv1 = tarval_convert_to(tv1, m1);
+                       } else if (size > 0) {
+                               /* m2 is a small mode, cast up */
+                               m2 = mode_is_signed(m2) ? find_signed_mode(m1) : find_unsigned_mode(m1);
+                               if (m2 == NULL) {
+                                       /* should NOT happen, but if it does we give up here */
+                                       return may_alias;
+                               }
+                               tv2 = tarval_convert_to(tv2, m2);
+                       }
+                       /* here the size should be identical, check for signed */
+                       if (get_mode_sign(m1) != get_mode_sign(m2)) {
+                               /* find the signed */
+                               if (mode_is_signed(m2)) {
+                                       tarval *t = tv1;
+                                       ir_mode *tm = m1;
+                                       tv1 = tv2; m1 = m2;
+                                       tv2 = t;   m2 = tm;
+                               }
+
+                               /* m1 is now the signed one */
+                               if (tarval_cmp(tv1, get_tarval_null(m1)) & (pn_Cmp_Eq|pn_Cmp_Gt)) {
+                                       /* tv1 is signed, but >= 0, simply cast into unsigned */
+                                       tv1 = tarval_convert_to(tv1, m2);
+                               } else {
+                                       tv_size = new_tarval_from_long(size, m2);
+
+                                       if (tarval_cmp(tv2, tv_size) & (pn_Cmp_Eq|pn_Cmp_Gt)) {
+                                               /* tv1 is negative and tv2 >= tv_size, so the difference is bigger than size */
+                                               return no_alias;
+                                       }
+                                       /* tv_size > tv2, so we can subtract without overflow */
+                                       tv2 = tarval_sub(tv_size, tv2);
+
+                                       /* tv1 is < 0, so we can negate it */
+                                       tv1 = tarval_neg(tv1);
+
+                                       /* cast it into unsigned. for two-complement it does the right thing for MIN_INT */
+                                       tv1 = tarval_convert_to(tv1, m2);
+
+                                       /* now we can compare without overflow */
+                                       return tarval_cmp(tv1, tv2) & (pn_Cmp_Eq|pn_Cmp_Gt) ? no_alias : may_alias;
+                               }
+                       }
+               }
                if (tarval_cmp(tv1, tv2) == pn_Cmp_Gt) {
                        tarval *t = tv1;
                        tv1 = tv2;
@@ -425,7 +484,7 @@ static ir_alias_relation _get_alias_relation(
 
        /* Two save some code, sort the addresses by its id's. Beware, this
           might break some things, so better check here. */
-       assert(iro_SymConst < iro_Sel && iro_Sel < iro_Proj && "Code dependence breaked");
+       assert(iro_SymConst < iro_Sel && iro_Sel < iro_Proj && "Code dependence broken");
        op1 = get_irn_opcode(adr1);
        op2 = get_irn_opcode(adr2);
 
@@ -592,6 +651,10 @@ static ir_alias_relation _get_alias_relation(
                if (get_mode_size_bits(mode1) != get_mode_size_bits(mode2))
                        return no_alias;
 
+               /* cheap test: if only one is a reference mode, no alias */
+               if (mode_is_reference(mode1) != mode_is_reference(mode2))
+                       return no_alias;
+
                /* try rule R5 */
                rel = different_types(adr1, adr2);
                if (rel != may_alias)
@@ -875,6 +938,11 @@ static void check_initializer(ir_entity *ent) {
        if (get_entity_variability(ent) == variability_uninitialized)
                return;
 
+       /* Beware: Methods initialized with "themself". This does not count as a taken
+          address. */
+       if (is_Method_type(get_entity_type(ent)))
+               return;
+
        if (is_atomic_entity(ent)) {
                /* let's check if it's an address */
                n = get_atomic_ent_value(ent);