On 11/29/19 6:35 PM, Jakub Jelinek wrote:
Hi!
As the second testcase shows, we shouldn't be calling convert_for_*
with TREE_TYPE (decl) for bitfields, we need DECL_BIT_FIELD_TYPE
in that case instead (unlowered_expr_type doesn't work here,
as that wants a COMPONENT_REF which we don't have).
Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
2019-11-29 Jakub Jelinek <ja...@redhat.com>
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.
--- gcc/cp/typeck2.c.jj 2019-11-25 22:44:24.911346688 +0100
+++ gcc/cp/typeck2.c 2019-11-29 21:48:58.825713516 +0100
@@ -1335,6 +1335,9 @@ digest_nsdmi_init (tree decl, tree init,
gcc_assert (TREE_CODE (decl) == FIELD_DECL);
tree type = TREE_TYPE (decl);
+ if (DECL_BIT_FIELD_TYPE (decl))
+ type = cp_build_qualified_type (DECL_BIT_FIELD_TYPE (decl),
+ cp_type_quals (type));
I don't think we need to add qualifiers to a scalar initializer, they'll
just get discarded again. OK with that change.
Jason
