aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Reichelt <reichelt@igpm.rwth-aachen.de>2006-02-08 11:00:55 +0000
committerVolker Reichelt <reichelt@gcc.gnu.org>2006-02-08 11:00:55 +0000
commit7e1e0765bd82a239c29b71d112c36ff2c05ceac7 (patch)
treeb95ceb63827f8655b61989c0cc5efb3c5060ecb0
parent053007ce714fab840e44df30a4175cedc51437d9 (diff)
downloadgcc-7e1e0765bd82a239c29b71d112c36ff2c05ceac7.zip
gcc-7e1e0765bd82a239c29b71d112c36ff2c05ceac7.tar.gz
gcc-7e1e0765bd82a239c29b71d112c36ff2c05ceac7.tar.bz2
re PR c++/26070 (ICE declaring data member virtual and static)
PR c++/26070 * decl.c (grokdeclarator): Clear storage_class together with staticp. * g++.dg/other/virtual1.C: New test. From-SVN: r110747
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/other/virtual1.C7
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e9040ee..aa9aebf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+
+ PR c++/26070
+ * decl.c (grokdeclarator): Clear storage_class together with staticp.
+
2006-02-07 Gabriel Dos Reis <gdr@integrable-solutions.net>
* cp-tree.h (tf_warning_or_error): Renamed from tf_warn_or_error.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2b82073..7fdb174 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7128,6 +7128,7 @@ grokdeclarator (const cp_declarator *declarator,
if (virtualp && staticp == 2)
{
error ("member %qD cannot be declared both virtual and static", dname);
+ storage_class = sc_none;
staticp = 0;
}
friendp = !! declspecs->specs[(int)ds_friend];
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1211596..821dc85 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+
+ PR c++/26070
+ * g++.dg/other/virtual1.C: New test.
+
2006-02-08 Paolo Bonzini <bonzini@gnu.org>
* lib/gcc-dg.exp (cleanup-rtl-dump, cleanup-tree-dump,
diff --git a/gcc/testsuite/g++.dg/other/virtual1.C b/gcc/testsuite/g++.dg/other/virtual1.C
new file mode 100644
index 0000000..5f44fa7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/virtual1.C
@@ -0,0 +1,7 @@
+// PR c++/26070
+// { dg-do compile }
+
+struct A
+{
+ virtual static int i; // { dg-error "virtual" }
+};