From 80eb9ddd1c93949c2c97ee334534d80f844f5477 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 16 Jun 2006 23:12:08 +0000 Subject: [PATCH] re PR c++/27979 (conversion check confused by enum bitfields) PR c++/27979 * call.c (standard_conversion): Strip cv-qualifiers from bitfield types. PR c++/27979 * g++.dg/expr/bitfield2.C: New test. From-SVN: r114733 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 2 +- gcc/testsuite/ChangeLog | 5 ++++- gcc/testsuite/g++.dg/expr/bitfield2.C | 9 +++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/expr/bitfield2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 28e17099b2f..35001a03a47 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-06-16 Mark Mitchell + PR c++/27979 + * call.c (standard_conversion): Strip cv-qualifiers from bitfield + types. + PR c++/27884 * decl.c (have_extern_spec): Remove. (start_decl): Do not check have_extern_spec. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index cd82732d114..970fce7ad22 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -632,7 +632,7 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p, tree bitfield_type; bitfield_type = is_bitfield_expr_with_lowered_type (expr); if (bitfield_type) - from = bitfield_type; + from = strip_top_quals (bitfield_type); } conv = build_conv (ck_rvalue, from, conv); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a1eba47192b..b4cc183d964 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,7 +1,10 @@ 2006-06-16 Mark Mitchell + PR c++/27979 + * g++.dg/expr/bitfield2.C: New test. + PR c++/27884 - * g++.dg/parse/linkage2.C: New test + * g++.dg/parse/linkage2.C: New test. 2006-06-16 Richard Guenther diff --git a/gcc/testsuite/g++.dg/expr/bitfield2.C b/gcc/testsuite/g++.dg/expr/bitfield2.C new file mode 100644 index 00000000000..6599315304f --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/bitfield2.C @@ -0,0 +1,9 @@ +// PR c++/27979 + +class Ast +{ + enum AstKind { }; + const AstKind kind : 8; + void foo(AstKind k) { } + void bar(void) { foo(kind); } +}; -- 2.30.2