diff options
| author | Marek Polacek <polacek@redhat.com> | 2017-03-24 14:22:01 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2017-03-24 14:22:01 +0000 |
| commit | c8b1fbc12a6a7249f93a985c697c8e0edeb2a6d5 (patch) | |
| tree | 6caa8c557ab5e1f209071118cf27e555e03ae7df /gcc | |
| parent | c4d5ab5d0979227a780fb74a2961205e0458d91e (diff) | |
| download | gcc-c8b1fbc12a6a7249f93a985c697c8e0edeb2a6d5.zip gcc-c8b1fbc12a6a7249f93a985c697c8e0edeb2a6d5.tar.gz gcc-c8b1fbc12a6a7249f93a985c697c8e0edeb2a6d5.tar.bz2 | |
re PR c++/80119 (-Wmaybe-uninitialized wrongly flags the body of a short-circuited if-clause)
PR c++/80119
* cp-gimplify.c (cp_fold): Strip CLEANUP_POINT_EXPR if the expression
doesn't have side effects.
* g++.dg/warn/Wuninitialized-9.C: New test.
From-SVN: r246461
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wuninitialized-9.C | 19 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 73a25f3..f8e711b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-03-24 Marek Polacek <polacek@redhat.com> + + PR c++/80119 + * cp-gimplify.c (cp_fold): Strip CLEANUP_POINT_EXPR if the expression + doesn't have side effects. + 2017-03-23 Jason Merrill <jason@redhat.com> PR c++/80150 - ICE with overloaded variadic deduction. diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index ebb5da9..354ae1a 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2056,6 +2056,14 @@ cp_fold (tree x) code = TREE_CODE (x); switch (code) { + case CLEANUP_POINT_EXPR: + /* Strip CLEANUP_POINT_EXPR if the expression doesn't have side + effects. */ + r = cp_fold_rvalue (TREE_OPERAND (x, 0)); + if (!TREE_SIDE_EFFECTS (r)) + x = r; + break; + case SIZEOF_EXPR: x = fold_sizeof_expr (x); break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 886a0f0..c0f03ad 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-03-24 Marek Polacek <polacek@redhat.com> + + PR c++/80119 + * g++.dg/warn/Wuninitialized-9.C: New test. + 2017-03-24 Andreas Krebbel <krebbel@linux.vnet.ibm.com> * gcc.target/s390/target-attribute/tattr-3.c: Adjust error message diff --git a/gcc/testsuite/g++.dg/warn/Wuninitialized-9.C b/gcc/testsuite/g++.dg/warn/Wuninitialized-9.C new file mode 100644 index 0000000..3432b4f --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wuninitialized-9.C @@ -0,0 +1,19 @@ +// PR c++/80119 +// { dg-do compile { target c++11 } } +// { dg-options "-Wuninitialized" } + +#include <type_traits> + +template <bool b> +void failing_function(std::integral_constant<bool, b>) +{ + int i; + if (b && (i = 4)) { + ++i; // { dg-bogus "may be used uninitialized" } + } +} + +int main (void) +{ + failing_function(std::false_type()); +} |