diff options
| author | Marek Polacek <polacek@redhat.com> | 2019-11-13 15:59:53 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2019-11-13 15:59:53 +0000 |
| commit | 7b521fbd43b3cbaf4313c7719bed72d4de3b49a9 (patch) | |
| tree | c86966eafc86c3b5324e227941a89502db30c147 /gcc/cp | |
| parent | 2aaf32ab603d05d7ddc12c7ec1db3314044cf91a (diff) | |
| download | gcc-7b521fbd43b3cbaf4313c7719bed72d4de3b49a9.zip gcc-7b521fbd43b3cbaf4313c7719bed72d4de3b49a9.tar.gz gcc-7b521fbd43b3cbaf4313c7719bed72d4de3b49a9.tar.bz2 | |
PR c++/89070 - bogus [[nodiscard]] warning in SFINAE.
This is a complaint that we issue a [[nodiscard]] warning even in SFINAE
contexts. Here 'complain' is tf_decltype, but not tf_warning so I guess
we can fix it as below.
* cvt.c (convert_to_void): Guard maybe_warn_nodiscard calls with
tf_warning.
* g++.dg/cpp1z/nodiscard7.C: New test.
From-SVN: r278147
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5dcf13b..5c9c9f1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-11-13 Marek Polacek <polacek@redhat.com> + + PR c++/89070 - bogus [[nodiscard]] warning in SFINAE. + * cvt.c (convert_to_void): Guard maybe_warn_nodiscard calls with + tf_warning. + 2019-11-13 Richard Sandiford <richard.sandiford@arm.com> PR c++/92206 diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index d41aeb8..23facb7 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1201,7 +1201,8 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) if (DECL_DESTRUCTOR_P (fn)) return expr; - maybe_warn_nodiscard (expr, implicit); + if (complain & tf_warning) + maybe_warn_nodiscard (expr, implicit); break; case INDIRECT_REF: @@ -1357,7 +1358,8 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) && !is_reference) warning_at (loc, OPT_Wunused_value, "value computed is not used"); expr = TREE_OPERAND (expr, 0); - if (TREE_CODE (expr) == CALL_EXPR) + if (TREE_CODE (expr) == CALL_EXPR + && (complain & tf_warning)) maybe_warn_nodiscard (expr, implicit); } @@ -1435,7 +1437,8 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) AGGR_INIT_EXPR_ARGP (init)); } } - maybe_warn_nodiscard (expr, implicit); + if (complain & tf_warning) + maybe_warn_nodiscard (expr, implicit); break; default:; |