From 3b7511f9219038110e5b464f197266564e2f8c76 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Tue, 3 Oct 2017 13:43:45 +0200 Subject: [PATCH] [PR 82363] Fix thinko in SRA subaccess propagation 2017-10-03 Martin Jambor PR tree-optimization/82363 * tree-sra.c (propagate_subaccesses_across_link): In unrecoverable mismatch, mark lacc written regardless of racc. testsuite/ * gcc.dg/tree-ssa/pr82363.c: New test. From-SVN: r253380 --- gcc/ChangeLog | 6 ++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.dg/tree-ssa/pr82363.c | 50 +++++++++++++++++++++++++++++++++ gcc/tree-sra.c | 2 +- 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr82363.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 25dcf02..33ae1be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-10-03 Martin Jambor + + PR tree-optimization/82363 + * tree-sra.c (propagate_subaccesses_across_link): In unrecoverable + mismatch, mark lacc written regardless of racc. + 2017-10-03 Jakub Jelinek PR tree-optimization/82381 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 70fde54..e109ea5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-03 Martin Jambor + + PR tree-optimization/82363 + * gcc.dg/tree-ssa/pr82363.c: New test. + 2017-10-03 Jakub Jelinek PR tree-optimization/82381 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr82363.c b/gcc/testsuite/gcc.dg/tree-ssa/pr82363.c new file mode 100644 index 0000000..6652468 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr82363.c @@ -0,0 +1,50 @@ +/* { dg-do run } */ +/* { dg-options "-O" } */ + +struct A +{ + int b; + int c; + int d; +}; + +struct E +{ + int f; + int g:18; + struct A h; +}; + +struct I +{ + int b; + int j; + struct E k; +}; + +int l, *m = &l; + +struct A n; +struct I o; + +void __attribute__ ((noipa)) +test_l (void) +{ + if (l != 1) + __builtin_abort (); +} + +int main () +{ + while (1) + { + struct I q = { 0, 0, {0, 0, {1, 1, 1}}}, p = q, r = p, *s = &q; + if (p.k.h.c) + o = p; + *m = r.k.h.d; + n = (*s).k.h; + break; + } + test_l (); + return 0; +} diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index f5675ed..bac5939 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -2691,7 +2691,7 @@ propagate_subaccesses_across_link (struct access *lacc, struct access *racc) } else { - if (rchild->grp_write && !lacc->grp_write) + if (!lacc->grp_write) { ret = true; subtree_mark_written_and_enqueue (lacc); -- 2.7.4