OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

method.c (implicitly_declare_fn): Handle deleted lambda default ctor and copy assop here.

Browse Source 
* method.c (implicitly_declare_fn): Handle deleted lambda default
	ctor and copy assop here.
	* class.c (check_bases_and_members): Not here.
	(add_implicitly_declared_members): And don't set
	CLASSTYPE_LAZY_MOVE_ASSIGN.

From-SVN: r216105
This commit is contained in:
Jason Merrill 2014-10-10 16:27:07 -04:00 committed by Jason Merrill
parent cfb71cadfd
commit c6250f73ff
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,5 +1,11 @@
2014-10-10 Jason Merrill <jason@redhat.com>
* method.c (implicitly_declare_fn): Handle deleted lambda default
ctor and copy assop here.
* class.c (check_bases_and_members): Not here.
(add_implicitly_declared_members): And don't set
CLASSTYPE_LAZY_MOVE_ASSIGN.
* semantics.c (finish_id_expression): Check for error_mark_node.
2014-10-09 Jason Merrill <jason@redhat.com>

9
gcc/cp/class.c
View File

@ -3158,7 +3158,7 @@ add_implicitly_declared_members (tree t, tree* access_decls,
TYPE_HAS_COPY_ASSIGN (t) = 1;
TYPE_HAS_CONST_COPY_ASSIGN (t) = !cant_have_const_assignment;
CLASSTYPE_LAZY_COPY_ASSIGN (t) = 1;
if (move_ok)
if (move_ok && !LAMBDA_TYPE_P (t))
CLASSTYPE_LAZY_MOVE_ASSIGN (t) = 1;
}
@ -5624,13 +5624,6 @@ check_bases_and_members (tree t)
if (LAMBDA_TYPE_P (t))
{
/* "The closure type associated with a lambda-expression has a deleted
default constructor and a deleted copy assignment operator." */
TYPE_NEEDS_CONSTRUCTING (t) = 1;
TYPE_HAS_COMPLEX_DFLT (t) = 1;
TYPE_HAS_COMPLEX_COPY_ASSIGN (t) = 1;
CLASSTYPE_LAZY_MOVE_ASSIGN (t) = 0;
/* "This class type is not an aggregate." */
CLASSTYPE_NON_AGGREGATE (t) = 1;
}

6
gcc/cp/method.c
View File

@ -1911,6 +1911,12 @@ implicitly_declare_fn (special_function_kind kind, tree type,
DECL_DEFAULTED_FN (fn) = 1;
if (cxx_dialect >= cxx11)
{
/* "The closure type associated with a lambda-expression has a deleted
default constructor and a deleted copy assignment operator." */
if ((kind == sfk_constructor
|| kind == sfk_copy_assignment)
&& LAMBDA_TYPE_P (type))
deleted_p = true;
DECL_DELETED_FN (fn) = deleted_p;
DECL_DECLARED_CONSTEXPR_P (fn) = constexpr_p;
}

12
gcc/testsuite/g++.dg/ext/is_trivially_constructible4.C Normal file
View File

@ -0,0 +1,12 @@
// { dg-do compile { target c++11 } }
#define SA(X) static_assert((X),#X)
void f()
{
int x;
auto l = [=]{ return x; };
typedef decltype(l) C;
SA(__is_trivially_copyable(C));
SA(__is_trivially_constructible(C,C));
}