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

re PR c++/44625 (ICE after error: anonymous struct not inside named type) 

/cp
2011-06-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/44625
	* decl2.c (build_anon_union_vars): Early return error_mark_node
	for a nested anonymous struct.

/testsuite
2011-06-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/44625
	* g++.dg/template/crash107.C: New.
	* g++.dg/template/error17.C: Adjust.

From-SVN: r175344
This commit is contained in:
Paolo Carlini 2011-06-23 16:58:28 +00:00 committed by Paolo Carlini
parent 767de87d05
commit 165d997d2a
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/44625
* decl2.c (build_anon_union_vars): Early return error_mark_node
for a nested anonymous struct.
2011-06-23 Jason Merrill <jason@redhat.com>
PR c++/49507

5
gcc/cp/decl2.c
View File

@ -1327,7 +1327,10 @@ build_anon_union_vars (tree type, tree object)
/* Rather than write the code to handle the non-union case,
just give an error. */
if (TREE_CODE (type) != UNION_TYPE)
error ("anonymous struct not inside named type");
{
error ("anonymous struct not inside named type");
return error_mark_node;
}
for (field = TYPE_FIELDS (type);
field != NULL_TREE;

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/44625
* g++.dg/template/crash107.C: New.
* g++.dg/template/error17.C: Adjust.
2011-06-23 Jason Merrill <jason@redhat.com>
PR c++/49507

20
gcc/testsuite/g++.dg/template/crash107.C Normal file
View File

@ -0,0 +1,20 @@
// PR c++/44625
// { dg-do compile }
// { dg-options "" }
template<typename FP_> struct Vec { // { dg-message "note" }
Vec& operator^=(Vec& rhs) {
union {
struct {FP_ x,y,z;};
}; // { dg-error "anonymous struct" }
X = y*rhs.z() - z*rhs.y(); // { dg-error "not declared|no member" }
}
Vec& operator^(Vec& rhs) {
return Vec(*this)^=rhs; // { dg-message "required" }
}
};
Vec<double> v(3,4,12); // { dg-error "no matching" }
// { dg-message "note" { target *-*-* } 16 }
Vec<double> V(12,4,3); // { dg-error "no matching" }
// { dg-message "note" { target *-*-* } 18 }
Vec<double> c = v^V; // { dg-message "required" }

1
gcc/testsuite/g++.dg/template/error17.C
View File

@ -6,5 +6,4 @@ foo()
{
union { struct { }; }; // { dg-error "prohibits anonymous struct" "anon" }
// { dg-error "not inside" "not inside" { target *-*-* } 7 }
// { dg-warning "no members" "no members" { target *-*-* } 7 }
}