From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 12 Apr 2010 19:58:37 +0000 (+0000)
Subject: 	* call.c (type_decays_to): Call cv_unqualified for non-class type.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=458da22f7c799ba0e51a9ed214c332898d67f587

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158240 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b9420787985..746011bd604 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 2dc73f5feaa..632dd314021 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -2249,7 +2249,7 @@ type_decays_to (tree type)
     return build_pointer_type (TREE_TYPE (type));
   if (TREE_CODE (type) == FUNCTION_TYPE)
     return build_pointer_type (type);
-  if (!MAYBE_CLASS_TYPE_P (type))
+  if (!CLASS_TYPE_P (type))
     type = cv_unqualified (type);
   return type;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1f7364dc49..a091f0a9bf3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
index 718d49cd9bc..e92f6f2752c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
@@ -1,7 +1,15 @@
-// PR c++/43875
+// Test that cv-quals are dropped from non-class return type
 // { dg-options "-std=c++0x" }
 
-int main()
+template <class T, class U>
+struct assert_same_type;
+template <class T>
+struct assert_same_type<T,T> { };
+
+struct A
 {
-   auto x2 = []{ return { 1, 2 }; }; // { dg-message "return" }
-}
+  int i;
+};
+
+extern const int i;
+assert_same_type <decltype ([]{ return i; }()), int> x;