Small fixes, typos, style.
[libfirm] / ir / ana / irmemory.c
index a457a5e..c3f8503 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -41,6 +41,7 @@
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "debug.h"
+#include "error.h"
 
 /** The debug handle. */
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -51,6 +52,18 @@ static DISAMBIGUATOR_FUNC language_disambuigator = NULL;
 /** The global memory disambiguator options. */
 static unsigned global_mem_disamgig_opt = aa_opt_no_opt;
 
+/* Returns a human readable name for an alias relation. */
+const char *get_ir_alias_relation_name(ir_alias_relation rel) {
+#define X(a) case a: return #a
+       switch (rel) {
+       X(ir_no_alias);
+       X(ir_may_alias);
+       X(ir_sure_alias);
+       default: assert(0); return "UNKNOWN";
+       }
+#undef X
+}
+
 /* Get the memory disambiguator options for a graph. */
 unsigned get_irg_memory_disambiguator_options(ir_graph *irg) {
        unsigned opt = irg->mem_disambig_opt;
@@ -88,83 +101,108 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) {
        return ptr;
 }  /* find_base_adr */
 
-/**
- * Check if the address can be decomposed into base PLUS offset.
- */
-static int has_offset(ir_node *adr, int *offset) {
-       if (is_SymConst(adr)) {
-               *offset = 0;
-               return 1;
-       }
-       if (is_Sel(adr)) {
-               ir_entity *ent = get_Sel_entity(adr);
-               ir_type   *owner = get_entity_owner(ent);
-
-               if (get_type_state(owner) != layout_fixed) {
-                       /* The layout is NOT fixed yet, symbolic evaluation needed */
-               }
-       }
-       return 0;
-}  /* has_offset */
-
-/**
- * Two address expressions have the same base address,
- * check if there offsets are different.
- *
- * @param adr1  The first address.
- * @param adr2  The second address.
- */
-static ir_alias_relation different_offsets(ir_node *adr1, ir_node *adr2) {
-       int offset1, offset2;
-       if (has_offset(adr1, &offset1) && has_offset(adr2, &offset2)) {
-               /* */
-       }
-       return may_alias;
-}  /* different_offsets */
-
 /**
  * Check if a given Const node is greater or equal a given size.
  *
- * @return no_alias if the Const is greater, may_alias else
+ * @return ir_no_alias if the Const is greater, ir_may_alias else
  */
 static ir_alias_relation check_const(ir_node *cns, int size) {
        tarval *tv = get_Const_tarval(cns);
        tarval *tv_size;
 
        if (size == 0)
-               return classify_tarval(tv) != TV_CLASSIFY_NULL ? no_alias : may_alias;
+               return tarval_is_null(tv) ? ir_may_alias : ir_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;
+       return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias;
 }  /* check_const */
 
 /**
  * Treat idx1 and idx2 as integer indexes and check if they differ always more than size.
  *
- * @return sure_alias iff idx1 == idx2
- *         no_alias iff they ALWAYS differ more than size
- *         may_alias else
+ * @return ir_sure_alias iff idx1 == idx2
+ *         ir_no_alias iff they ALWAYS differ more than size
+ *         ir_may_alias else
  */
 static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) {
        if (idx1 == idx2)
-               return sure_alias;
+               return ir_sure_alias;
        if (is_Const(idx1) && is_Const(idx2)) {
                /* both are const, we can compare them */
                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;
+                       return tv1 == tv2 ? ir_sure_alias : ir_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 ir_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 ir_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 ir_no_alias;
+                                       }
+                                       /* tv_size > tv2, so we can subtract without overflow */
+                                       tv2 = tarval_sub(tv_size, tv2, NULL);
+
+                                       /* 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) ? ir_no_alias : ir_may_alias;
+                               }
+                       }
+               }
                if (tarval_cmp(tv1, tv2) == pn_Cmp_Gt) {
                        tarval *t = tv1;
                        tv1 = tv2;
                        tv2 = t;
                }
                /* tv1 is now the "smaller" one */
-               tv      = tarval_sub(tv2, tv1);
+               tv      = tarval_sub(tv2, tv1, NULL);
                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;
+               return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias;
        }
 
        /* Note: we rely here on the fact that normalization puts constants on the RIGHT side */
@@ -178,7 +216,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size)
                                return check_const(r1, size);
                }
                if (is_Add(idx2)) {
-                       /* both are Adds, check if they are of x + c kind */
+                       /* both are Adds, check if they are of x + a == x + b kind */
                        ir_node *l2 = get_Add_left(idx2);
                        ir_node *r2 = get_Add_right(idx2);
 
@@ -214,7 +252,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size)
                }
 
                if (is_Sub(idx2)) {
-                       /* both are Subs, check if they are of x - c kind */
+                       /* both are Subs, check if they are of x - a == x - b kind */
                        ir_node *l2 = get_Sub_left(idx2);
 
                        if (l1 == l2) {
@@ -234,16 +272,21 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size)
                }
 
        }
-       return may_alias;
+       return ir_may_alias;
 }  /* different_index */
 
 /**
- * Two Sel addresses have the same base address, check if there offsets are different.
+ * Two Sel addresses have the same base address, check if there offsets are
+ * different.
  *
  * @param adr1  The first address.
  * @param adr2  The second address.
  */
 static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) {
+       /* seems to be broken */
+       (void) sel1;
+       (void) sel2;
+#if 0
        ir_entity *ent1 = get_Sel_entity(sel1);
        ir_entity *ent2 = get_Sel_entity(sel2);
        int i, check_arr = 0;
@@ -257,7 +300,7 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) {
                if (tp1 == tp2)
                        check_arr = 1;
                else if (get_type_state(tp1) == layout_fixed && get_type_state(tp2) == layout_fixed &&
-                        get_type_size_bytes(tp1) == get_type_size_bytes(tp2))
+                        get_type_size_bits(tp1) == get_type_size_bits(tp2))
                        check_arr = 1;
        }
        if (check_arr) {
@@ -281,7 +324,8 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) {
                        return have_no > 0 ? no_alias : sure_alias;
                }
        }
-       return may_alias;
+#endif
+       return ir_may_alias;
 }  /* different_sel_offsets */
 
 /**
@@ -295,13 +339,13 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2)
 {
        ir_entity *ent1 = NULL, *ent2 = NULL;
 
-       if (is_SymConst(adr1) && get_SymConst_kind(adr1) == symconst_addr_ent)
-               ent1 = get_SymConst_entity(adr1);
+       if (is_Global(adr1))
+               ent1 = get_Global_entity(adr1);
        else if (is_Sel(adr1))
                ent1 = get_Sel_entity(adr1);
 
-       if (is_SymConst(adr2) && get_SymConst_kind(adr2) == symconst_addr_ent)
-               ent2 = get_SymConst_entity(adr2);
+       if (is_Global(adr2))
+               ent2 = get_Global_entity(adr2);
        else if (is_Sel(adr2))
                ent2 = get_Sel_entity(adr2);
 
@@ -320,118 +364,91 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2)
 
                        if (get_type_tpop(tp1) != get_type_tpop(tp2)) {
                                /* different type structure */
-                               return no_alias;
+                               return ir_no_alias;
                        }
                        if (is_Class_type(tp1)) {
                                /* check class hierarchy */
                                if (! is_SubClass_of(tp1, tp2) &&
                                        ! is_SubClass_of(tp2, tp1))
-                                       return no_alias;
+                                       return ir_no_alias;
                        } else {
                                /* different types */
-                               return no_alias;
+                               return ir_no_alias;
                        }
                }
        }
-       return may_alias;
+       return ir_may_alias;
 }  /* different_types */
 
 /**
- * Check if an offset is a constant and these constant is bigger or equal
- * than a given size.
+ * Returns non-zero if a node is a result on a malloc-like routine.
+ *
+ * @param node  the Proj node to test
  */
-static int check_const_offset(ir_node *offset, int size) {
-       ir_mode *mode = get_irn_mode(offset);
-
-       /* ok, we found an offset, check for constant */
-       if (is_Const(offset) && mode_is_int(mode)) {
-               tarval *tv = new_tarval_from_long(size, mode);
+static int is_malloc_Result(ir_node *node) {
+       node = get_Proj_pred(node);
+       if (! is_Proj(node))
+               return 0;
+       node = get_Proj_pred(node);
+       if (! is_Call(node))
+               return 0;
+       node = get_Call_ptr(node);
+       if (is_Global(node)) {
+               ir_entity *ent = get_Global_entity(node);
 
-               /* size <= offset ? */
-               if (tarval_cmp(tv, get_Const_tarval(offset)) & (pn_Cmp_Eq|pn_Cmp_Lt))
+               if (get_entity_additional_properties(ent) & mtp_property_malloc)
                        return 1;
+               return 0;
        }
        return 0;
-}  /* check_const_offset */
+}  /* is_malloc_Result */
 
 /**
- * Check if we can determine that the two pointers always have an offset bigger then size
+ * Classify a base pointer.
+ *
+ * @param irg  the graph of the pointer
+ * @param irn  the node representing the base address
+ * @param ent  the base entity of the base address iff any
  */
-static ir_alias_relation _different_pointer(ir_node *adr1, ir_node *adr2, int size) {
-       int found = 0;
-
-       if (is_Add(adr1)) {
-               /* first address is the result of a pointer addition */
-               ir_node *l1 = get_Add_left(adr1);
-               ir_node *r1  = get_Add_right(adr1);
-
-               if (l1 == adr2) {
-                       found = check_const_offset(r1, size);
-               } else if (r1 == adr2) {
-                       found = check_const_offset(l1, size);
-               } else if (is_Add(adr2)) {
-                       /* second address is the result of a pointer addition */
-                       ir_node *l2 = get_Add_left(adr2);
-                       ir_node *r2 = get_Add_right(adr2);
-
-                       if (l1 == l2) {
-                               return _different_pointer(r1, r2, size);
-                       } else if (l1 == r2) {
-                               return _different_pointer(r1, l2, size);
-                       } else if (r1 == l2) {
-                               return _different_pointer(l1, r2, size);
-                       } else if (r1 == r2) {
-                               return _different_pointer(l1, l2, size);
-                       }
-               }
-       } else if (is_Add(adr2)) {
-               /* second address is the result of a pointer addition */
-               ir_node *l2 = get_Add_left(adr2);
-               ir_node *r2  = get_Add_right(adr2);
-
-               if (l2 == adr1) {
-                       found = check_const_offset(r2, size);
-               } else if (r2 == adr1) {
-                       found = check_const_offset(l2, size);
-               }
-       } else {
-               return different_index(adr1, adr2, size);
+ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity *ent)
+{
+       ir_storage_class_class_t res = ir_sc_pointer;
+       if (is_Global(irn)) {
+               ir_entity *entity = get_Global_entity(irn);
+               res = ir_sc_globalvar;
+               if (get_entity_address_taken(entity) == ir_address_not_taken)
+                       res |= ir_sc_modifier_nottaken;
+       } else if (irn == get_irg_frame(irg)) {
+               res = ir_sc_localvar;
+               if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken)
+                       res |= ir_sc_modifier_nottaken;
+       } else if (is_arg_Proj(irn)) {
+               return ir_sc_argument;
+       } else if (irn == get_irg_tls(irg)) {
+               res = ir_sc_tls;
+               if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken)
+                       res |= ir_sc_modifier_nottaken;
+       } else if (is_Proj(irn) && is_malloc_Result(irn)) {
+               return ir_sc_malloced;
        }
-       return found ? no_alias : may_alias;
-}  /* _different_pointer */
 
-/**
- * Check if we can determine that the two pointers always have an offset bigger then the maximum size of mode1, mode2
- */
-static ir_alias_relation different_pointer(ir_node *adr1, ir_mode *mode1, ir_node *adr2, ir_mode *mode2) {
-       int size = get_mode_size_bytes(mode1);
-       int n    = get_mode_size_bytes(mode2);
-
-       if (n > size)
-               size = n;
-       return _different_pointer(adr1, adr2, size);
-}  /* different_pointer */
+       return res;
+}
 
 /**
- * Returns non-zero if a node is a routine parameter.
- *
- * @param node  the node to test
+ * If adr represents a Bitfield Sel, skip it
  */
-static int is_arg_Proj(ir_node *node) {
-       if (! is_Proj(node))
-               return 0;
-       node = get_Proj_pred(node);
-       if (! is_Proj(node))
-               return 0;
-       return pn_Start_T_args == get_Proj_proj(node) && is_Start(get_Proj_pred(node));
-}  /* is_arg_Proj */
+static ir_node *skip_Bitfield_Sels(ir_node *adr) {
+       if (is_Sel(adr)) {
+               ir_entity *ent     = get_Sel_entity(adr);
+               ir_type   *bf_type = get_entity_type(ent);
 
-/**
- * Returns true if an address represents a global variable.
- */
-static INLINE int is_global_var(ir_node *irn) {
-       return is_SymConst(irn) && get_SymConst_kind(irn) == symconst_addr_ent;
-}  /* is_global_var */
+               /* is it a bitfield type? */
+               if (is_Primitive_type(bf_type) && get_primitive_base_type(bf_type) != NULL)
+                       adr = get_Sel_ptr(adr);
+       }
+       return adr;
+}
 
 /**
  * Determine the alias relation between two addresses.
@@ -441,209 +458,175 @@ static ir_alias_relation _get_alias_relation(
        ir_node *adr1, ir_mode *mode1,
        ir_node *adr2, ir_mode *mode2)
 {
-       ir_opcode op1, op2;
-       ir_entity *ent1, *ent2;
-       unsigned options;
+       ir_entity             *ent1, *ent2;
+       unsigned              options;
+       long                  offset1 = 0;
+       long                  offset2 = 0;
+       ir_node               *base1;
+       ir_node               *base2;
+       ir_node               *orig_adr1 = adr1;
+       ir_node               *orig_adr2 = adr2;
+       unsigned              mode_size;
+       ir_storage_class_class_t class1, class2;
+       int                   have_const_offsets;
 
        if (! get_opt_alias_analysis())
-               return may_alias;
+               return ir_may_alias;
 
        if (adr1 == adr2)
-               return sure_alias;
+               return ir_sure_alias;
 
        options = get_irg_memory_disambiguator_options(irg);
 
        /* The Armageddon switch */
        if (options & aa_opt_no_alias)
-               return no_alias;
-
-       /* 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");
-       op1 = get_irn_opcode(adr1);
-       op2 = get_irn_opcode(adr2);
-
-       if (op1 > op2) {
-               ir_node *t = adr1;
-               ir_mode *m = mode1;
-               adr1  = adr2;
-               mode1 = mode2;
-               adr2  = t;
-               mode2 = m;
-       }
-
-       if (is_global_var(adr1)) {
-               /* first address is a global variable */
-
-               if (is_global_var(adr2)) {
-                       /* both addresses are global variables and we know
-                          they are different (R1 a) */
-                       if (get_SymConst_entity(adr1) != get_SymConst_entity(adr2))
-                               return no_alias;
-                       else {
-                               /* equal entity addresses */
-                               return sure_alias;
-                       }
+               return ir_no_alias;
+
+       /* do the addresses have constants offsets?
+        *  Note: nodes are normalized to have constants at right inputs,
+        *        sub X, C is normalized to add X, -C
+        */
+       have_const_offsets = 1;
+       while (is_Add(adr1)) {
+               ir_node *add_right = get_Add_right(adr1);
+               if (is_Const(add_right)) {
+                       tarval *tv  = get_Const_tarval(add_right);
+                       offset1    += get_tarval_long(tv);
+                       adr1        = get_Add_left(adr1);
+               } else if (mode_is_reference(get_irn_mode(add_right))) {
+                       adr1 = add_right;
+                       have_const_offsets = 0;
+               } else {
+                       adr1 = get_Add_left(adr1);
+                       have_const_offsets = 0;
                }
-               if (is_Sel(adr2)) {
-                       ir_node *base2 = find_base_adr(adr2, &ent2);
-
-                       if (is_global_var(base2)) {
-                               /* base2 address is a global var (R1 a) */
-                               if (adr1 != base2)
-                                       return no_alias;
-                               else
-                                       return different_offsets(adr1, adr2);
-                       } else if (base2 == get_irg_frame(irg)) {
-                               /* the second one is a local variable so they are always
-                                  different (R1 b) */
-                               return no_alias;
-                       } else if (base2 == get_irg_tls(irg)) {
-                               /* the second one is a TLS variable so they are always
-                                  different (R1 c) */
-                               return no_alias;
-                       }
+       }
+       while (is_Add(adr2)) {
+               ir_node *add_right = get_Add_right(adr2);
+               if (is_Const(add_right)) {
+                       tarval *tv  = get_Const_tarval(add_right);
+                       offset2    += get_tarval_long(tv);
+                       adr2        = get_Add_left(adr2);
+               } else if (mode_is_reference(get_irn_mode(add_right))) {
+                       adr2 = add_right;
+                       have_const_offsets = 0;
+               } else {
+                       adr2 = get_Add_left(adr2);
+                       have_const_offsets = 0;
                }
+       }
+
+       mode_size = get_mode_size_bytes(mode1);
+       if (get_mode_size_bytes(mode2) > mode_size) {
+               mode_size = get_mode_size_bytes(mode2);
+       }
+
+       /* same base address -> compare offsets if possible.
+        * FIXME: type long is not sufficient for this task ...
+        */
+       if (adr1 == adr2 && have_const_offsets) {
+               if ((unsigned long)labs(offset2 - offset1) >= mode_size)
+                       return ir_no_alias;
+               else
+                       return ir_sure_alias;
+       }
+
+       /*
+        * Bitfields can be constructed as Sels from its base address.
+        * As they have different entities, the disambiguator would find that they are
+        * alias free. While this is true for it's values, it is false for the addresses
+        * (strictly speaking, the Sel's are NOT the addresses of the bitfields).
+        * So, skip those bitfield selecting Sel's.
+        */
+       adr1 = skip_Bitfield_Sels(adr1);
+       adr2 = skip_Bitfield_Sels(adr2);
+
+       /* skip sels */
+       base1 = adr1;
+       base2 = adr2;
+       ent1  = NULL;
+       ent2  = NULL;
+       if (is_Sel(adr1)) {
+               base1 = find_base_adr(adr1, &ent1);
+       }
+       if (is_Sel(adr2)) {
+               base2 = find_base_adr(adr2, &ent2);
+       }
+
+       /* same base address -> compare sel entities */
+       if (base1 == base2 && ent1 != NULL && ent2 != NULL) {
+               if (ent1 != ent2)
+                       return ir_no_alias;
+               else if (have_const_offsets)
+                       return different_sel_offsets(adr1, adr2);
+       }
 
-               /* Here we are: the first is a global var, the second some pointer. */
-               ent1 = get_SymConst_entity(adr1);
-               if (get_entity_address_taken(ent1) == ir_address_not_taken) {
-                       /* The address of the global variable was never taken, so
-                          the pointer cannot match (R2). */
-                       return no_alias;
+       class1 = classify_pointer(irg, base1, ent1);
+       class2 = classify_pointer(irg, base2, ent2);
+
+       if (class1 == ir_sc_pointer) {
+               if (class2 & ir_sc_modifier_nottaken) {
+                       return ir_no_alias;
+               } else {
+                       return ir_may_alias;
                }
-       } else if (is_Sel(adr1)) {
-               /* the first address is a Sel */
-               ir_node *base1 = find_base_adr(adr1, &ent1);
-
-               if (base1 == get_irg_frame(irg)) {
-                       /* first is a local variable ent1 */
-                       if (is_Sel(adr2)) {
-                               /* the second address is a Sel */
-                               ir_node *base2 = find_base_adr(adr2, &ent2);
-
-                               if (base1 == base2) {
-                                       /* identical bases: check for different offsets */
-                                       return different_sel_offsets(adr1, adr2);
-                               } else if (base2 == get_irg_frame(irg)) {
-                                       /* both addresses are local variables and we know
-                                          they are different (R1 a) */
-                                       if (ent1 != ent2)
-                                               return no_alias;
-                               } else if (base2 == get_irg_tls(irg)) {
-                                       /* the second one is a TLS variable so they are always
-                                      different (R1 d) */
-                                       return no_alias;
-                               } else if (is_arg_Proj(base2)) {
-                                       /* the second one is an offset from a parameter so they are
-                                          always different (R1 e) */
-                                       return no_alias;
-                               }
-                       } else if (is_arg_Proj(adr2)) {
-                               /* a local variable and a parameter are always different (R1 e) */
-                               return no_alias;
-                       }
-               } else if (base1 == get_irg_tls(irg)) {
-                       /* the first is a TLS variable */
-                       if (is_Sel(adr2)) {
-                               /* the second address is a Sel */
-                               ir_node *base2 = find_base_adr(adr2, &ent2);
-
-                               if (base1 == base2)
-                                       return different_sel_offsets(adr1, adr2);
-                               else if (base2 == get_irg_frame(irg)) {
-                                       /* the second one is a local variable so they are always
-                                      different (R1 d) */
-                                       return no_alias;
-                               } else if (base2 == get_irg_tls(irg)) {
-                                       /* both addresses are TLS variables and we know
-                                          they are different (R1 a) */
-                                       if (ent1 != ent2)
-                                               return no_alias;
-                               }
-                       }
-               } else if (is_arg_Proj(base1)) {
-                       /* the first one is an offset from a parameter */
-                       if (is_Sel(adr2)) {
-                               /* the second address is a Sel */
-                               ir_node *base2 = find_base_adr(adr2, &ent2);
-
-                               if (base2 == get_irg_frame(irg)) {
-                                       /* the second one is a local variable so they are always
-                                      different (R1 e) */
-                                       return no_alias;
-                               }
-                       }
-               } else if (is_global_var(base1)) {
-                       /* the first one is a global variable */
-                       ent1 = get_SymConst_entity(base1);
-                       if (is_Sel(adr2)) {
-                               /* the second address is a Sel */
-                               ir_node *base2 = find_base_adr(adr2, &ent2);
-
-                               if (base1 == base2)
-                                       return different_sel_offsets(adr1, adr2);
-                               else if (base2 == get_irg_frame(irg)) {
-                                       /* the second one is a local variable so they are always
-                                      different (R1 a) */
-                                       return no_alias;
-                               } else if (base2 == get_irg_tls(irg)) {
-                                       /* the second one is a TLS variable so they are always
-                                      different (R1 a) */
-                                       return no_alias;
-                               } else if (is_arg_Proj(base2)) {
-                                       if (get_entity_address_taken(ent1) == ir_address_not_taken) {
-                                               /* The address of the global variable was never taken, so
-                                                  the pointer cannot match (R2). */
-                                               return no_alias;
-                                       }
-                               } else if (is_global_var(base2)) {
-                                       ent2 = get_SymConst_entity(base2);
-                                       /* both addresses are global variables and we know
-                                          they are different (R1 a) */
-                                       if (ent1 != ent2)
-                                               return no_alias;
-                               }
-                       }
+       } else if (class2 == ir_sc_pointer) {
+               if (class1 & ir_sc_modifier_nottaken) {
+                       return ir_no_alias;
+               } else {
+                       return ir_may_alias;
                }
-       } else {
-               /* some pointers, check if they have the same base buf constant offset */
-               ir_alias_relation rel = different_pointer(adr1, mode1, adr2, mode2);
-               if (rel != may_alias)
-                       return rel;
        }
 
+       if (class1 != class2) {
+               return ir_no_alias;
+       }
+
+       if (class1 == ir_sc_globalvar) {
+               ir_entity *entity1 = get_SymConst_entity(base1);
+               ir_entity *entity2 = get_SymConst_entity(base2);
+               if (entity1 != entity2)
+                       return ir_no_alias;
+
+               /* for some reason CSE didn't happen yet for the 2 SymConsts... */
+               return ir_may_alias;
+       }
 
-       if (options & aa_opt_type_based) { /* Type based alias analysis */
+       /* Type based alias analysis */
+       if (options & aa_opt_type_based) {
                ir_alias_relation rel;
 
                if (options & aa_opt_byte_type_may_alias) {
                        if (get_mode_size_bits(mode1) == 8 || get_mode_size_bits(mode2) == 8) {
-                               /* One of the modes address a byte. Assume a may_alias and leave
+                               /* One of the modes address a byte. Assume a ir_may_alias and leave
                                   the type based check. */
                                goto leave_type_based_alias;
                        }
                }
                /* cheap check: If the mode sizes did not match, the types MUST be different */
                if (get_mode_size_bits(mode1) != get_mode_size_bits(mode2))
-                       return no_alias;
+                       return ir_no_alias;
+
+               /* cheap test: if only one is a reference mode, no alias */
+               if (mode_is_reference(mode1) != mode_is_reference(mode2))
+                       return ir_no_alias;
 
                /* try rule R5 */
-               rel = different_types(adr1, adr2);
-               if (rel != may_alias)
+               rel = different_types(orig_adr1, orig_adr2);
+               if (rel != ir_may_alias)
                        return rel;
 leave_type_based_alias:;
        }
 
        /* do we have a language specific memory disambiguator? */
        if (language_disambuigator) {
-               ir_alias_relation rel = (*language_disambuigator)(irg, adr1, mode1, adr2, mode2);
-               if (rel != may_alias)
+               ir_alias_relation rel = (*language_disambuigator)(irg, orig_adr1, mode1, orig_adr2, mode2);
+               if (rel != ir_may_alias)
                        return rel;
        }
 
        /* access points-to information here */
-       return may_alias;
+       return ir_may_alias;
 }  /* _get_alias_relation */
 
 /*
@@ -655,6 +638,7 @@ ir_alias_relation get_alias_relation(
        ir_node *adr2, ir_mode *mode2)
 {
        ir_alias_relation rel = _get_alias_relation(irg, adr1, mode1, adr2, mode2);
+       DB((dbg, LEVEL_1, "alias(%+F, %+F) = %s\n", adr1, adr2, get_ir_alias_relation_name(rel)));
        return rel;
 }  /* get_alias_relation */
 
@@ -681,6 +665,7 @@ typedef struct mem_disambig_entry {
 static int cmp_mem_disambig_entry(const void *elt, const void *key, size_t size) {
        const mem_disambig_entry *p1 = elt;
        const mem_disambig_entry *p2 = key;
+       (void) size;
 
        return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2;
 }  /* cmp_mem_disambig_entry */
@@ -702,8 +687,10 @@ ir_alias_relation get_alias_relation_ex(
 {
        mem_disambig_entry key, *entry;
 
+       ir_fprintf(stderr, "%+F <-> %+F\n", adr1, adr2);
+
        if (! get_opt_alias_analysis())
-               return may_alias;
+               return ir_may_alias;
 
        if (get_irn_opcode(adr1) > get_irn_opcode(adr2)) {
                ir_node *t = adr1;
@@ -768,10 +755,11 @@ static int is_hidden_cast(ir_mode *mode, ir_mode *ent_mode) {
  * @param irn  the node
  */
 static ir_address_taken_state find_address_taken_state(ir_node *irn) {
-       int     i;
-       ir_mode *emode, *mode;
-       ir_node *value;
+       int       i, j;
+       ir_mode   *emode, *mode;
+       ir_node   *value;
        ir_entity *ent;
+       ir_type   *tp;
 
        for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
                ir_node *succ = get_irn_out(irn, i);
@@ -799,6 +787,16 @@ static ir_address_taken_state find_address_taken_state(ir_node *irn) {
                                return ir_address_taken;
                        break;
 
+               case iro_CopyB:
+                       /* CopyB are like Loads/Stores */
+                       ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn);
+                       tp  = get_entity_type(ent);
+                       if (tp != get_CopyB_type(succ)) {
+                               /* bad, different types, might be a hidden conversion */
+                               return ir_address_taken;
+                       }
+                       break;
+
                case iro_Sel: {
                        /* Check the successor of irn. */
                        ir_address_taken_state res = find_address_taken_state(succ);
@@ -810,7 +808,12 @@ static ir_address_taken_state find_address_taken_state(ir_node *irn) {
                case iro_Call:
                        /* Only the call address is not an address taker but
                           this is an uninteresting case, so we ignore it here. */
-                       return ir_address_taken;
+                       for (j = get_Call_n_params(succ) - 1; j >= 0; --j) {
+                               ir_node *param = get_Call_param(succ, j);
+                               if (param == irn)
+                                       return ir_address_taken;
+                       }
+                       break;
 
                default:
                        /* another op, the address may be taken */
@@ -875,6 +878,7 @@ void assure_irg_address_taken_computed(ir_graph *irg) {
                analyse_irg_address_taken(irg);
 }  /* assure_irg_address_taken_computed */
 
+
 /**
  * Initialize the address_taken flag for a global type like type.
  */
@@ -893,6 +897,88 @@ static void init_taken_flag(ir_type * tp) {
        }
 }  /* init_taken_flag */
 
+static void check_initializer_nodes(ir_initializer_t *initializer)
+{
+       switch (initializer->kind) {
+       case IR_INITIALIZER_CONST: {
+               ir_node *n = initializer->consti.value;
+
+               /* let's check if it's an address */
+               if (is_Global(n)) {
+                       ir_entity *ent = get_Global_entity(n);
+                       set_entity_address_taken(ent, ir_address_taken);
+               }
+               return;
+       }
+       case IR_INITIALIZER_TARVAL:
+       case IR_INITIALIZER_NULL:
+               return;
+       case IR_INITIALIZER_COMPOUND: {
+               size_t i;
+
+               for (i = 0; i < initializer->compound.n_initializers; ++i) {
+                       ir_initializer_t *sub_initializer
+                               = initializer->compound.initializers[i];
+                       check_initializer_nodes(sub_initializer);
+               }
+               return;
+       }
+       }
+       panic("invalid initialzier found");
+}
+
+/**
+ * Mark all entities used in the initializer for the given entity as address taken
+ */
+static void check_initializer(ir_entity *ent) {
+       ir_node *n;
+       int i;
+
+       /* do not check uninitialized values */
+       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 (ent->has_initializer) {
+               check_initializer_nodes(ent->attr.initializer);
+       } else if (is_atomic_entity(ent)) {
+               /* let's check if it's an address */
+               n = get_atomic_ent_value(ent);
+               if (is_Global(n)) {
+                       ir_entity *ent = get_Global_entity(n);
+                       set_entity_address_taken(ent, ir_address_taken);
+               }
+       } else {
+               for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) {
+                       n = get_compound_ent_value(ent, i);
+
+                       /* let's check if it's an address */
+                       if (is_Global(n)) {
+                               ir_entity *ent = get_Global_entity(n);
+                               set_entity_address_taken(ent, ir_address_taken);
+                       }
+               }
+       }
+}  /* check_initializer */
+
+
+/**
+ * Mark all entities used in initializers as address taken
+ */
+static void check_initializers(ir_type *tp) {
+       int i;
+
+       for (i = get_compound_n_members(tp) - 1; i >= 0; --i) {
+               ir_entity *ent = get_compound_member(tp, i);
+
+               check_initializer(ent);
+       }
+}  /* check_initializers */
+
 #ifdef DEBUG_libfirm
 /**
  * Print the address taken state of all entities of a given type for debugging.
@@ -904,7 +990,7 @@ static void print_address_taken_state(ir_type *tp) {
                ir_address_taken_state state = get_entity_address_taken(ent);
 
                if (state != ir_address_not_taken) {
-                       assert(ir_address_not_taken <= state && state <= ir_address_taken);
+                       assert(ir_address_not_taken <= (int) state && state <= ir_address_taken);
                        ir_printf("%+F: %s\n", ent, get_address_taken_state_name(state));
                }
        }
@@ -919,9 +1005,9 @@ static void check_global_address(ir_node *irn, void *env) {
        ir_entity *ent;
        ir_address_taken_state state;
 
-       if (is_SymConst(irn) && get_SymConst_kind(irn) == symconst_addr_ent) {
+       if (is_Global(irn)) {
                /* A global. */
-               ent = get_SymConst_entity(irn);
+               ent = get_Global_entity(irn);
        } else if (is_Sel(irn) && get_Sel_ptr(irn) == tls) {
                /* A TLS variable. */
                ent = get_Sel_entity(irn);
@@ -948,6 +1034,9 @@ static void analyse_irp_globals_address_taken(void) {
        init_taken_flag(get_glob_type());
        init_taken_flag(get_tls_type());
 
+       check_initializers(get_glob_type());
+       check_initializers(get_tls_type());
+
        for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
                ir_graph *irg = get_irp_irg(i);
 
@@ -981,3 +1070,96 @@ void assure_irp_globals_address_taken_computed(void) {
        if (irp->globals_adr_taken_state == ir_address_taken_not_computed)
                analyse_irp_globals_address_taken();
 }  /* assure_irp_globals_address_taken_computed */
+
+
+#include <adt/pmap.h>
+#include "typerep.h"
+
+DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;)
+
+/** Maps method types to cloned method types. */
+static pmap *mtp_map;
+
+/**
+ * Clone a method type if not already cloned.
+ */
+static ir_type *clone_type_and_cache(ir_type *tp) {
+       static ident *prefix = NULL;
+       ir_type *res;
+       pmap_entry *e = pmap_find(mtp_map, tp);
+
+       if (e)
+               return e->value;
+
+       if (prefix == NULL)
+               prefix = new_id_from_chars("C", 1);
+
+       res = clone_type_method(tp, prefix);
+       pmap_insert(mtp_map, tp, res);
+       DB((dbgcall, LEVEL_2, "cloned type %+F into %+F\n", tp, res));
+
+       return res;
+}  /* clone_type_and_cache */
+
+/**
+ * Copy the calling conventions from the entities to the call type.
+ */
+static void update_calls_to_private(ir_node *call, void *env) {
+       (void) env;
+       if (is_Call(call)) {
+               ir_node *ptr = get_Call_ptr(call);
+
+               if (is_SymConst(ptr)) {
+                       ir_entity *ent = get_SymConst_entity(ptr);
+                       ir_type *ctp = get_Call_type(call);
+
+                       if (get_entity_additional_properties(ent) & mtp_property_private) {
+                               if ((get_method_additional_properties(ctp) & mtp_property_private) == 0) {
+                                       ctp = clone_type_and_cache(ctp);
+                                       set_method_additional_property(ctp, mtp_property_private);
+                                       set_Call_type(call, ctp);
+                                       DB((dbgcall, LEVEL_1, "changed call to private method %+F\n", ent));
+                               }
+                       }
+               }
+       }
+}  /* update_calls_to_private */
+
+/* Mark all private methods, i.e. those of which all call sites are known. */
+void mark_private_methods(void) {
+       int i;
+       int changed = 0;
+
+       FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc");
+
+       assure_irp_globals_address_taken_computed();
+
+       mtp_map = pmap_create();
+
+       /* first step: change the calling conventions of the local non-escaped entities */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph               *irg = get_irp_irg(i);
+               ir_entity              *ent = get_irg_entity(irg);
+               ir_address_taken_state state = get_entity_address_taken(ent);
+
+               if (get_entity_visibility(ent) == visibility_local &&
+                   state == ir_address_not_taken) {
+                       ir_type *mtp = get_entity_type(ent);
+
+                       set_entity_additional_property(ent, mtp_property_private);
+                       DB((dbgcall, LEVEL_1, "found private method %+F\n", ent));
+                       if ((get_method_additional_properties(mtp) & mtp_property_private) == 0) {
+                               /* need a new type */
+                               mtp = clone_type_and_cache(mtp);
+                               set_entity_type(ent, mtp);
+                               set_method_additional_property(mtp, mtp_property_private);
+                               changed = 1;
+                       }
+               }
+       }
+
+       if (changed)
+               all_irg_walk(NULL, update_calls_to_private, NULL);
+
+       pmap_destroy(mtp_map);
+}  /* mark_private_methods */