From 7b521fbd43b3cbaf4313c7719bed72d4de3b49a9 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Wed, 13 Nov 2019 15:59:53 +0000 Subject: 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 --- gcc/cp/cvt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc/cp/cvt.c') 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:; -- cgit v1.1