From fcda0f943297cc8ea856aa05e37b98fcc0ba985d Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Wed, 8 Feb 2006 11:08:04 +0000 Subject: [PATCH] re PR c++/26070 (ICE declaring data member virtual and static) PR c++/26070 * decl.c (grokdeclarator): Clear RID_STATIC together with staticp. * g++.dg/other/virtual1.C: New test. From-SVN: r110750 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/virtual1.C | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/other/virtual1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index da47e4854b19..98588f756010 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 RID_STATIC together with staticp. + 2006-02-01 Volker Reichelt Backport: diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 74a386d941db..299ff8823420 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7188,8 +7188,8 @@ grokdeclarator (tree declarator, if (virtualp && staticp == 2) { - error ("member `%D' cannot be declared both virtual and static", - dname); + error ("member `%D' cannot be declared both virtual and static", dname); + RIDBIT_RESET (RID_STATIC, specbits); staticp = 0; } friendp = RIDBIT_SETP (RID_FRIEND, specbits); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6040ed2d972f..ce81d3ee2696 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-01 Volker Reichelt Backport: diff --git a/gcc/testsuite/g++.dg/other/virtual1.C b/gcc/testsuite/g++.dg/other/virtual1.C new file mode 100644 index 000000000000..5f44fa78ab2c --- /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.47.2