From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Wed, 8 Feb 2006 11:08:04 +0000 (+0000)
Subject: re PR c++/26070 (ICE declaring data member virtual and static)
X-Git-Tag: releases/gcc-3.4.6~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcda0f943297cc8ea856aa05e37b98fcc0ba985d;p=thirdparty%2Fgcc.git

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
---

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  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26070
+	* decl.c (grokdeclarator): Clear RID_STATIC together with staticp.
+
 2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	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  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26070
+	* g++.dg/other/virtual1.C: New test.
+
 2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	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" }
+};