X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=57fe11b243ee04e7cf6a6fe0f2c688ae3fa76aaa;hb=43332529cf18bf9f2a0ecb384dc5dd0093eb3c8a;hp=f89e4f7eca59e802109014b774e9a8970f0109d8;hpb=bc35052031be38b7243401b37fe1d791728c7df2;p=libfirm

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index f89e4f7ec..57fe11b24 100644
--- a/ir/lower/lower_calls.c
+++ b/ir/lower/lower_calls.c
@@ -56,10 +56,11 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignm
 	/* 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)
+	if (e && get_type_mode(e->value) == mode)
 		res = e->value;
 	else {
-		res = new_type_pointer(id_mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, 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,7 +84,6 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	int     *param_map;
 	ir_mode *modes[MAX_REGISTER_RET_VAL];
 	int n_ress, n_params, nn_ress, nn_params, i, first_variadic;
-	ident *id;
 	add_hidden hidden_params;
 	int        changed = 0;
 	ir_variadicity var;
@@ -175,8 +175,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	}
 
 	/* create the new type */
-	id      = 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)
@@ -258,7 +257,8 @@ 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) {
+static cl_entry *get_Call_entry(ir_node *call, wlk_env *env)
+{
 	cl_entry *res = get_irn_link(call);
 	if (res == NULL) {
 		cl_entry *res = OALLOC(&env->obst, cl_entry);
@@ -278,7 +278,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)));
 
@@ -307,7 +308,8 @@ 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;
 
@@ -326,7 +328,8 @@ 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) {
+static void fix_args_and_collect_calls(ir_node *n, void *ctx)
+{
 	wlk_env *env = ctx;
 	int      i;
 	ir_type *ctp;
@@ -467,7 +470,8 @@ typedef struct cr_pair {
  * 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) {
+static void do_copy_return_opt(ir_node *n, void *ctx)
+{
 	cr_pair *arr = ctx;
 	int i;
 
@@ -597,7 +601,8 @@ 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;
@@ -767,7 +772,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 
 			if (is_compound_type(tp)) {
 				ir_node *arg = get_irg_args(irg);
-				arg = new_r_Proj(get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k);
+				arg = new_r_Proj(arg, mode_P_data, env.first_hidden + k);
 				++k;
 
 				if (is_Unknown(pred)) {
@@ -794,7 +799,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 							pred,
 							tp
 							);
-						mem = new_r_Proj(bl, copy, mode_M, pn_CopyB_M);
+						mem = new_r_Proj(copy, mode_M, pn_CopyB_M);
 					}
 				}
 				if (lp->flags & LF_RETURN_HIDDEN) {
@@ -814,7 +819,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 			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);
+				free_entity(cr_opt[i].ent);
 			}
 		}
 	} /* if (n_ret_com) */
@@ -837,7 +842,8 @@ 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) {
+static int must_be_lowered(const lower_params_t *lp, ir_type *tp)
+{
   int i, n_ress;
   ir_type *res_tp;