diff options
| author | Joseph Myers <jsm@polyomino.org.uk> | 2004-08-19 09:01:50 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2004-08-19 09:01:50 +0100 |
| commit | e4c2c34bf162df585e5cda5a65a9a066b178a8e7 (patch) | |
| tree | 116009208203aacb356d1646709739f9ef141289 | |
| parent | 7a8554ceac51e81220e87493e7d8d0a1bd50fb38 (diff) | |
| download | gcc-e4c2c34bf162df585e5cda5a65a9a066b178a8e7.zip gcc-e4c2c34bf162df585e5cda5a65a9a066b178a8e7.tar.gz gcc-e4c2c34bf162df585e5cda5a65a9a066b178a8e7.tar.bz2 | |
re PR c++/17041 (Erroneous "suggest parentheses around assignment used as truth value" warning in template members.)
PR c++/17041
* pt.c (tsubst_copy, tsubst_copy_and_build): Copy TREE_NO_WARNING
from input for MODOP_EXPR.
testsuite:
* g++.dg/Wparentheses-3.C: New test.
From-SVN: r86241
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wparentheses-3.C | 13 |
4 files changed, 33 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eb271e5..5ce9af3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-08-19 Joseph S. Myers <jsm@polyomino.org.uk> + + PR c++/17041 + * pt.c (tsubst_copy, tsubst_copy_and_build): Copy TREE_NO_WARNING + from input for MODOP_EXPR. + 2004-08-18 Mark Mitchell <mark@codesourcery.com> * pt.c (dependent_template_p): Fix typo in commment. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4107d1c..f4e9362 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7667,6 +7667,7 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) (code, tsubst_copy (TREE_OPERAND (t, 0), args, complain, in_decl), tsubst_copy (TREE_OPERAND (t, 1), args, complain, in_decl), tsubst_copy (TREE_OPERAND (t, 2), args, complain, in_decl)); + TREE_NO_WARNING (r) = TREE_NO_WARNING (t); return r; } @@ -8331,10 +8332,14 @@ tsubst_copy_and_build (tree t, return cxx_sizeof_or_alignof_expr (op1, TREE_CODE (t)); case MODOP_EXPR: - return build_x_modify_expr - (RECUR (TREE_OPERAND (t, 0)), - TREE_CODE (TREE_OPERAND (t, 1)), - RECUR (TREE_OPERAND (t, 2))); + { + tree r = build_x_modify_expr + (RECUR (TREE_OPERAND (t, 0)), + TREE_CODE (TREE_OPERAND (t, 1)), + RECUR (TREE_OPERAND (t, 2))); + TREE_NO_WARNING (r) = TREE_NO_WARNING (t); + return r; + } case ARROW_EXPR: op1 = tsubst_non_call_postfix_expression (TREE_OPERAND (t, 0), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 007f3dc..02c9cc8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-08-19 Joseph S. Myers <jsm@polyomino.org.uk> + + PR c++/17041 + * g++.dg/Wparentheses-3.C: New test. + 2004-08-19 Dorit Naishlos <dorit@il.ibm.com> * gcc.dg/vect/vect-1.c: Remove xfail from i?86-*-* x86_64-*-* due diff --git a/gcc/testsuite/g++.dg/warn/Wparentheses-3.C b/gcc/testsuite/g++.dg/warn/Wparentheses-3.C new file mode 100644 index 0000000..8781953 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wparentheses-3.C @@ -0,0 +1,13 @@ +// Test that -Wparentheses does not give bogus warnings in the +// presence of templates. Bug 17041. + +// { dg-do compile } +// { dg-options "-Wparentheses" } + +template<int> struct A +{ + int i; + A() { if ((i = 0)) ; } +}; + +A<0> a; |