From 6fcb7ebb377f27c7f38780f95998ad7a148b7f5b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 3 Dec 2019 09:21:29 +0100 Subject: [PATCH] re PR c++/92732 (Bit-field of scoped enumeration type cannot be initialized) PR c++/92732 * typeck2.c (digest_nsdmi_init): For bitfields, use DECL_BIT_FIELD_TYPE instead of TREE_TYPE. * g++.dg/cpp2a/bitfield3.C: Don't expect narrowing conversion warnings. * g++.dg/cpp2a/bitfield4.C: New test. From-SVN: r278923 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/typeck2.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp2a/bitfield3.C | 4 ---- gcc/testsuite/g++.dg/cpp2a/bitfield4.C | 12 ++++++++++++ 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/bitfield4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2513beed953..7582e1f33a2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-12-03 Jakub Jelinek + + PR c++/92732 + * typeck2.c (digest_nsdmi_init): For bitfields, use + DECL_BIT_FIELD_TYPE instead of TREE_TYPE. + 2019-12-03 Jason Merrill Jakub Jelinek diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index b8868546444..ae00de2468d 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1335,6 +1335,8 @@ digest_nsdmi_init (tree decl, tree init, tsubst_flags_t complain) gcc_assert (TREE_CODE (decl) == FIELD_DECL); tree type = TREE_TYPE (decl); + if (DECL_BIT_FIELD_TYPE (decl)) + type = DECL_BIT_FIELD_TYPE (decl); int flags = LOOKUP_IMPLICIT; if (DIRECT_LIST_INIT_P (init)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 307e2512590..9b0d0a36327 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-12-03 Jakub Jelinek + PR c++/92732 + * g++.dg/cpp2a/bitfield3.C: Don't expect narrowing conversion + warnings. + * g++.dg/cpp2a/bitfield4.C: New test. + PR c++/92705 * g++.dg/conversion/ambig4.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp2a/bitfield3.C b/gcc/testsuite/g++.dg/cpp2a/bitfield3.C index 511c8894703..5482da490e2 100644 --- a/gcc/testsuite/g++.dg/cpp2a/bitfield3.C +++ b/gcc/testsuite/g++.dg/cpp2a/bitfield3.C @@ -15,11 +15,9 @@ const int b = 0; struct S { int c : 5 = 2 * a; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } int d : 6 { c + a }; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } - // { dg-warning "narrowing conversion of" "" { target *-*-* } .-1 } int e : true ? 7 : a = 3; int f : (true ? 8 : b) = d + a; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } int g : (true ? 9 : b) { f + a }; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } - // { dg-warning "narrowing conversion of" "" { target *-*-* } .-1 } int h : 1 || new int { 0 }; int i = g + a; }; @@ -28,11 +26,9 @@ template struct U { int j : W = 3 * a; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } int k : W { j + a }; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } - // { dg-warning "narrowing conversion of" "" { target *-*-* } .-1 } int l : V ? 7 : a = 3; int m : (V ? W : b) = k + a; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } int n : (V ? W : b) { m + a }; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } - // { dg-warning "narrowing conversion of" "" { target *-*-* } .-1 } int o : 1 || new int { 0 }; int p = n + a; }; diff --git a/gcc/testsuite/g++.dg/cpp2a/bitfield4.C b/gcc/testsuite/g++.dg/cpp2a/bitfield4.C new file mode 100644 index 00000000000..bbfa86cbb9e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/bitfield4.C @@ -0,0 +1,12 @@ +// PR c++/92732 +// { dg-do compile { target c++17 } } +// { dg-options "" } + +enum class byte : unsigned char { }; +using uint8_t = unsigned char; + +struct T +{ + byte a : 2 = byte{0}; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } + uint8_t b : 2 = 0; // { dg-warning "default member initializers for bit-fields only available with" "" { target c++17_down } } +} t; -- 2.30.2