diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 15b24087e28227676c5f1bfb83dd4e303e53137a..563943567ca6048c1c03893d32467b9e7301a116 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-03-29 Jakub Jelinek <jakub@redhat.com> + + PR c/89872 + * gimplify.c (gimplify_compound_literal_expr): Don't optimize a + non-addressable complit into its initializer if it is volatile. + 2019-03-29 Roman Zhuykov <zhroma@ispras.ru> * opts-common.c (integral_argument): Set errno properly in one case. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index e264700989f0c35dfafa01d440b0720e85771398..6ac1b718ebd2f270b38a68bb84693f7fe715256d 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -4665,6 +4665,7 @@ gimplify_compound_literal_expr (tree *expr_p, gimple_seq *pre_p, otherwise we'd generate a new temporary, and we can as well just use the decl we already have. */ else if (!TREE_ADDRESSABLE (decl) + && !TREE_THIS_VOLATILE (decl) && init && (fallback & fb_lvalue) == 0 && gimple_test_f (init)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d6743d725a810df264b0831c09f274bde027d15..1398b23424c0d3e0eac6f8b21c8e015a71cdbbcf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-29 Jakub Jelinek <jakub@redhat.com> + + PR c/89872 + * gcc.dg/tree-ssa/pr89872.c: New test. + 2019-03-29 Roman Zhuykov <zhroma@ispras.ru> * gcc.dg/diag-sanity.c: New test. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr89872.c b/gcc/testsuite/gcc.dg/tree-ssa/pr89872.c new file mode 100644 index 0000000000000000000000000000000000000000..c081cd5f9ec0e9cd40150f5294eaac8ae2dca353 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr89872.c @@ -0,0 +1,27 @@ +/* PR c/89872 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump-times " ={v} 1;" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " ={v} 2;" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " ={v} 3;" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " ={v} 4;" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " ={v} 0;" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " ={v} " 10 "optimized" } } */ + +void +foo (void) +{ + (volatile int){1} + (volatile int){2}; +} + +void +bar (void) +{ + (volatile int){3}; +} + +void +baz (void) +{ + (volatile int){4} / (volatile int){0}; +}