From 165d997d2ae172d9b084206a0c4566f3f2d31a55 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 23 Jun 2011 16:58:28 +0000 Subject: [PATCH] re PR c++/44625 (ICE after error: anonymous struct not inside named type) /cp 2011-06-23 Paolo Carlini 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 PR c++/44625 * g++.dg/template/crash107.C: New. * g++.dg/template/error17.C: Adjust. From-SVN: r175344 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl2.c | 5 ++++- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/template/crash107.C | 20 ++++++++++++++++++++ gcc/testsuite/g++.dg/template/error17.C | 1 - 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/crash107.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 23aaac1c4f9..c7e39be0946 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-06-23 Paolo Carlini + + PR c++/44625 + * decl2.c (build_anon_union_vars): Early return error_mark_node + for a nested anonymous struct. + 2011-06-23 Jason Merrill PR c++/49507 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9e5a2297190..8cd51c28a2c 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 8f6b625c3b3..26f40f0c79b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-06-23 Paolo Carlini + + PR c++/44625 + * g++.dg/template/crash107.C: New. + * g++.dg/template/error17.C: Adjust. + 2011-06-23 Jason Merrill 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 00000000000..cd64c37d71f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash107.C @@ -0,0 +1,20 @@ +// PR c++/44625 +// { dg-do compile } +// { dg-options "" } + +template 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 v(3,4,12); // { dg-error "no matching" } +// { dg-message "note" { target *-*-* } 16 } +Vec V(12,4,3); // { dg-error "no matching" } +// { dg-message "note" { target *-*-* } 18 } +Vec 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 f34234da79f..10c8b824ae5 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 } }