* typeck.c (decay_conversion): Strip cv-quals from non-class rvalues.

From-SVN: r29762

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bef91e9492c8cefd01d079eb1ec56830a628dd1c..814e21178c3d519cbf6c6cc4f494da42698913d1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-01  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * typeck.c (decay_conversion): Strip cv-quals from non-class rvalues.
+
 1999-10-01  Mark Mitchell  <mark@codesourcery.com>
 
        * pt.c (tsubst_decl): If the type of a template instantiation is

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4a28de2b48eaa6fffd947281344ea3553de625bc..5395d7d42eea7205a1400ec2f655d028fd0c1ec5 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1789,6 +1789,11 @@ decay_conversion (exp)
       return cp_convert (ptrtype, adr);
     }
 
+  /* [basic.lval]: Class rvalues can have cv-qualified types; non-class
+     rvalues always have cv-unqualified types.  */
+  if (! CLASS_TYPE_P (type))
+    exp = cp_convert (TYPE_MAIN_VARIANT (type), exp);
+
   return exp;
 }