mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 12:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (cp_finish_decl): Check for invalid multiple initializers even if the initializer is dependent.

Browse Source 
* decl.c (cp_finish_decl): Check for invalid multiple initializers
	even if the initializer is dependent.

From-SVN: r190826
This commit is contained in:
Jason Merrill 2012-08-30 22:49:42 -04:00 committed by Jason Merrill
parent 429f8106ec
commit fdf565deae
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2012-08-30 Jason Merrill <jason@redhat.com>
* decl.c (cp_finish_decl): Check for invalid multiple initializers
even if the initializer is dependent.
* pt.c (instantiate_template_1): Keep processing_template_decl set
if there are dependent args.

11
gcc/cp/decl.c
View File

@ -6123,8 +6123,15 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
release_tree_vector (cleanups);
}
else if (!DECL_PRETTY_FUNCTION_P (decl))
/* Deduce array size even if the initializer is dependent. */
maybe_deduce_size_from_array_init (decl, init);
{
/* Deduce array size even if the initializer is dependent. */
maybe_deduce_size_from_array_init (decl, init);
/* And complain about multiple initializers. */
if (init && TREE_CODE (init) == TREE_LIST && TREE_CHAIN (init)
&& !MAYBE_CLASS_TYPE_P (type))
init = build_x_compound_expr_from_list (init, ELK_INIT,
tf_warning_or_error);
}
if (init)
DECL_INITIAL (decl) = init;

2
gcc/testsuite/g++.dg/template/static30.C
View File

@ -7,4 +7,4 @@ template <int> struct A
};
template <int N> const int A<N>::i1(A<N>::i);
template <int N> const int A<N>::i2(3, A<N>::i);
template <int N> const int A<N>::i2(3, A<N>::i); // { dg-error "expression list" }