From d4033c81042ca6e288013027c4662734694aaa0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Wed, 27 Aug 2008 16:06:00 +0000 Subject: [PATCH] re PR c++/17880 (-Wsequence-point doesn't warn inside if, while, do conditions, for beg/cond/end expressions etc.) 2008-08-27 Manuel Lopez-Ibanez PR c++/17880 cp/ * semantics.c (maybe_convert_cond): Call verify_sequence_points. (finish_return_stmt): Likewise. (finish_switch_condition): Likewise. testsuite/ * g++.dg/warn/sequence-pt-1.C: New. * g++.dg/warn/sequence-pt-pr17880.C: New. From-SVN: r139625 --- gcc/cp/ChangeLog | 7 ++ gcc/cp/semantics.c | 12 +- gcc/testsuite/ChangeLog | 6 + gcc/testsuite/g++.dg/warn/sequence-pt-1.C | 109 ++++++++++++++++++ .../g++.dg/warn/sequence-pt-pr17880.C | 54 +++++++++ 5 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/warn/sequence-pt-1.C create mode 100644 gcc/testsuite/g++.dg/warn/sequence-pt-pr17880.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b106fa5b995..7d2266c65eb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2008-08-27 Manuel Lopez-Ibanez + + PR c++/17880 + * semantics.c (maybe_convert_cond): Call verify_sequence_points. + (finish_return_stmt): Likewise. + (finish_switch_condition): Likewise. + 2008-08-27 Manuel Lopez-Ibanez * cp-tree.h: Fix #error directive. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index c7565a00620..e044a4392c3 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -572,7 +572,8 @@ finish_goto_stmt (tree destination) } /* COND is the condition-expression for an if, while, etc., - statement. Convert it to a boolean value, if appropriate. */ + statement. Convert it to a boolean value, if appropriate. + In addition, verify sequence points if -Wsequence-point is enabled. */ static tree maybe_convert_cond (tree cond) @@ -585,6 +586,9 @@ maybe_convert_cond (tree cond) if (processing_template_decl) return cond; + if (warn_sequence_point) + verify_sequence_points (cond); + /* Do the conversion. */ cond = convert_from_reference (cond); @@ -790,6 +794,9 @@ finish_return_stmt (tree expr) return error_mark_node; if (!processing_template_decl) { + if (warn_sequence_point) + verify_sequence_points (expr); + if (DECL_DESTRUCTOR_P (current_function_decl) || (DECL_CONSTRUCTOR_P (current_function_decl) && targetm.cxx.cdtor_returns_this ())) @@ -978,6 +985,9 @@ finish_switch_cond (tree cond, tree switch_stmt) } if (check_for_bare_parameter_packs (cond)) cond = error_mark_node; + else if (!processing_template_decl && warn_sequence_point) + verify_sequence_points (cond); + finish_cond (&SWITCH_STMT_COND (switch_stmt), cond); SWITCH_STMT_TYPE (switch_stmt) = orig_type; add_stmt (switch_stmt); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 96dbc5757b1..42d12a23022 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-08-27 Manuel Lopez-Ibanez + + PR c++/17880 + * g++.dg/warn/sequence-pt-1.C: New. + * g++.dg/warn/sequence-pt-pr17880.C: New. + 2008-08-26 Douglas Gregor * g++.dg/cpp0x/scoped_enum_examples.C: New. diff --git a/gcc/testsuite/g++.dg/warn/sequence-pt-1.C b/gcc/testsuite/g++.dg/warn/sequence-pt-1.C new file mode 100644 index 00000000000..3b9214233cd --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/sequence-pt-1.C @@ -0,0 +1,109 @@ +/* Test for sequence point warnings. */ +/* Origin: Michael Meeks in + , + adapted to a testcase by Joseph Myers . */ +/* { dg-do compile } */ +/* { dg-options "-Wsequence-point" } */ + +struct s +{ + int a; +}; + +extern int fn (int); +extern int fnb (int, int); +extern int fnc (int *); +extern int sprintf (char *, const char *, ...); + +typedef __SIZE_TYPE__ size_t; + +void +foo (int a, int b, int n, int p, int *ptr, struct s *sptr, + int *ap, int *bp, int **cp, char *ans, int (*fnp[8])(int)) +{ + int len; + + a = a++; /* { dg-warning "undefined" "sequence point warning" } */ + a = --a; /* { dg-warning "undefined" "sequence point warning" } */ + a = ++a + b; /* { dg-warning "undefined" "sequence point warning" } */ + a = a-- + b; /* { dg-warning "undefined" "sequence point warning" } */ + ap[n] = bp[n++]; /* { dg-warning "undefined" "sequence point warning" } */ + ap[--n] = bp[n]; /* { dg-warning "undefined" "sequence point warning" } */ + ap[++n] = bp[--n]; /* { dg-warning "undefined" "sequence point warning" } */ + cp[n][n] = cp[n][n]++; /* { dg-warning "undefined" "sequence point warning" { xfail *-*-* } } */ + cp[n][p] = cp[n][n++]; /* { dg-warning "undefined" "sequence point warning" } */ + *ptr++ = (size_t)ptr++; /* { dg-warning "undefined" "sequence point warning" } */ + sptr->a = sptr->a++; /* { dg-warning "undefined" "sequence point warning" { xfail *-*-* } } */ + sptr->a = (size_t)(sptr++); /* { dg-warning "undefined" "sequence point warning" } */ + *ptr++ = fn (*ptr); /* { dg-warning "undefined" "sequence point warning" } */ + a = b = a++; /* { dg-warning "undefined" "sequence point warning" } */ + b = a = --b; /* { dg-warning "undefined" "sequence point warning" } */ + a = 1 + (a = 1); /* { dg-warning "undefined" "sequence point warning" } */ + a = (a = b); /* { dg-warning "undefined" "sequence point warning" } */ + a = (a = b) + 1; /* { dg-warning "undefined" "sequence point warning" } */ + a = (bp[a++] = b) + 1; /* { dg-warning "undefined" "sequence point warning" } */ + a = b++ * b++; /* { dg-warning "undefined" "sequence point warning" } */ + a = fnb (b++, b++); /* { dg-warning "undefined" "sequence point warning" } */ + a = (*fnp[b++]) (b++); /* { dg-warning "undefined" "sequence point warning" } */ + a = (*fnp[b]) (b++); /* { dg-warning "undefined" "sequence point warning" } */ + a = (*fnp[b++]) (b); /* { dg-warning "undefined" "sequence point warning" } */ + *ap = fnc (ap++); /* { dg-warning "undefined" "sequence point warning" } */ + (a += b) + (a += n); /* { dg-warning "undefined" "sequence point warning" } */ + a = (b, b++) + (b++, b); /* { dg-warning "undefined" "sequence point warning" } */ + ap[a++] += a; /* { dg-warning "undefined" "sequence point warning" } */ + ap[a+=1] += a; /* { dg-warning "undefined" "sequence point warning" } */ + ap[a++] += a++; /* { dg-warning "undefined" "sequence point warning" } */ + ap[a+=1] += a++; /* { dg-warning "undefined" "sequence point warning" } */ + a = a++, b = a; /* { dg-warning "undefined" "sequence point warning" } */ + b = a, a = a++; /* { dg-warning "undefined" "sequence point warning" } */ + a = (b++ ? n : a) + b; /* { dg-warning "undefined" "sequence point warning" } */ + b ? a = a++ : a; /* { dg-warning "undefined" "sequence point warning" } */ + b && (a = a++); /* { dg-warning "undefined" "sequence point warning" } */ + (a = a++) && b; /* { dg-warning "undefined" "sequence point warning" } */ + b, (a = a++); /* { dg-warning "undefined" "sequence point warning" } */ + (a = a++), b; /* { dg-warning "undefined" "sequence point warning" } */ + a ^= b ^= a ^= b; /* { dg-warning "undefined" "sequence point warning" } */ + + a = a; /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = (a++ && 4); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = ! (a++ && 4); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = - (a++ && 4); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = (double) (a++ && 4); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + len = sprintf (ans, "%d", len++); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = fn (a++); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + b++, (b + b); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + (a = b++), (a = b++); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = (b++, b++); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = b++ && b++; /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = b++ || b++; /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = (b++ ? b++ : a); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + a = (b++ ? a : b++); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + ap[a++] += bp[b]; /* { dg-bogus "undefined" "bogus sequence point warning" } */ + ap[a += 1] += 1; /* { dg-bogus "undefined" "bogus sequence point warning" } */ + *ptr < 128 ? *ptr++ : *(ptr += 2); /* { dg-bogus "undefined" "bogus sequence point warning" } */ + + /* The following will be represented internally with a tree consisting of + many duplicated SAVE_EXPRs. This caused the previous version of the + sequence point warning code to fail by running out of virtual memory. */ + a = ((b & 1 ? 21 : 0) + | (b & 2 ? 22 : 0) + | (b & 3 ? 23 : 0) + | (b & 4 ? 24 : 0) + | (b & 5 ? 25 : 0) + | (b & 6 ? 26 : 0) + | (b & 7 ? 27 : 0) + | (b & 8 ? 28 : 0) + | (b & 9 ? 29 : 0) + | (b & 10 ? 30 : 0) + | (b & 11 ? 31 : 0) + | (b & 12 ? 32 : 0) + | (b & 13 ? 1 : 0) + | (b & 14 ? 2 : 0) + | (b & 15 ? 3 : 0) + | (b & 16 ? 4 : 0) + | (b & 17 ? 5 : 0) + | (b & 18 ? 6 : 0) + | (b & 19 ? 7 : 0) + | (b & 20 ? 8 : 0) + | (b & 21 ? 9 : 0)); +} diff --git a/gcc/testsuite/g++.dg/warn/sequence-pt-pr17880.C b/gcc/testsuite/g++.dg/warn/sequence-pt-pr17880.C new file mode 100644 index 00000000000..01d87be8bbe --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/sequence-pt-pr17880.C @@ -0,0 +1,54 @@ +// PR 17880 +// { dg-do compile } +// { dg-options "-Wsequence-point" } + +int +foo (int x) +{ + unsigned int a; + int b; + + b = (a += 5) > a; // { dg-warning "undefined" "sequence point warning" } + b = (a += 5) + a == 10; // { dg-warning "undefined" "sequence point warning" } + b = (a -= 5) > a; // { dg-warning "undefined" "sequence point warning" } + b = (a -= 5) + a == 10; // { dg-warning "undefined" "sequence point warning" } + b = a-- > a; // { dg-warning "undefined" "sequence point warning" } + b = a-- + a == 10; // { dg-warning "undefined" "sequence point warning" } + b = ++a > a; // { dg-warning "undefined" "sequence point warning" } + b = ++a + a == 10; // { dg-warning "undefined" "sequence point warning" } + + if ((a += 5) > a) return -1; // { dg-warning "undefined" "sequence point warning" } + if ((a += 5) + a == 10) return -1; // { dg-warning "undefined" "sequence point warning" } + if ((a -= 5) > a) return -1; // { dg-warning "undefined" "sequence point warning" } + if ((a -= 5) + a == 10) return -1; // { dg-warning "undefined" "sequence point warning" } + if (a-- > a) return -1; // { dg-warning "undefined" "sequence point warning" } + if (a-- + a == 10) return -1; // { dg-warning "undefined" "sequence point warning" } + if (++a > a) return -1; // { dg-warning "undefined" "sequence point warning" } + if (++a + a == 10) return -1; // { dg-warning "undefined" "sequence point warning" } + do {} while ((a += 5) > a); // { dg-warning "undefined" "sequence point warning" } + while ((a += 5) > a); // { dg-warning "undefined" "sequence point warning" } + for ((a += 5) > a;;); // { dg-warning "undefined" "sequence point warning" } + for (b = (a += 5) > a;;); // { dg-warning "undefined" "sequence point warning" } + for (; (a += 5) > a;); // { dg-warning "undefined" "sequence point warning" } + for (;; b = (a += 5) > a); // { dg-warning "undefined" "sequence point warning" } + for (;; a++ + a++); // { dg-warning "undefined" "sequence point warning" } + if (a) a++ - a--; // { dg-warning "undefined" "sequence point warning" } + ((a +=5) > a) ? a : b; // { dg-warning "undefined" "sequence point warning" } + return (a++ - a--); // { dg-warning "undefined" "sequence point warning" } +} + +void bar (int i) +{ + int a = i++ - i++; // { dg-warning "undefined" "sequence point warning" } +} + +void baz (int i) +{ + switch (i++ + i++) // { dg-warning "undefined" "sequence point warning" } + { + case 1: + i++ - i++; // { dg-warning "undefined" "sequence point warning" } + case 2: + break; + } +} -- 2.30.2