FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init.c (expand_default_init): Fix } indentation.

Browse source 
* init.c (expand_default_init): Fix } indentation.
	* method.c (process_subob_fn): Simplify control structure to
	remove gotos.
	(implicitly_declare_fn): Remove duplicated lambda ctor check.

From-SVN: r240489
This commit is contained in:
Nathan Sidwell 2016-09-26 10:29:53 +00:00 • committed by Nathan Sidwell
parent 1a08d2da0e
commit c0cdf62c2e
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2016-09-26 Nathan Sidwell <nathan@acm.org>
* init.c (expand_default_init): Fix } indentation.
* method.c (process_subob_fn): Simplify control structure to
remove gotos.
(implicitly_declare_fn): Remove duplicated lambda ctor check.
2016-09-26 Marek Polacek <polacek@redhat.com>
PR c/7652

2
gcc/cp/init.c
View file

@ -1747,7 +1747,7 @@ expand_default_init (tree binfo, tree true_exp, tree exp, tree init, int flags,
ctor_name = base_ctor_identifier;
rval = build_special_member_call (exp, ctor_name, &parms, binfo, flags,
complain);
}
}
if (parms != NULL)
release_tree_vector (parms);

18
gcc/cp/method.c
View file

@ -1129,7 +1129,11 @@ process_subob_fn (tree fn, tree *spec_p, bool *trivial_p,
bool diag, tree arg, bool dtor_from_ctor = false)
{
if (!fn || fn == error_mark_node)
goto bad;
{
if (deleted_p)
*deleted_p = true;
return;
}
if (spec_p)
{
@ -1162,12 +1166,6 @@ process_subob_fn (tree fn, tree *spec_p, bool *trivial_p,
explain_invalid_constexpr_fn (fn);
}
}
return;
bad:
if (deleted_p)
*deleted_p = true;
}
/* Subroutine of synthesized_method_walk to allow recursion into anonymous
@ -1931,12 +1929,6 @@ 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;
}