Use SPARC_STACK_ALIGNMENT and round_up2() instead of magic numbers and calculations.

[libfirm] / ir / opt / funccall.c

diff --git a/ir/opt/funccall.c b/ir/opt/funccall.c
index eec1b36..f4cdb39 100644 (file)
--- a/ir/opt/funccall.c
+++ b/ir/opt/funccall.c
@@ -239,12 +239,11 @@ static void fix_const_call_lists(ir_graph *irg, env_t *ctx)
        }
 
        /* changes were done ... */
-       set_irg_outs_inconsistent(irg);
        set_irg_loopinfo_state(irg, loopinfo_cf_inconsistent);
 
        if (exc_changed) {
                /* ... including exception edges */
-               set_irg_doms_inconsistent(irg);
+               clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
        }
 }  /* fix_const_call_list */
 
@@ -374,12 +373,11 @@ static void fix_nothrow_call_list(ir_graph *irg, ir_node *call_list, ir_node *pr
        }
 
        /* changes were done ... */
-       set_irg_outs_inconsistent(irg);
        set_irg_loopinfo_state(irg, loopinfo_cf_inconsistent);
 
        if (exc_changed) {
                /* ... including exception edges */
-               set_irg_doms_inconsistent(irg);
+               clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
        }
 }  /* fix_nothrow_call_list */
 
@@ -510,8 +508,23 @@ static mtp_additional_properties check_const_or_pure_function(ir_graph *irg, int
 {
        ir_node *end, *endbl;
        int j;
+       ir_entity *entity   = get_irg_entity(irg);
+       ir_type   *type     = get_entity_type(entity);
+       size_t     n_params = get_method_n_params(type);
+       size_t     i;
+       mtp_additional_properties may_be_const = mtp_property_const;
        mtp_additional_properties prop = get_irg_additional_properties(irg);
 
+       /* libfirm handles aggregate parameters by passing around pointers to
+        * stuff in memory, so if we have compound parameters we are never const */
+       for (i = 0; i < n_params; ++i) {
+               ir_type *param = get_method_param_type(type, i);
+               if (is_compound_type(param)) {
+                       prop        &= ~mtp_property_const;
+                       may_be_const = mtp_no_property;
+               }
+       }
+
        if (prop & mtp_property_const) {
                /* already marked as a const function */
                return mtp_property_const;
@@ -535,7 +548,7 @@ static mtp_additional_properties check_const_or_pure_function(ir_graph *irg, int
 
        end   = get_irg_end(irg);
        endbl = get_nodes_block(end);
-       prop  = mtp_property_const;
+       prop  = may_be_const;
 
        ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
        inc_irg_visited(irg);