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

re PR c++/33460 (ICE with static member in anonymous union)

Browse Source 
cp/
2007-09-20  Paolo Carlini  <pcarlini@suse.de>

	PR c++/33460
	* semantics.c (finish_id_expression): Use consistently
	context_for_name_lookup.
	* decl.c (fixup_anonymous_aggr): Fix error message for
	anonymous struct (vs union).

testsuite/
2007-09-20  Paolo Carlini  <pcarlini@suse.de>

	PR c++/33460
	* g++.dg/ext/anon-struct6.C: New.

From-SVN: r128637
This commit is contained in:
Paolo Carlini 2007-09-20 23:05:38 +00:00 committed by Paolo Carlini
parent fe046210e2
commit 24f58e7497
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2007-09-20 Paolo Carlini <pcarlini@suse.de>
PR c++/33460
* semantics.c (finish_id_expression): Use consistently
context_for_name_lookup.
* decl.c (fixup_anonymous_aggr): Fix error message for
anonymous struct (vs union).
2007-09-19 Jason Merrill <jason@redhat.com>
PR c++/7586

10
gcc/cp/decl.c
View File

@ -3704,8 +3704,14 @@ fixup_anonymous_aggr (tree t)
/* ISO C++ 9.5.3. Anonymous unions may not have function members. */
if (TYPE_METHODS (t))
error ("%Jan anonymous union cannot have function members",
TYPE_MAIN_DECL (t));
{
tree decl = TYPE_MAIN_DECL (t);
if (TREE_CODE (t) != UNION_TYPE)
error ("%Jan anonymous struct cannot have function members", decl);
else
error ("%Jan anonymous union cannot have function members", decl);
}
/* Anonymous aggregates cannot have fields with ctors, dtors or complex
assignment operators (because they cannot have these methods themselves).

14
gcc/cp/semantics.c
View File

@ -2926,13 +2926,15 @@ finish_id_expression (tree id_expression,
else
{
if (DECL_P (decl) && DECL_NONLOCAL (decl)
&& DECL_CLASS_SCOPE_P (decl)
&& context_for_name_lookup (decl) != current_class_type)
&& DECL_CLASS_SCOPE_P (decl))
{
tree path;
path = currently_open_derived_class (DECL_CONTEXT (decl));
perform_or_defer_access_check (TYPE_BINFO (path), decl, decl);
tree context = context_for_name_lookup (decl);
if (context != current_class_type)
{
tree path = currently_open_derived_class (context);
perform_or_defer_access_check (TYPE_BINFO (path),
decl, decl);
}
}
decl = convert_from_reference (decl);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-20 Paolo Carlini <pcarlini@suse.de>
PR c++/33460
* g++.dg/ext/anon-struct6.C: New.
2007-09-21 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR libfortran/23272

10
gcc/testsuite/g++.dg/ext/anon-struct6.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/33460
struct A
{
struct
{ // { dg-error "anonymous struct cannot have function members" }
struct { static int i; }; // { dg-error "prohibits anonymous structs|non-static data members" }
void foo() { i; }
}; // { dg-error "prohibits anonymous structs" }
};