Add passes for inlining, private methods.

[libfirm] / ir / opt / scalar_replace.c

diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c
index 4056172..59588da 100644 (file)
--- a/ir/opt/scalar_replace.c
+++ b/ir/opt/scalar_replace.c
@@ -40,6 +40,7 @@
 #include "irgwalk.h"
 #include "irgmod.h"
 #include "irnode_t.h"
+#include "irpass.h"
 #include "irtools.h"
 #include "xmalloc.h"
 #include "debug.h"
@@ -674,7 +675,7 @@ int scalar_replacement_opt(ir_graph *irg) {
        ir_mode   **modes;
        set       *set_ent;
        pset      *sels;
-       ir_type   *ent_type;
+       ir_type   *ent_type, *frame_tp;
        ir_graph  *rem;
        int       res = 0;
 
@@ -697,10 +698,11 @@ int scalar_replacement_opt(ir_graph *irg) {
 
                /* Insert in set the scalar replacements. */
                irg_frame = get_irg_frame(irg);
-               nvals = 0;
-               modes = NEW_ARR_F(ir_mode *, 16);
-               set_ent = new_set(ent_cmp, 8);
-               sels    = pset_new_ptr(8);
+               nvals     = 0;
+               modes     = NEW_ARR_F(ir_mode *, 16);
+               set_ent   = new_set(ent_cmp, 8);
+               sels      = pset_new_ptr(8);
+               frame_tp  = get_irg_frame_type(irg);
 
                for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) {
                        ir_node *succ = get_irn_out(irg_frame, i);
@@ -708,6 +710,11 @@ int scalar_replacement_opt(ir_graph *irg) {
                        if (is_Sel(succ)) {
                                ir_entity *ent = get_Sel_entity(succ);
 
+                               /* we are only interested in entities on the frame, NOT
+                                  on the value type */
+                               if (get_entity_owner(ent) != frame_tp)
+                                       continue;
+
                                if (get_entity_link(ent) == NULL || get_entity_link(ent) == ADDRESS_TAKEN)
                                        continue;
 
@@ -765,6 +772,11 @@ int scalar_replacement_opt(ir_graph *irg) {
        return res;
 }
 
+ir_graph_pass_t *scalar_replacement_opt_pass(const char *name) {
+       return def_graph_pass_ret(name ? name : "scalar_rep",
+                                 scalar_replacement_opt);
+}
+
 void firm_init_scalar_replace(void) {
        FIRM_DBG_REGISTER(dbg, "firm.opt.scalar_replace");
 }