aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Martin <simartin@users.sourceforge.net>2008-07-08 18:41:35 +0000
committerSimon Martin <simartin@gcc.gnu.org>2008-07-08 18:41:35 +0000
commitff7437d0772a8a4a69b1eea2aade9835bbbe76fc (patch)
tree5bed06648ad07b024f1407e8d2b7a160d76bdd9d
parentb622a383be65aaf3ed882495aa71a12fc18426d5 (diff)
downloadgcc-ff7437d0772a8a4a69b1eea2aade9835bbbe76fc.zip
gcc-ff7437d0772a8a4a69b1eea2aade9835bbbe76fc.tar.gz
gcc-ff7437d0772a8a4a69b1eea2aade9835bbbe76fc.tar.bz2
re PR c++/34963 (ICE completely broken destructor)
gcc/cp/ 2008-07-08 Simon Martin <simartin@users.sourceforge.net> PR c++/34963 * decl.c (grokdeclarator): Reset storage_class and staticp for friend functions declared with a storage class qualifier. gcc/testsuite/ 2008-07-08 Simon Martin <simartin@users.sourceforge.net> PR c++/34963 * g++.dg/parse/dtor13.C: New test. From-SVN: r137637
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/parse/dtor13.C8
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5ef7e2e..75435cf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-08 Simon Martin <simartin@users.sourceforge.net>
+
+ PR c++/34963
+ * decl.c (grokdeclarator): Reset storage_class and staticp for friend
+ functions declared with a storage class qualifier.
+
2008-07-03 Richard Guenther <rguenther@suse.de>
PR c++/36128
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a5a5574..fc76ebe 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8036,7 +8036,11 @@ grokdeclarator (const cp_declarator *declarator,
}
if (storage_class && friendp)
- error ("storage class specifiers invalid in friend function declarations");
+ {
+ error ("storage class specifiers invalid in friend function declarations");
+ storage_class = sc_none;
+ staticp = 0;
+ }
if (!id_declarator)
unqualified_id = NULL_TREE;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f73e044..07b3827 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-08 Simon Martin <simartin@users.sourceforge.net>
+
+ PR c++/34963
+ * g++.dg/parse/dtor13.C: New test.
+
2008-07-07 H.J. Lu <hongjiu.lu@intel.com>
* gcc.dg/compat/struct-layout-1_generate.c (vector_types): Add
diff --git a/gcc/testsuite/g++.dg/parse/dtor13.C b/gcc/testsuite/g++.dg/parse/dtor13.C
new file mode 100644
index 0000000..66cd5f7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/dtor13.C
@@ -0,0 +1,8 @@
+/* PR c++/34963 This used to ICE */
+/* { dg-do "compile" } */
+
+struct A
+{
+ static friend A::~A(); /* { dg-error "storage class specifiers|extra qualification|implicitly friend" } */
+};
+