On 06/23/2011 06:05 PM, Jason Merrill wrote:
So we should be able to just reject nested anonymous aggregates and
not worry about how to make them work.
The below appears to work pretty well, regtests fine. I had to tweak the
existing error17.C, we don't emit anymore the warning about no members
in the nested anonymous struct, because we bail out early. Doesn't seem
a serious issue to me...
Ok?
Paolo.
//////////////////////
/cp
2011-06-23 Paolo Carlini <paolo.carl...@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.carl...@oracle.com>
PR c++/44625
* g++.dg/template/crash107.C: New.
* g++.dg/template/error17.C: Adjust.
Index: testsuite/g++.dg/template/error17.C
===================================================================
--- testsuite/g++.dg/template/error17.C (revision 175330)
+++ testsuite/g++.dg/template/error17.C (working copy)
@@ -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 }
}
Index: testsuite/g++.dg/template/crash107.C
===================================================================
--- testsuite/g++.dg/template/crash107.C (revision 0)
+++ testsuite/g++.dg/template/crash107.C (revision 0)
@@ -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" }
Index: cp/decl2.c
===================================================================
--- cp/decl2.c (revision 175335)
+++ cp/decl2.c (working copy)
@@ -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;
