diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/tree-ssa-structalias.c | 65 |
2 files changed, 58 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 525ad00..312106e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2005-07-13 Daniel Berlin <dberlin@dberlin.org> + + Fix PR tree-optimization/22376 + * tree-ssa-structalias.c (build_constraint_graph): We really meant + special var here. + (need_to_solve): New function. + (compute_points_to_sets): Use it. + 2005-07-15 Jan Hubicka <jh@suse.cz> * cfg.c (update_bb_profile_for_threading): More diagnostic. diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index aedd4b5..cb45a8c 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -985,8 +985,8 @@ build_constraint_graph (void) } else if (rhs.type == DEREF) { - /* !ANYTHING = *y */ - if (lhs.var > anything_id) + /* !special var= *y */ + if (!(get_varinfo (lhs.var)->is_special_var)) insert_into_complex (rhs.var, c); } else if (rhs.type == ADDRESSOF) @@ -3491,6 +3491,38 @@ init_base_vars (void) process_constraint (new_constraint (lhs, rhs)); } +/* Return true if we actually need to solve the constraint graph in order to + get our points-to sets. This is false when, for example, no addresses are + taken other than special vars, or all points-to sets with members already + contain the anything variable. */ + +static bool +need_to_solve (void) +{ + int i; + varinfo_t v; + bool found_address_taken = false; + bool found_non_anything = false; + + for (i = 0; VEC_iterate (varinfo_t, varmap, i, v); i++) + { + if (v->is_special_var) + continue; + + if (v->address_taken) + found_address_taken = true; + + if (v->solution + && !bitmap_empty_p (v->solution) + && !bitmap_bit_p (v->solution, anything_id)) + found_non_anything = true; + + if (found_address_taken && found_non_anything) + return true; + } + + return false; +} /* Create points-to sets for the current function. See the comments at the start of the file for an algorithmic overview. */ @@ -3541,19 +3573,22 @@ compute_points_to_sets (struct alias_info *ai) fprintf (dump_file, "Points-to analysis\n\nConstraints:\n\n"); dump_constraints (dump_file); } - - if (dump_file) - fprintf (dump_file, "\nCollapsing static cycles and doing variable " - "substitution:\n"); - - find_and_collapse_graph_cycles (graph, false); - perform_var_substitution (graph); - - if (dump_file) - fprintf (dump_file, "\nSolving graph:\n"); - - solve_graph (graph); - + + if (need_to_solve ()) + { + if (dump_file) + fprintf (dump_file, "\nCollapsing static cycles and doing variable " + "substitution:\n"); + + find_and_collapse_graph_cycles (graph, false); + perform_var_substitution (graph); + + if (dump_file) + fprintf (dump_file, "\nSolving graph:\n"); + + solve_graph (graph); + } + if (dump_file) dump_sa_points_to_info (dump_file); |