Do NOT call DBG_OPT_CSE() in identify remember, as this is used for different

[libfirm] / ir / opt / opt_inline.c

diff --git a/ir/opt/opt_inline.c b/ir/opt/opt_inline.c
index d145dd3..45e55c8 100644 (file)
--- 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);
@@ -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 */