From 6a07489267e55084c3d5e88b4e9591be25bf2bf6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 27 Aug 2019 14:37:30 +0200 Subject: [PATCH] re PR c++/91415 (Invalid warning for C++17 sequencing of shift operator E1<= cxx17 mode handle it like COMPOUND_EXPR rather than normal expression. * g++.dg/warn/sequence-pt-4.C: New test. From-SVN: r274952 --- gcc/c-family/ChangeLog | 7 +++++++ gcc/c-family/c-common.c | 13 ++++++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/sequence-pt-4.C | 21 +++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/warn/sequence-pt-4.C diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 2ab1c98b260..0376a7b977d 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,10 @@ +2019-08-27 Jakub Jelinek + + PR c++/91415 + * c-common.c (verify_tree): For LSHIFT_EXPR, RSHIFT_EXPR, + COMPONENT_REF and ARRAY_REF in cxx_dialect >= cxx17 mode handle it + like COMPOUND_EXPR rather than normal expression. + 2019-08-23 Iain Sandoe PR pch/61250 diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index d516deaf24c..61ee7543dac 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -1889,6 +1889,7 @@ verify_tree (tree x, struct tlist **pbefore_sp, struct tlist **pno_sp, case COMPOUND_EXPR: case TRUTH_ANDIF_EXPR: case TRUTH_ORIF_EXPR: + sequenced_binary: tmp_before = tmp_nosp = tmp_list2 = tmp_list3 = 0; verify_tree (TREE_OPERAND (x, 0), &tmp_before, &tmp_nosp, NULL_TREE); warn_for_collisions (tmp_nosp); @@ -2031,8 +2032,18 @@ verify_tree (tree x, struct tlist **pbefore_sp, struct tlist **pno_sp, x = TREE_OPERAND (x, 0); goto restart; } - gcc_fallthrough (); + goto do_default; + + case LSHIFT_EXPR: + case RSHIFT_EXPR: + case COMPONENT_REF: + case ARRAY_REF: + if (cxx_dialect >= cxx17) + goto sequenced_binary; + goto do_default; + default: + do_default: /* For other expressions, simply recurse on their operands. Manual tail recursion for unary expressions. Other non-expressions need not be processed. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d0a30f93f7c..64970b28f14 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-27 Jakub Jelinek + + PR c++/91415 + * g++.dg/warn/sequence-pt-4.C: New test. + 2019-08-27 Robin Dapp PR testsuite/91549 diff --git a/gcc/testsuite/g++.dg/warn/sequence-pt-4.C b/gcc/testsuite/g++.dg/warn/sequence-pt-4.C new file mode 100644 index 00000000000..e8b1e2cba8c --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/sequence-pt-4.C @@ -0,0 +1,21 @@ +/* More sequence point warning tests */ +/* { dg-do compile } */ +/* { dg-options "-Wsequence-point" } */ + +struct S { int a[10]; }; +void bar (int, int, int, int, int, int, int, int); + +int +foo (int i, int x[10][10], int y[10], struct S z[10], struct S *w[10]) +{ + int b = x[i++][i++]; /* { dg-warning "undefined" "sequence point warning" { target c++14_down } } */ + int c = i++ << i++; /* { dg-warning "undefined" "sequence point warning" { target c++14_down } } */ + int d = i++ >> i++; /* { dg-warning "undefined" "sequence point warning" { target c++14_down } } */ + int e = i++ && i++; + int f = i++ ? i++ : i++; + int g = (i++, i++); + int h = z[i++].a[i++]; /* { dg-warning "undefined" "sequence point warning" { target c++14_down } } */ + int j = w[i++]->a[i++]; /* { dg-warning "undefined" "sequence point warning" { target c++14_down } } */ + bar (b, c, d, e, f,g, h, j); + return i; +} -- 2.30.2