X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_inline.c;h=072f2177fa5bd75787cddbfb696974b1cb820030;hb=16b814ebb6d59409fb74416bdde1a891028b26fb;hp=d145dd38b52b78db78aafb2c52bbc20096a86d49;hpb=4038a6839a47c63d5723b3fb400daaae52b075dc;p=libfirm

diff --git a/ir/opt/opt_inline.c b/ir/opt/opt_inline.c
index d145dd38b..072f2177f 100644
--- a/ir/opt/opt_inline.c
+++ b/ir/opt/opt_inline.c
@@ -60,6 +60,7 @@
 #include "irflag_t.h"
 #include "irhooks.h"
 #include "irtools.h"
+#include "iropt_dbg.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
@@ -759,6 +760,7 @@ static void copy_preds_inline(ir_node *n, void *env) {
 
 		n = identify_remember(current_ir_graph->value_table, nn);
 		if (nn != n) {
+			DBG_OPT_CSE(nn, n);
 			exchange(nn, n);
 		}
 	}
@@ -1008,18 +1010,11 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 	set_irn_link(get_irg_start_block(called_graph), get_nodes_block(pre_call));
 	set_irn_visited(get_irg_start_block(called_graph), visited);
 
-	assert(get_irg_n_anchors(called_graph) == get_irg_n_anchors(irg));
+	set_irn_link(get_irg_bad(called_graph), get_irg_bad(current_ir_graph));
+	set_irn_visited(get_irg_bad(called_graph), visited);
 
-	for (i = get_irg_n_anchors(called_graph) - 1; i >= 0; --i) {
-		ir_node *anchor = get_irg_anchor(called_graph, i);
-
-		if (get_irn_visited(anchor) >= visited) {
-			/* already set above */
-			continue;
-		}
-		set_irn_link(anchor, get_irg_anchor(irg, i));
-		set_irn_visited(anchor, visited);
-	}
+	set_irn_link(get_irg_no_mem(called_graph), get_irg_no_mem(current_ir_graph));
+	set_irn_visited(get_irg_no_mem(called_graph), visited);
 
 	/* Initialize for compaction of in arrays */
 	inc_irg_block_visited(irg);
@@ -1068,7 +1063,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 	/* -- Precompute some values -- */
 	end_bl = get_new_node(get_irg_end_block(called_graph));
 	end = get_new_node(get_irg_end(called_graph));
-	arity = get_irn_arity(end_bl);    /* arity = n_exc + n_ret  */
+	arity = get_Block_n_cfgpreds(end_bl);    /* arity = n_exc + n_ret  */
 	n_res = get_method_n_ress(get_Call_type(call));
 
 	res_pred = xmalloc(n_res * sizeof(*res_pred));
@@ -1091,7 +1086,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 	n_ret = 0;
 	for (i = 0; i < arity; i++) {
 		ir_node *ret;
-		ret = get_irn_n(end_bl, i);
+		ret = get_Block_cfgpred(end_bl, i);
 		if (is_Return(ret)) {
 			cf_pred[n_ret] = new_r_Jmp(irg, get_nodes_block(ret));
 			n_ret++;
@@ -1105,7 +1100,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 	/* First the Memory-Phi */
 	n_ret = 0;
 	for (i = 0; i < arity; i++) {
-		ret = get_irn_n(end_bl, i);
+		ret = get_Block_cfgpred(end_bl, i);
 		if (is_Return(ret)) {
 			cf_pred[n_ret] = get_Return_mem(ret);
 			n_ret++;
@@ -1123,7 +1118,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 		for (j = 0; j < n_res; j++) {
 			n_ret = 0;
 			for (i = 0; i < arity; i++) {
-				ret = get_irn_n(end_bl, i);
+				ret = get_Block_cfgpred(end_bl, i);
 				if (is_Return(ret)) {
 					cf_pred[n_ret] = get_Return_res(ret, j);
 					n_ret++;
@@ -1164,7 +1159,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 		n_exc = 0;
 		for (i = 0; i < arity; i++) {
 			ir_node *ret, *irn;
-			ret = get_irn_n(end_bl, i);
+			ret = get_Block_cfgpred(end_bl, i);
 			irn = skip_Proj(ret);
 			if (is_fragile_op(irn) || is_Raise(irn)) {
 				cf_pred[n_exc] = ret;
@@ -1178,7 +1173,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 			n_exc = 0;
 			for (i = 0; i < arity; i++) {
 				ir_node *ret;
-				ret = skip_Proj(get_irn_n(end_bl, i));
+				ret = skip_Proj(get_Block_cfgpred(end_bl, i));
 				if (is_Call(ret)) {
 					cf_pred[n_exc] = new_r_Proj(irg, get_nodes_block(ret), ret, mode_M, 3);
 					n_exc++;
@@ -1204,7 +1199,7 @@ int inline_method(ir_node *call, ir_graph *called_graph) {
 		/* assert(exc_handling == 1 || no exceptions. ) */
 		n_exc = 0;
 		for (i = 0; i < arity; i++) {
-			ir_node *ret = get_irn_n(end_bl, i);
+			ir_node *ret = get_Block_cfgpred(end_bl, i);
 			ir_node *irn = skip_Proj(ret);
 
 			if (is_fragile_op(irn) || is_Raise(irn)) {
@@ -2171,6 +2166,12 @@ void inline_functions(int maxsize, int inline_threshold) {
 			curr_call = curr_call->next;
 		}
 
+	}
+
+	for (i = 0; i < n_irgs; ++i) {
+		ir_graph *irg = get_irp_irg(i);
+
+		env = get_irg_link(irg);
 		if (env->got_inline) {
 			/* this irg got calls inlined: optimize it */