diff options
| author | Martin Jambor <mjambor@suse.cz> | 2020-04-16 11:04:41 +0200 |
|---|---|---|
| committer | Martin Jambor <mjambor@suse.cz> | 2020-04-16 11:05:17 +0200 |
| commit | bd87b1fddbbe7d424671ebf81c96e12d748fafc7 (patch) | |
| tree | 743bda4ee322dcd48ffeb039655ef16600b600c7 /gcc/tree-sra.c | |
| parent | 9303fe0714c6cc2ff01bcfddd554d7d5057c32bd (diff) | |
sra: Fix access verification (PR 94598)
get_ref_base_and_extent recognizes ARRAY_REFs with variable index but
into arrays of length one as constant offset accesses. However,
max_size in such cases is extended to span the whole element. This
confuses SRA verification when SRA also builds its (total
scalarization) access structures to describe fields under such array -
get_ref_base_and_extent returns different size and max_size for them.
Fixed by not performing the check for total scalarization accesses.
The subsequent check then had to be changed to use size and not
max_size too, which meant it has to be skipped when the access
structure describes a genuine variable array access.
Bootstrapped and tested on x86_64-linux.
2020-04-16 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/94598
* tree-sra.c (verify_sra_access_forest): Fix verification of total
scalarization accesses under access to one-element arrays.
testsuite/
* gcc.dg/tree-ssa/pr94598.c: New test.
Diffstat (limited to 'gcc/tree-sra.c')
| -rw-r--r-- | gcc/tree-sra.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 84c113c403c..227bde06257 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -2357,9 +2357,11 @@ verify_sra_access_forest (struct access *root) gcc_assert (base == first_base); gcc_assert (offset == access->offset); gcc_assert (access->grp_unscalarizable_region + || access->grp_total_scalarization || size == max_size); - gcc_assert (!is_gimple_reg_type (access->type) - || max_size == access->size); + gcc_assert (access->grp_unscalarizable_region + || !is_gimple_reg_type (access->type) + || size == access->size); gcc_assert (reverse == access->reverse); if (access->first_child) |