X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=7f46e83a8bb8286d6e8847917649ae165bb73aae;hb=93b64cafc0e845edeabb526b304c4cb7b48ea14b;hp=94891fffbd05fe840c627cc0c3df1597bca02b7d;hpb=0562b784fa989547001f390323209e873be92603;p=libfirm

diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c
index 94891fffb..7f46e83a8 100644
--- a/ir/ana/irmemory.c
+++ b/ir/ana/irmemory.c
@@ -1,13 +1,28 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ana/irmemory.c
- * Purpose:     Memory disambiguator
- * Author:      Michael Beck
- * Modified by:
- * Created:     27.12.2006
- * CVS-ID:      $Id$
- * Copyright:   (c) 2006-2007 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief    Memory disambiguator
+ * @author   Michael Beck
+ * @date     27.12.2006
+ * @version  $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -25,6 +40,10 @@
 #include "irouts.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "debug.h"
+
+/** The debug handle. */
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 /** The source language specific language disambiguator function. */
 static DISAMBIGUATOR_FUNC language_disambuigator = NULL;
@@ -32,9 +51,21 @@ 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(no_alias);
+	X(may_alias);
+	X(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_disamgig_opt;
+	unsigned opt = irg->mem_disambig_opt;
 	if (opt & aa_opt_inherited)
 		return global_mem_disamgig_opt;
 	return opt;
@@ -42,7 +73,7 @@ unsigned get_irg_memory_disambiguator_options(ir_graph *irg) {
 
 /*  Set the memory disambiguator options for a graph. */
 void set_irg_memory_disambiguator_options(ir_graph *irg, unsigned options) {
-	irg->mem_disamgig_opt = options & ~aa_opt_inherited;
+	irg->mem_disambig_opt = options & ~aa_opt_inherited;
 }  /* set_irg_memory_disambiguator_options */
 
 /* Set the global disambiguator options for all graphs not having local options. */
@@ -70,15 +101,228 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) {
 }  /* find_base_adr */
 
 /**
- * Two address expressions have the same base address,
- * check if there offsets are different.
+ * Check if a given Const node is greater or equal a given size.
+ *
+ * @return no_alias if the Const is greater, 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 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 */
+
+/**
+ * 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
+ */
+static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) {
+	if (idx1 == idx2)
+		return 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;
+
+		/* 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;
+			tv2 = t;
+		}
+		/* tv1 is now the "smaller" one */
+		tv      = tarval_sub(tv2, tv1);
+		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;
+	}
+
+	/* Note: we rely here on the fact that normalization puts constants on the RIGHT side */
+	if (is_Add(idx1)) {
+		ir_node *l1 = get_Add_left(idx1);
+		ir_node *r1 = get_Add_right(idx1);
+
+		if (l1 == idx2) {
+			/* x + c == y */
+			if (is_Const(r1))
+				return check_const(r1, size);
+		}
+		if (is_Add(idx2)) {
+			/* 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);
+
+			if (l1 == l2)
+				return different_index(r1, r2, size);
+			else if (l1 == r2)
+				return different_index(r1, l2, size);
+			else if (r1 == r2)
+				return different_index(l1, l2, size);
+			else if (r1 == l2)
+				return different_index(l1, r2, size);
+		}
+	}
+	if (is_Add(idx2)) {
+		ir_node *l2 = get_Add_left(idx2);
+		ir_node *r2 = get_Add_right(idx2);
+
+		if (l2 == idx1) {
+			/* x + c == y */
+			if (is_Const(r2))
+				return check_const(r2, size);
+		}
+	}
+
+	if (is_Sub(idx1)) {
+		ir_node *l1 = get_Sub_left(idx1);
+		ir_node *r1 = get_Sub_right(idx1);
+
+		if (l1 == idx2) {
+			/* x - c == y */
+			if (is_Const(r1))
+				return check_const(r1, size);
+		}
+
+		if (is_Sub(idx2)) {
+			/* both are Subs, check if they are of x - a == x - b kind */
+			ir_node *l2 = get_Sub_left(idx2);
+
+			if (l1 == l2) {
+				ir_node *r2 = get_Sub_right(idx2);
+				return different_index(r1, r2, size);
+			}
+		}
+	}
+	if (is_Sub(idx2)) {
+		ir_node *l2 = get_Sub_left(idx2);
+		ir_node *r2 = get_Sub_right(idx2);
+
+		if (l2 == idx1) {
+			/* x - c == y */
+			if (is_Const(r2))
+				return check_const(r2, size);
+		}
+
+	}
+	return may_alias;
+}  /* different_index */
+
+/**
+ * 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_offsets(ir_node *adr1, ir_node *adr2) {
+static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) {
+	/* seems to be broken */
+#if 0
+	ir_entity *ent1 = get_Sel_entity(sel1);
+	ir_entity *ent2 = get_Sel_entity(sel2);
+	int i, check_arr = 0;
+
+	if (ent1 == ent2)
+		check_arr = 1;
+	else {
+		ir_type *tp1 = get_entity_type(ent1);
+		ir_type *tp2 = get_entity_type(ent2);
+
+		if (tp1 == tp2)
+			check_arr = 1;
+		else if (get_type_state(tp1) == layout_fixed && get_type_state(tp2) == layout_fixed &&
+		         get_type_size_bits(tp1) == get_type_size_bits(tp2))
+			check_arr = 1;
+	}
+	if (check_arr) {
+		/* we select an entity of same size, check for indexes */
+		int n = get_Sel_n_indexs(sel1);
+		int have_no = 0;
+
+		if (n > 0 && n == get_Sel_n_indexs(sel2)) {
+			/* same non-zero number of indexes, an array access, check */
+			for (i = 0; i < n; ++i) {
+				ir_node *idx1 = get_Sel_index(sel1, i);
+				ir_node *idx2 = get_Sel_index(sel2, i);
+				ir_alias_relation res = different_index(idx1, idx2, 0); /* we can safely IGNORE the size here if it's at least >0 */
+
+				if (res == may_alias)
+					return may_alias;
+				else if (res == no_alias)
+					have_no = 1;
+			}
+			/* if we have at least one no_alias, there is no alias relation, else we have sure */
+			return have_no > 0 ? no_alias : sure_alias;
+		}
+	}
+#endif
 	return may_alias;
-}  /* different_offsets */
+}  /* different_sel_offsets */
 
 /**
  * Determine the alias relation by checking if adr1 and adr2 are pointer
@@ -91,12 +335,12 @@ 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)
+	if (is_SymConst_addr_ent(adr1))
 		ent1 = get_SymConst_entity(adr1);
 	else if (is_Sel(adr1))
 		ent1 = get_Sel_entity(adr1);
 
-	if (is_SymConst(adr2) && get_SymConst_kind(adr2) == symconst_addr_ent)
+	if (is_SymConst_addr_ent(adr2))
 		ent2 = get_SymConst_entity(adr2);
 	else if (is_Sel(adr2))
 		ent2 = get_Sel_entity(adr2);
@@ -132,6 +376,105 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2)
 	return may_alias;
 }  /* different_types */
 
+/**
+ * Check if an offset is a constant and these constant is bigger or equal
+ * than a given size.
+ */
+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);
+
+		/* size <= offset ? */
+		if (tarval_cmp(tv, get_Const_tarval(offset)) & (pn_Cmp_Eq|pn_Cmp_Lt))
+			return 1;
+	}
+	return 0;
+}  /* check_const_offset */
+
+/**
+ * Check if we can determine that the two pointers always have an offset bigger then size
+ */
+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);
+	}
+	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 */
+
+/**
+ * Returns non-zero if a node is a routine parameter.
+ *
+ * @param node  the node to test
+ */
+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 */
+
+/**
+ * Returns true if an address represents a global variable.
+ *
+ * @param irn  the node representing the address
+ */
+static INLINE int is_global_var(ir_node *irn) {
+	return is_SymConst_addr_ent(irn);
+}  /* is_global_var */
+
 /**
  * Determine the alias relation between two addresses.
  */
@@ -140,7 +483,7 @@ static ir_alias_relation _get_alias_relation(
 	ir_node *adr1, ir_mode *mode1,
 	ir_node *adr2, ir_mode *mode2)
 {
-	opcode op1, op2;
+	ir_opcode op1, op2;
 	ir_entity *ent1, *ent2;
 	unsigned options;
 
@@ -158,7 +501,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 && "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);
 
@@ -171,33 +514,31 @@ static ir_alias_relation _get_alias_relation(
 		mode2 = m;
 	}
 
-	if (is_SymConst(adr1) && get_SymConst_kind(adr1) == symconst_addr_ent) {
+	if (is_global_var(adr1)) {
 		/* first address is a global variable */
 
-		if (is_SymConst(adr2) && get_SymConst_kind(adr2) == symconst_addr_ent) {
+		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 addresses */
+				/* equal entity addresses */
 				return sure_alias;
 			}
 		}
 		if (is_Sel(adr2)) {
-			ir_node *base = find_base_adr(adr2, &ent2);
+			ir_node *base2 = find_base_adr(adr2, &ent2);
 
-			if (is_SymConst(base) && get_SymConst_kind(base) == symconst_addr_ent) {
-				/* base address is a global var (R1 a) */
-				if (adr1 != base)
+			if (is_global_var(base2)) {
+				/* base2 address is a global var (R1 a) */
+				if (adr1 != base2)
 					return no_alias;
-				if (base == adr1)
-					return different_offsets(adr1, adr2);
-			} else if (base == get_irg_frame(irg)) {
+			} 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 (base == get_irg_tls(irg)) {
+			} else if (base2 == get_irg_tls(irg)) {
 				/* the second one is a TLS variable so they are always
 				   different (R1 c) */
 				return no_alias;
@@ -216,23 +557,33 @@ static ir_alias_relation _get_alias_relation(
 		ir_node *base1 = find_base_adr(adr1, &ent1);
 
 		if (base1 == get_irg_frame(irg)) {
-			/* the first is a local variable */
+			/* 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 (base2 == get_irg_frame(irg)) {
-					/* both addresses are local variables and we know
-					   they are different (R1 a) */
-					if (ent1 != ent2)
+				if (base1 == base2) {
+					/* identical bases: both are local variables */
+					if (ent1 != ent2) {
+						/* both addresses are local variables and we know
+					       they are different (R1 a) */
 						return no_alias;
-					else
-						return different_offsets(adr1, adr2);
+					} else {
+						/* same local var */
+						return different_sel_offsets(adr1, adr2);
+					}
 				} 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 */
@@ -240,39 +591,97 @@ static ir_alias_relation _get_alias_relation(
 				/* the second address is a Sel */
 				ir_node *base2 = find_base_adr(adr2, &ent2);
 
+				if (base1 == base2)
+					if (ent1 != ent2) {
+						/* both addresses are tls variables and we know
+					       they are different (R1 a) */
+					} else {
+						/* same tls var */
+						return different_sel_offsets(adr1, adr2);
+					}
+				else if (base2 == get_irg_frame(irg)) {
+					/* the first one is a tls variable, the second a local one,
+					   they are different (R1 d) */
+					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 d) */
+				       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) {
+					/* same global var */
+					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)) {
-					/* both addresses are TLS variables and we know
+					/* 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
-						return different_offsets(adr1, adr2);
 				}
 			}
 		}
+	} 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 (options & aa_opt_type_based) {
+
+	if (options & aa_opt_type_based) { /* Type based alias analysis */
 		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. */
-				return may_alias;
+				/* One of the modes address a byte. Assume a 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;
 
+		/* 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)
 			return rel;
+leave_type_based_alias:;
 	}
 
 	/* do we have a language specific memory disambiguator? */
@@ -295,6 +704,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 */
 
@@ -321,6 +731,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 */
@@ -408,7 +819,7 @@ 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;
+	int     i, j;
 	ir_mode *emode, *mode;
 	ir_node *value;
 	ir_entity *ent;
@@ -450,7 +861,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 */
@@ -515,6 +931,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.
  */
@@ -533,6 +950,57 @@ static void init_taken_flag(ir_type * tp) {
 	}
 }  /* init_taken_flag */
 
+/**
+ * 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 (is_atomic_entity(ent)) {
+		/* let's check if it's an address */
+		n = get_atomic_ent_value(ent);
+		if (is_SymConst_addr_ent(n)) {
+			ir_entity *ent = get_SymConst_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_SymConst_addr_ent(n)) {
+				ir_entity *ent = get_SymConst_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.
  */
@@ -543,11 +1011,12 @@ 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));
 		}
 	}
 }  /* print_address_taken_state */
+#endif /* DEBUG_libfirm */
 
 /**
  * Post-walker: check for global entity address
@@ -557,16 +1026,16 @@ 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_SymConst_addr_ent(irn)) {
 		/* A global. */
 		ent = get_SymConst_entity(irn);
 	} else if (is_Sel(irn) && get_Sel_ptr(irn) == tls) {
 		/* A TLS variable. */
-		ent = get_SymConst_entity(irn);
+		ent = get_Sel_entity(irn);
 	} else
 		return;
 
-	if (get_entity_address_taken(ent) == ir_address_not_taken) {
+	if (get_entity_address_taken(ent) >= ir_address_taken) {
 		/* Already at the maximum. */
 		return;
 	}
@@ -581,17 +1050,27 @@ static void check_global_address(ir_node *irn, void *env) {
 static void analyse_irp_globals_address_taken(void) {
 	int i;
 
+	FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory");
+
 	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);
 
 		assure_irg_outs(irg);
 		irg_walk_graph(irg, NULL, check_global_address, get_irg_tls(irg));
 	}
-	//print_address_taken_state(get_glob_type());
-	//print_address_taken_state(get_tls_type());
+
+#ifdef DEBUG_libfirm
+	if (firm_dbg_get_mask(dbg) & LEVEL_1) {
+		print_address_taken_state(get_glob_type());
+		print_address_taken_state(get_tls_type());
+	}
+#endif /* DEBUG_libfirm */
 
 	/* now computed */
 	irp->globals_adr_taken_state = ir_address_taken_computed;
@@ -612,3 +1091,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 */