* call.c (type_decays_to): Call cv_unqualified for non-class type.

From-SVN: r158240

gcc/cp/ChangeLog

+2010-04-12  Jason Merrill  <jason@redhat.com>
+
+	* call.c (type_decays_to): Call cv_unqualified for non-class type.
+
 2010-04-12  Fabien Chene  <fabien.chene@gmail.com>
 
 	PR c++/25811

gcc/cp/call.c

@@ -2263,6 +2263,8 @@ type_decays_to (tree type)
     return build_pointer_type (TREE_TYPE (type));
   if (TREE_CODE (type) == FUNCTION_TYPE)
     return build_pointer_type (type);
+  if (!CLASS_TYPE_P (type))
+    type = cv_unqualified (type);
   return type;
 }
 

gcc/testsuite/ChangeLog

+2010-04-12  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/lambda/lambda-deduce2.C: New.
+
 2010-04-12  Fabien Chene  <fabien.chene@gmail.com>
 
 	PR c++/25811

gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C

+// Test that cv-quals are dropped from non-class return type
+// { dg-options "-std=c++0x" }
+
+template <class T, class U>
+struct assert_same_type;
+template <class T>
+struct assert_same_type<T,T> { };
+
+struct A
+{
+  int i;
+};
+
+extern const int i;
+assert_same_type <decltype ([]{ return i; }()), int> x;