git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR c++/52599 (ICE on illegal constexpr constructor declaration) 

/cp
2012-04-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/52599
	* semantics.c (build_constexpr_constructor_member_initializers):
	Check for function-try-block as function-body.

/testsuite
2012-04-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/52599
	* g++.dg/cpp0x/constexpr-ctor10.C: New.

/cp
2012-04-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/53003
	* parser.c (cp_parser_member_declaration): Check that
	initializer_token_start is non null before dereferencing it.

/testsuite
2012-04-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/53003
	* g++.dg/parse/crash59.C: New.

From-SVN: r186541
This commit is contained in:
Paolo Carlini 2012-04-17 17:20:02 +00:00 committed by Paolo Carlini
parent 9fc37b2b7b
commit 0fced8150b
6 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/cp/ChangeLog
View File

@ -1,3 +1,15 @@
2012-04-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/52599
* semantics.c (build_constexpr_constructor_member_initializers):
Check for function-try-block as function-body.
2012-04-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/53003
* parser.c (cp_parser_member_declaration): Check that
initializer_token_start is non null before dereferencing it.
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/38543

2
gcc/cp/parser.c
View File

@ -19109,7 +19109,7 @@ cp_parser_member_declaration (cp_parser* parser)
possible that this fact is an oversight in the
standard, since a pure function may be defined
outside of the class-specifier. */
if (initializer)
if (initializer && initializer_token_start)
error_at (initializer_token_start->location,
"pure-specifier on function-definition");
decl = cp_parser_save_member_function_body (parser,

6
gcc/cp/semantics.c
View File

@ -5921,6 +5921,12 @@ build_constexpr_constructor_member_initializers (tree type, tree body)
break;
}
}
else if (TREE_CODE (body) == TRY_BLOCK)
{
error ("body of %<constexpr%> constructor cannot be "
"a function-try-block");
return error_mark_node;
}
else if (EXPR_P (body))
ok = build_data_member_initialization (body, &vec);
else

10
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
2012-04-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/52599
* g++.dg/cpp0x/constexpr-ctor10.C: New.
2012-04-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/53003
* g++.dg/parse/crash59.C: New.
2012-04-17 Michael Matz <matz@suse.de>
PR tree-optimization/18437

6
gcc/testsuite/g++.dg/cpp0x/constexpr-ctor10.C Normal file
View File

@ -0,0 +1,6 @@
// PR c++/52599
// { dg-options -std=c++11 }
struct foo {
constexpr foo() try { } catch(...) { }; // { dg-error "constructor" }
};

3
gcc/testsuite/g++.dg/parse/crash59.C Normal file
View File

@ -0,0 +1,3 @@
// PR c++/53003
struct A{ void a{} return b // { dg-error "function definition|expected" }