diff options
| author | Martin Jambor <mjambor@suse.cz> | 2010-06-10 18:49:09 +0200 |
|---|---|---|
| committer | Martin Jambor <jamborm@gcc.gnu.org> | 2010-06-10 18:49:09 +0200 |
| commit | 591d4f4a6307da268ce02eebcb80cb60da433de3 (patch) | |
| tree | 59536dce999d0ebb1b615ab769e926ad76ab77c0 /gcc/tree-sra.c | |
| parent | c63a4676a8d1749ddc82fcd5d0c8112306e40825 (diff) | |
| download | gcc-591d4f4a6307da268ce02eebcb80cb60da433de3.zip gcc-591d4f4a6307da268ce02eebcb80cb60da433de3.tar.gz gcc-591d4f4a6307da268ce02eebcb80cb60da433de3.tar.bz2 | |
re PR tree-optimization/44258 (possible SRA wrong-code generation.)
2010-06-10 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/44258
* tree-sra.c (build_access_subtree): Return false iff there is a
partial overlap.
(build_access_trees): Likewise.
(analyze_all_variable_accesses): Disqualify candidates if
build_access_trees returns true for them.
* testsuite/gcc.dg/tree-ssa/pr44258.c: New test.
From-SVN: r160561
Diffstat (limited to 'gcc/tree-sra.c')
| -rw-r--r-- | gcc/tree-sra.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 5387a19..3fc1164 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -1689,9 +1689,10 @@ get_unrenamed_access_replacement (struct access *access) /* Build a subtree of accesses rooted in *ACCESS, and move the pointer in the linked list along the way. Stop when *ACCESS is NULL or the access pointed - to it is not "within" the root. */ + to it is not "within" the root. Return false iff some accesses partially + overlap. */ -static void +static bool build_access_subtree (struct access **access) { struct access *root = *access, *last_child = NULL; @@ -1706,24 +1707,32 @@ build_access_subtree (struct access **access) last_child->next_sibling = *access; last_child = *access; - build_access_subtree (access); + if (!build_access_subtree (access)) + return false; } + + if (*access && (*access)->offset < limit) + return false; + + return true; } /* Build a tree of access representatives, ACCESS is the pointer to the first - one, others are linked in a list by the next_grp field. Decide about scalar - replacements on the way, return true iff any are to be created. */ + one, others are linked in a list by the next_grp field. Return false iff + some accesses partially overlap. */ -static void +static bool build_access_trees (struct access *access) { while (access) { struct access *root = access; - build_access_subtree (&access); + if (!build_access_subtree (&access)) + return false; root->next_grp = access; } + return true; } /* Return true if expr contains some ARRAY_REFs into a variable bounded @@ -2062,9 +2071,7 @@ analyze_all_variable_accesses (void) struct access *access; access = sort_and_splice_var_accesses (var); - if (access) - build_access_trees (access); - else + if (!access || !build_access_trees (access)) disqualify_candidate (var, "No or inhibitingly overlapping accesses."); } |