From: Jason Merrill <jason@redhat.com>
Date: Thu, 14 Jan 2010 20:21:58 +0000 (-0500)
Subject: re PR c++/42655 (! causes the qualified types for rvalue)
X-Git-Tag: releases/gcc-4.5.0~1217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d1a618e84eaf3e747a1cf5bd6f936c91edc8374;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11fa60d3a16b..1374a5b02de8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Jason Merrill  <jason@redhat.com>
+
+	PR c++/42655
+	* call.c (convert_like_real): Do full decay_conversion for ck_rvalue.
+
 2010-01-13  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42634
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 02fc4b366230..935aea865f9f 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 cfebc861535c..7c747c39dbe2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Jason Merrill  <jason@redhat.com>
+
+	PR c++/42655
+	* g++.dg/overload/rvalue1.C: New.
+
 2010-01-14  Martin Jambor  <mjambor@suse.cz>
 
 	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 000000000000..41805949dedc
--- /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
+}
+