X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=5cd3afa6aa8ff51cd49dd6b47acee086aab15072;hb=499386367a50858d3dea1b0ea9ed58c8389a6146;hp=f65b3466739fcc88f62a80ebf7a0016c941ffc0e;hpb=81d4cf5aeab4d0c0bc2a5e7c461d58ee7a7522d6;p=libfirm

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index f65b34667..5cd3afa6a 100644
--- a/ir/lower/lower_calls.c
+++ b/ir/lower/lower_calls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @version $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "lowering.h"
 #include "irprog_t.h"
@@ -41,7 +39,6 @@
 #include "iroptimize.h"
 #include "array_t.h"
 #include "pmap.h"
-#include "xmalloc.h"
 #include "error.h"
 
 /** A type map for def_find_pointer_type. */
@@ -51,18 +48,15 @@ static pmap *type_map;
  * Default implementation for finding a pointer type for a given element type.
  * Simple create a new one.
  */
-static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignment)
+static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode,
+                                      int alignment)
 {
-	ir_type *res;
-	pmap_entry *e;
-
 	/* Mode and alignment are always identical in all calls to def_find_pointer_type(), so
 	   we simply can use a map from the element type to the pointer type. */
-	e = pmap_find(type_map, e_type);
-	if (e)
-		res = e->value;
-	else {
-		res = new_type_pointer(mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, mode);
+	ir_type *res = (ir_type*)pmap_get(type_map, e_type);
+	if (res == NULL || get_type_mode(res) != mode) {
+		res = new_type_pointer(e_type);
+		set_type_mode(res, mode);
 		set_type_alignment_bytes(res, alignment);
 		pmap_insert(type_map, e_type, res);
 	}
@@ -83,20 +77,15 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 {
 	ir_type *lowered, *ptr_tp;
 	ir_type **params, **results, *res_tp;
+	size_t  *param_map;
 	ir_mode *modes[MAX_REGISTER_RET_VAL];
-	int n_ress, n_params, nn_ress, nn_params, i, first_variadic;
-	ident *id;
+	size_t  n_ress, n_params, nn_ress, nn_params, i;
 	add_hidden hidden_params;
 	int        changed = 0;
-	variadicity var;
-
-	if (is_lowered_type(mtp)) {
-		/* the type is already lowered. Not handled yet. */
-		assert(0 && "lowered types NYI");
-	}
+	ir_variadicity var;
 
 	lowered = get_associated_type(mtp);
-	if (lowered)
+	if (lowered != NULL)
 		return lowered;
 
 	n_ress   = get_method_n_ress(mtp);
@@ -105,7 +94,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	n_params = get_method_n_params(mtp);
 	NEW_ARR_A(ir_type *, params, n_params + n_ress);
 
-	first_variadic = get_method_first_variadic_param_index(mtp);
+	NEW_ARR_A(size_t, param_map, n_params + n_ress);
 
 	hidden_params = lp->hidden_params;
 	if (hidden_params == ADD_HIDDEN_SMART &&
@@ -131,43 +120,48 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 					/* this compound will be allocated on callers stack and its
 					   address will be transmitted as a hidden parameter. */
 					ptr_tp = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
-					params[nn_params++] = ptr_tp;
+					params[nn_params]    = ptr_tp;
+					param_map[nn_params] = n_params + i;
+					++nn_params;
 					changed++;
 					if (lp->flags & LF_RETURN_HIDDEN)
 						results[nn_ress++] = ptr_tp;
 				}
-			}
-			else
+			} else {
+				/* scalar result */
 				results[nn_ress++] = res_tp;
+			}
 		}
 
-		/* move the index of the first variadic parameter */
-		first_variadic += nn_params;
-
-		for (i = 0; i < n_params; ++i)
-			params[nn_params++] = get_method_param_type(mtp, i);
-	}
-	else {
+		for (i = 0; i < n_params; ++i, ++nn_params) {
+			params[nn_params]    = get_method_param_type(mtp, i);
+			param_map[nn_params] = i;
+		}
+	} else {
 		/* add hidden parameters last */
 		assert(get_method_variadicity(mtp) == variadicity_non_variadic &&
 			"Cannot add hidden parameters at end of variadic function");
 
-		for (nn_params = 0; nn_params < n_params; ++nn_params)
-			params[nn_params] = get_method_param_type(mtp, nn_params);
+		for (nn_params = 0; nn_params < n_params; ++nn_params) {
+			params[nn_params]    = get_method_param_type(mtp, nn_params);
+			param_map[nn_params] = nn_params;
+		}
 
 		for (nn_ress = i = 0; i < n_ress; ++i) {
 			res_tp = get_method_res_type(mtp, i);
 
-			if (is_compound_type(res_tp))
-				params[nn_params++] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
-			else
+			if (is_compound_type(res_tp)) {
+				params[nn_params] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
+				param_map[nn_params] = n_params + i;
+				++nn_params;
+			} else {
 				results[nn_ress++] = res_tp;
+			}
 		}
 	}
 
 	/* create the new type */
-	id = mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp));
-	lowered = new_d_type_method(id, nn_params, nn_ress, get_type_dbg_info(mtp));
+	lowered = new_d_type_method(nn_params, nn_ress, get_type_dbg_info(mtp));
 
 	/* fill it */
 	for (i = 0; i < nn_params; ++i)
@@ -177,13 +171,12 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 
 	var = get_method_variadicity(mtp);
 	set_method_variadicity(lowered, var);
-	if (var == variadicity_variadic)
-		set_method_first_variadic_param_index(lowered, first_variadic);
 
 	/* associate the lowered type with the original one for easier access */
-	if(changed) {
+	if (changed) {
 		set_method_calling_convention(lowered, get_method_calling_convention(mtp) | cc_compound_ret);
 	}
+
 	set_lowered_type(mtp, lowered);
 
 	return lowered;
@@ -202,14 +195,16 @@ struct cl_entry {
 /**
  * Walker environment for fix_args_and_collect_calls().
  */
-typedef struct _wlk_env_t {
-	int                  arg_shift;        /**< The Argument index shift for parameters. */
-	int                  first_hidden;     /**< The index of the first hidden argument. */
+typedef struct wlk_env_t {
+	size_t               arg_shift;        /**< The Argument index shift for parameters. */
+	size_t               first_hidden;     /**< The index of the first hidden argument. */
 	struct obstack       obst;             /**< An obstack to allocate the data on. */
 	cl_entry             *cl_list;         /**< The call list. */
 	pmap                 *dummy_map;       /**< A map for finding the dummy arguments. */
 	unsigned             dnr;              /**< The dummy index number. */
 	const lower_params_t *params;          /**< Lowering parameters. */
+	ir_type              *lowered_mtp;     /**< The lowered method type of the current irg if any. */
+	ir_type              *value_params;    /**< The value params type if any. */
 	unsigned             only_local_mem:1; /**< Set if only local memory access was found. */
 	unsigned             changed:1;        /**< Set if the current graph was changed. */
 } wlk_env;
@@ -222,10 +217,11 @@ typedef struct _wlk_env_t {
  * @param call   A Call node.
  * @param env    The environment.
  */
-static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) {
-	cl_entry *res = get_irn_link(call);
+static cl_entry *get_Call_entry(ir_node *call, wlk_env *env)
+{
+	cl_entry *res = (cl_entry*)get_irn_link(call);
 	if (res == NULL) {
-		cl_entry *res = obstack_alloc(&env->obst, sizeof(*res));
+		cl_entry *res = OALLOC(&env->obst, cl_entry);
 		res->next  = env->cl_list;
 		res->call  = call;
 		res->copyb = NULL;
@@ -242,7 +238,8 @@ static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) {
  * @param adr   the address
  * @param pEnt  points to the base entity if any
  */
-static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt) {
+static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt)
+{
 	ir_entity *ent = NULL;
 	assert(mode_is_reference(get_irn_mode(ptr)));
 
@@ -271,13 +268,14 @@ static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt) {
 /**
  * Check if a given pointer represents non-local memory.
  */
-static void check_ptr(ir_node *ptr, wlk_env *env) {
+static void check_ptr(ir_node *ptr, wlk_env *env)
+{
 	ir_storage_class_class_t sc;
 	ir_entity                *ent;
 
 	/* still alias free */
 	ptr = find_base_adr(ptr, &ent);
-	sc  = classify_pointer(current_ir_graph, ptr, ent);
+	sc  = get_base_sc(classify_pointer(ptr, ent));
 	if (sc != ir_sc_localvar && sc != ir_sc_malloced) {
 		/* non-local memory access */
 		env->only_local_mem = 0;
@@ -290,13 +288,27 @@ static void check_ptr(ir_node *ptr, wlk_env *env) {
  * If a non-alias free memory access is found, reset the alias free
  * flag.
  */
-static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
-	wlk_env *env = ctx;
-	int      i;
+static void fix_args_and_collect_calls(ir_node *n, void *ctx)
+{
+	wlk_env *env = (wlk_env*)ctx;
 	ir_type *ctp;
 	ir_node *ptr;
 
 	switch (get_irn_opcode(n)) {
+	case iro_Sel:
+		if (env->lowered_mtp != NULL && env->value_params != NULL) {
+			ir_entity *ent = get_Sel_entity(n);
+
+			if (get_entity_owner(ent) == env->value_params) {
+				size_t pos = get_struct_member_index(env->value_params, ent) + env->arg_shift;
+				ir_entity *new_ent;
+
+				new_ent = get_method_value_param_ent(env->lowered_mtp, pos);
+				set_entity_ident(new_ent, get_entity_ident(ent));
+				set_Sel_entity(n, new_ent);
+			}
+		}
+		break;
 	case iro_Load:
 	case iro_Store:
 		if (env->only_local_mem) {
@@ -325,7 +337,8 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
 		ctp = get_Call_type(n);
 		if (env->params->flags & LF_COMPOUND_RETURN) {
 			/* check for compound returns */
-			for (i = get_method_n_ress(ctp) -1; i >= 0; --i) {
+			size_t i, n_res;
+			for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) {
 				if (is_compound_type(get_method_res_type(ctp, i))) {
 					/*
 					 * This is a call with a compound return. As the result
@@ -346,32 +359,17 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
 		if (env->params->flags & LF_COMPOUND_RETURN) {
 			/* check for compound returns */
 			ir_node *src = get_CopyB_src(n);
-			/* older scheme using value_res_ent */
-			if (is_Sel(src)) {
-				ir_node *proj = get_Sel_ptr(src);
-				if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_P_value_res_base) {
+			if (is_Proj(src)) {
+				ir_node *proj = get_Proj_pred(src);
+				if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) {
 					ir_node *call = get_Proj_pred(proj);
 					if (is_Call(call)) {
-						/* found a CopyB from compound Call result */
-						cl_entry *e = get_Call_entry(call, env);
-						set_irn_link(n, e->copyb);
-						e->copyb = n;
-					}
-				}
-			} else {
-				/* new scheme: compound results are determined by the call type only */
-				if (is_Proj(src)) {
-					ir_node *proj = get_Proj_pred(src);
-					if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) {
-						ir_node *call = get_Proj_pred(proj);
-						if (is_Call(call)) {
-							ctp = get_Call_type(call);
-							if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) {
-								/* found a CopyB from compound Call result */
-								cl_entry *e = get_Call_entry(call, env);
-								set_irn_link(n, e->copyb);
-								e->copyb = n;
-							}
+						ctp = get_Call_type(call);
+						if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) {
+							/* found a CopyB from compound Call result */
+							cl_entry *e = get_Call_entry(call, env);
+							set_irn_link(n, e->copyb);
+							e->copyb = n;
 						}
 					}
 				}
@@ -413,18 +411,18 @@ typedef struct cr_pair {
  * Post walker: fixes all entities addresses for the copy-return
  * optimization.
  *
- * Note: We expect the length of the cr_pair array (ie number of compound
+ * Note: We expect the length of the cr_pair array (i.e. number of compound
  * return values) to be 1 (C, C++) in almost all cases, so ignore the
  * linear search complexity here.
  */
-static void do_copy_return_opt(ir_node *n, void *ctx) {
-	cr_pair *arr = ctx;
-	int i;
-
+static void do_copy_return_opt(ir_node *n, void *ctx)
+{
 	if (is_Sel(n)) {
 		ir_entity *ent = get_Sel_entity(n);
+		cr_pair   *arr = (cr_pair*)ctx;
+		size_t    i, l;
 
-		for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
+		for (i = 0, l = ARR_LEN(arr); i < l; ++i) {
 			if (ent == arr[i].ent) {
 				exchange(n, arr[i].arg);
 				break;
@@ -453,7 +451,7 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
 	/* use a map the check if we already create such an entity */
 	e = pmap_find(env->dummy_map, tp);
 	if (e)
-		ent = e->value;
+		ent = (ir_entity*)e->value;
 	else {
 		ir_type *ft = get_irg_frame_type(irg);
 		char buf[16];
@@ -468,7 +466,6 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
 		}
 	}
 	return new_r_simpleSel(
-		irg,
 		block,
 		get_irg_no_mem(irg),
 		get_irg_frame(irg),
@@ -484,32 +481,16 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
  * @param entry  the call list
  * @param env    the environment
  */
-static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *entry, wlk_env *env)
+static void add_hidden_param(ir_graph *irg, size_t n_com, ir_node **ins, cl_entry *entry, wlk_env *env)
 {
-	ir_node *p, *n, *src, *mem, *blk;
-	ir_entity *ent;
-	ir_type *owner;
-	int idx, n_args;
+	ir_node *p, *n, *mem, *blk;
+	size_t n_args;
 
 	n_args = 0;
 	for (p = entry->copyb; p; p = n) {
-		n   = get_irn_link(p);
-		src = get_CopyB_src(p);
-
-		/* old scheme using value_res_ent */
-		if (is_Sel(src)) {
-			ent = get_Sel_entity(src);
-			owner = get_entity_owner(ent);
-
-			/* find the hidden parameter index */
-			for (idx = 0; idx < get_struct_n_members(owner); ++idx)
-				if (get_struct_member(owner, idx) == ent)
-					break;
-			assert(idx < get_struct_n_members(owner));
-		} else {
-			/* new scheme: compound returns are determined by the call type and are Proj's */
-			idx = get_Proj_proj(src);
-		}
+		ir_node *src = get_CopyB_src(p);
+		size_t   idx = get_Proj_proj(src);
+		n = (ir_node*)get_irn_link(p);
 
 		ins[idx] = get_CopyB_dst(p);
 		mem      = get_CopyB_mem(p);
@@ -517,17 +498,17 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
 
 		/* get rid of the CopyB */
 		turn_into_tuple(p, pn_CopyB_max);
-		set_Tuple_pred(p, pn_CopyB_M_regular, mem);
-		set_Tuple_pred(p, pn_CopyB_M_except,  get_irg_bad(irg));
-		set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(irg, blk));
-		set_Tuple_pred(p, pn_CopyB_X_except,  get_irg_bad(irg));
+		set_Tuple_pred(p, pn_CopyB_M,         mem);
+		set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(blk));
+		set_Tuple_pred(p, pn_CopyB_X_except,  new_r_Bad(irg, mode_X));
 		++n_args;
 	}
 
 	/* now create dummy entities for function with ignored return value */
 	if (n_args < n_com) {
 		ir_type *ctp = get_Call_type(entry->call);
-		int i, j;
+		size_t   i;
+		size_t   j;
 
 		if (is_lowered_type(ctp))
 			ctp = get_associated_type(ctp);
@@ -549,13 +530,14 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
  * @param irg  the graph
  * @param env  the environment
  */
-static void fix_call_list(ir_graph *irg, wlk_env *env) {
+static void fix_call_list(ir_graph *irg, wlk_env *env)
+{
 	const lower_params_t *lp = env->params;
 	cl_entry *p;
 	ir_node *call, **new_in;
 	ir_type *ctp, *lowered_mtp;
 	add_hidden hidden_params;
-	int i, n_params, n_com, pos;
+	size_t i, n_res, n_params, n_com, pos;
 
 	new_in = NEW_ARR_F(ir_node *, 0);
 	for (p = env->cl_list; p; p = p->next) {
@@ -572,7 +554,7 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) {
 		n_params = get_Call_n_params(call);
 
 		n_com = 0;
-		for (i = get_method_n_ress(ctp) - 1; i >= 0; --i) {
+		for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) {
 			if (is_compound_type(get_method_res_type(ctp, i)))
 				++n_com;
 		}
@@ -608,10 +590,11 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) {
  */
 static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 {
-	ir_graph   * rem = current_ir_graph;
+	ir_graph   *rem = current_ir_graph;
 	ir_entity  *ent = get_irg_entity(irg);
 	ir_type    *mtp, *lowered_mtp, *tp, *ft;
-	int        i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt;
+	size_t     i, j, k, n_ress = 0, n_ret_com = 0;
+	size_t     n_cr_opt;
 	ir_node    **new_in, *ret, *endbl, *bl, *mem, *copy;
 	cr_pair    *cr_opt;
 	wlk_env    env;
@@ -660,12 +643,15 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 	} else {
 		/* we must only search for calls */
 		env.arg_shift = 0;
+		lowered_mtp   = NULL;
 	}
 	obstack_init(&env.obst);
 	env.cl_list        = NULL;
 	env.dummy_map      = pmap_create_ex(8);
 	env.dnr            = 0;
 	env.params         = lp;
+	env.lowered_mtp    = lowered_mtp;
+	env.value_params   = get_method_value_param_type(mtp);
 	env.only_local_mem = 1;
 	env.changed        = 0;
 
@@ -679,91 +665,96 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 	}
 
 	if (n_ret_com) {
-		/*
-		 * Now fix the Return node of the current graph.
-		 */
-		env.changed = 1;
+		int idx;
 
 		/* STEP 1: find the return. This is simple, we have normalized the graph. */
 		endbl = get_irg_end_block(irg);
 		ret = NULL;
-		for (i = get_Block_n_cfgpreds(endbl) - 1; i >= 0; --i) {
-			ir_node *pred = get_Block_cfgpred(endbl, i);
+		for (idx = get_Block_n_cfgpreds(endbl) - 1; idx >= 0; --idx) {
+			ir_node *pred = get_Block_cfgpred(endbl, idx);
 
 			if (is_Return(pred)) {
 				ret = pred;
 				break;
 			}
 		}
-		/* there should always be a return */
-		assert(ret);
-
-		/*
-		 * STEP 2: fix it. For all compound return values add a CopyB,
-		 * all others are copied.
-		 */
-		NEW_ARR_A(ir_node *, new_in, n_ress + 1);
-
-		bl  = get_nodes_block(ret);
-		mem = get_Return_mem(ret);
-
-		ft = get_irg_frame_type(irg);
-		NEW_ARR_A(cr_pair, cr_opt, n_ret_com);
-		n_cr_opt = 0;
-		for (j = 1, i = k = 0; i < n_ress; ++i) {
-			ir_node *pred = get_Return_res(ret, i);
-			tp = get_method_res_type(mtp, i);
 
-			if (is_compound_type(tp)) {
-				ir_node *arg = get_irg_args(irg);
-				arg = new_r_Proj(irg, get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k);
-				++k;
-
-				if (is_Unknown(pred)) {
-					/* The Return(Unknown) is the Firm construct for a missing return.
-					   Do nothing. */
-				} else {
-					/**
-					 * Sorrily detecting that copy-return is possible isn't that simple.
-					 * We must check, that the hidden address is alias free during the whole
-					 * function.
-					 * A simple heuristic: all Loads/Stores inside
-					 * the function access only local frame.
-					 */
-					if (env.only_local_mem && is_compound_address(ft, pred)) {
-						/* we can do the copy-return optimization here */
-						cr_opt[n_cr_opt].ent = get_Sel_entity(pred);
-						cr_opt[n_cr_opt].arg = arg;
-						++n_cr_opt;
-					} else { /* copy-return optimization is impossible, do the copy. */
-						copy = new_r_CopyB(
-							irg, bl,
-							mem,
-							arg,
-							pred,
-							tp
-							);
-						mem = new_r_Proj(irg, bl, copy, mode_M, pn_CopyB_M_regular);
+		/* in case of infinite loops, there might be no return */
+		if (ret != NULL) {
+			/*
+			 * Now fix the Return node of the current graph.
+			 */
+			env.changed = 1;
+
+			/*
+			 * STEP 2: fix it. For all compound return values add a CopyB,
+			 * all others are copied.
+			 */
+			NEW_ARR_A(ir_node *, new_in, n_ress + 1);
+
+			bl  = get_nodes_block(ret);
+			mem = get_Return_mem(ret);
+
+			ft = get_irg_frame_type(irg);
+			NEW_ARR_A(cr_pair, cr_opt, n_ret_com);
+			n_cr_opt = 0;
+			for (j = 1, i = k = 0; i < n_ress; ++i) {
+				ir_node *pred = get_Return_res(ret, i);
+				tp = get_method_res_type(mtp, i);
+
+				if (is_compound_type(tp)) {
+					ir_node *arg = get_irg_args(irg);
+					arg = new_r_Proj(arg, mode_P_data, env.first_hidden + k);
+					++k;
+
+					if (is_Unknown(pred)) {
+						/* The Return(Unknown) is the Firm construct for a missing return.
+							Do nothing. */
+					} else {
+						/**
+						 * Sorrily detecting that copy-return is possible isn't that simple.
+						 * We must check, that the hidden address is alias free during the whole
+						 * function.
+						 * A simple heuristic: all Loads/Stores inside
+						 * the function access only local frame.
+						 */
+						if (env.only_local_mem && is_compound_address(ft, pred)) {
+							/* we can do the copy-return optimization here */
+							cr_opt[n_cr_opt].ent = get_Sel_entity(pred);
+							cr_opt[n_cr_opt].arg = arg;
+							++n_cr_opt;
+						} else { /* copy-return optimization is impossible, do the copy. */
+							copy = new_r_CopyB(
+									bl,
+									mem,
+									arg,
+									pred,
+									tp
+									);
+							mem = new_r_Proj(copy, mode_M, pn_CopyB_M);
+						}
 					}
-				}
-				if (lp->flags & LF_RETURN_HIDDEN) {
-					new_in[j] = arg;
+					if (lp->flags & LF_RETURN_HIDDEN) {
+						new_in[j] = arg;
+						++j;
+					}
+				} else { /* scalar return value */
+					new_in[j] = pred;
 					++j;
 				}
-			} else { /* scalar return value */
-				new_in[j] = pred;
-				++j;
 			}
-		}
-		/* replace the in of the Return */
-		new_in[0] = mem;
-		set_irn_in(ret, j, new_in);
+			/* replace the in of the Return */
+			new_in[0] = mem;
+			set_irn_in(ret, j, new_in);
+
+			if (n_cr_opt > 0) {
+				size_t i, n;
 
-		if (n_cr_opt > 0) {
-			irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt);
+				irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt);
 
-			for (i = ARR_LEN(cr_opt) - 1; i >= 0; --i) {
-				remove_class_member(ft, cr_opt[i].ent);
+				for (i = 0, n = ARR_LEN(cr_opt); i < n; ++i) {
+					free_entity(cr_opt[i].ent);
+				}
 			}
 		}
 	} /* if (n_ret_com) */
@@ -771,11 +762,6 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 	pmap_destroy(env.dummy_map);
 	obstack_free(&env.obst, NULL);
 
-	if (env.changed) {
-		/* invalidate the analysis info */
-		set_irg_outs_inconsistent(irg);
-		set_irg_loopinfo_state(irg, loopinfo_inconsistent);
-	}
 	current_ir_graph = rem;
 }
 
@@ -786,8 +772,9 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
  * @param lp  lowering parameters
  * @param tp  The type.
  */
-static int must_be_lowered(const lower_params_t *lp, ir_type *tp) {
-  int i, n_ress;
+static int must_be_lowered(const lower_params_t *lp, ir_type *tp)
+{
+  size_t i, n_ress;
   ir_type *res_tp;
 
   if (is_Method_type(tp)) {
@@ -811,7 +798,7 @@ static int must_be_lowered(const lower_params_t *lp, ir_type *tp) {
  */
 static void lower_method_types(type_or_ent tore, void *env)
 {
-	const lower_params_t *lp = env;
+	const lower_params_t *lp = (const lower_params_t*)env;
 	ir_type *tp;
 
 	/* fix method entities */
@@ -854,7 +841,7 @@ static void lower_method_types(type_or_ent tore, void *env)
  */
 void lower_calls_with_compounds(const lower_params_t *params)
 {
-	int i;
+	size_t i, n;
 	ir_graph *irg;
 	lower_params_t param = *params;
 
@@ -865,12 +852,9 @@ void lower_calls_with_compounds(const lower_params_t *params)
 		type_map = NULL;
 
 	/* first step: Transform all graphs */
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		irg = get_irp_irg(i);
 
-		if (irg == get_const_code_irg())
-			continue;
-
 		transform_irg(&param, irg);
 	}
 
@@ -880,3 +864,4 @@ void lower_calls_with_compounds(const lower_params_t *params)
 	if (type_map)
 		pmap_destroy(type_map);
 }
+