diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-06-23 16:58:28 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-06-23 16:58:28 +0000 |
| commit | 165d997d2ae172d9b084206a0c4566f3f2d31a55 (patch) | |
| tree | 690df81dd299d80b4a402768cd92d32f65638a8f /gcc | |
| parent | 767de87d05afc6574bf1c5812391b2d865ee817f (diff) | |
| download | gcc-165d997d2ae172d9b084206a0c4566f3f2d31a55.zip gcc-165d997d2ae172d9b084206a0c4566f3f2d31a55.tar.gz gcc-165d997d2ae172d9b084206a0c4566f3f2d31a55.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash107.C | 20 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error17.C | 1 |
5 files changed, 36 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 23aaac1..c7e39be 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9e5a229..8cd51c2 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -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; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8f6b625..26f40f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 diff --git a/gcc/testsuite/g++.dg/template/crash107.C b/gcc/testsuite/g++.dg/template/crash107.C new file mode 100644 index 0000000..cd64c37 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash107.C @@ -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" } diff --git a/gcc/testsuite/g++.dg/template/error17.C b/gcc/testsuite/g++.dg/template/error17.C index f34234d..10c8b82 100644 --- a/gcc/testsuite/g++.dg/template/error17.C +++ b/gcc/testsuite/g++.dg/template/error17.C @@ -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 } } |