From a45258d20b966c3cd76784adca5890bb1588752a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 6 Oct 2017 20:00:54 +0200 Subject: [PATCH] re PR c++/82299 (-Wuseless-cast errors on typed enums used in member data initializers in c++1z) PR c++/82299 * decl.c (reshape_init): Suppress warn_useless_cast for direct enum init. * typeck.c (convert_for_assignment): Likewise. * g++.dg/cpp0x/pr82299.C: New test. From-SVN: r253499 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/decl.c | 5 ++++- gcc/cp/typeck.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/pr82299.C | 9 +++++++++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr82299.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index da025a5a42f..ee292a29d32 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2017-10-06 Jakub Jelinek + + PR c++/82299 + * decl.c (reshape_init): Suppress warn_useless_cast for direct enum + init. + * typeck.c (convert_for_assignment): Likewise. + 2017-10-05 Jason Merrill * call.c (convert_arg_to_ellipsis): Use the result of force_rvalue. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index b6097392fa6..f2cd336146c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6100,7 +6100,10 @@ reshape_init (tree type, tree init, tsubst_flags_t complain) { tree elt = CONSTRUCTOR_ELT (init, 0)->value; if (check_narrowing (ENUM_UNDERLYING_TYPE (type), elt, complain)) - return cp_build_c_cast (type, elt, tf_warning_or_error); + { + warning_sentinel w (warn_useless_cast); + return cp_build_c_cast (type, elt, tf_warning_or_error); + } else return error_mark_node; } diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index cd7732bdd37..d79b724ecca 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -8414,7 +8414,10 @@ convert_for_assignment (tree type, tree rhs, { tree elt = CONSTRUCTOR_ELT (rhs, 0)->value; if (check_narrowing (ENUM_UNDERLYING_TYPE (type), elt, complain)) - rhs = cp_build_c_cast (type, elt, complain); + { + warning_sentinel w (warn_useless_cast); + rhs = cp_build_c_cast (type, elt, complain); + } else rhs = error_mark_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5ea90b2c645..3b03f713ce2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-06 Jakub Jelinek + + PR c++/82299 + * g++.dg/cpp0x/pr82299.C: New test. + 2017-10-06 Christophe Lyon Backport from mainline r253251. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr82299.C b/gcc/testsuite/g++.dg/cpp0x/pr82299.C new file mode 100644 index 00000000000..27f4c5f6172 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr82299.C @@ -0,0 +1,9 @@ +// PR c++/82299 +// { dg-do compile { target c++11 } } +// { dg-options "-Wuseless-cast" } + +enum Enum : char { A = 0, B = 1 }; + +struct S { + Enum e { Enum::A }; // { dg-bogus "useless cast to type" } +};