From 2d1a618e84eaf3e747a1cf5bd6f936c91edc8374 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 14 Jan 2010 15:21:58 -0500 Subject: [PATCH] re PR c++/42655 (! causes the qualified types for rvalue) PR c++/42655 * call.c (convert_like_real): Do full decay_conversion for ck_rvalue. From-SVN: r155913 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/overload/rvalue1.C | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/overload/rvalue1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 11fa60d3a16..1374a5b02de 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-14 Jason Merrill + + PR c++/42655 + * call.c (convert_like_real): Do full decay_conversion for ck_rvalue. + 2010-01-13 Dodji Seketeli PR c++/42634 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 02fc4b36623..935aea865f9 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5013,7 +5013,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum, switch (convs->kind) { case ck_rvalue: - expr = convert_bitfield_to_declared_type (expr); + expr = decay_conversion (expr); if (! MAYBE_CLASS_TYPE_P (totype)) return expr; /* Else fall through. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cfebc861535..7c747c39dbe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-01-14 Jason Merrill + + PR c++/42655 + * g++.dg/overload/rvalue1.C: New. + 2010-01-14 Martin Jambor PR tree-optimization/42706 diff --git a/gcc/testsuite/g++.dg/overload/rvalue1.C b/gcc/testsuite/g++.dg/overload/rvalue1.C new file mode 100644 index 00000000000..41805949ded --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/rvalue1.C @@ -0,0 +1,10 @@ +// PR c++/42655 + +void unused(const bool &) { } + +int main() { + volatile bool x = false; + unused(!!x); // type of "!x" is bool + unused(!x); // type of "!x" is bool +} + -- 2.30.2