From 7e1e0765bd82a239c29b71d112c36ff2c05ceac7 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Wed, 8 Feb 2006 11:00:55 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/virtual1.C | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 gcc/testsuite/g++.dg/other/virtual1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e9040ee75a9..aa9aebf6062 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Volker Reichelt + + PR c++/26070 + * decl.c (grokdeclarator): Clear storage_class together with staticp. + 2006-02-07 Gabriel Dos Reis * 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 2b820735390..7fdb1743f4c 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 1211596cb86..821dc85a5e3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Volker Reichelt + + PR c++/26070 + * g++.dg/other/virtual1.C: New test. + 2006-02-08 Paolo Bonzini * 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 00000000000..5f44fa78ab2 --- /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" } +}; -- 2.30.2