/cp

2018-12-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokdeclarator): Fix location of error message about
	static data member definition.

/testsuite
2018-12-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/other/static5.C: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267066 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog

@@ -1,3 +1,8 @@
+2018-12-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (grokdeclarator): Fix location of error message about
+	static data member definition.
+
 2018-12-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/88446

gcc/cp/decl.c

@@ -12724,7 +12724,8 @@ grokdeclarator (const cp_declarator *declarator,
 	    DECL_CONTEXT (decl) = ctype;
 	    if (staticp == 1)
 	      {
-		permerror (input_location, "%<static%> may not be used when defining "
+		permerror (declspecs->locations[ds_storage_class],
+			   "%<static%> may not be used when defining "
 			   "(as opposed to declaring) a static data member");
 		staticp = 0;
 		storage_class = sc_none;

gcc/testsuite/ChangeLog

@@ -1,3 +1,7 @@
+2018-12-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/other/static5.C: New.
+
 2018-12-12  Segher Boessenkool  <segher@kernel,crashing.org>
 
 	PR testsuite/88318

gcc/testsuite/g++.dg/other/static5.C

@@ -0,0 +1,8 @@
+struct S
+{
+  static int i;
+  const static double d;
+};
+
+static int S::i;  // { dg-error "1:.static. may not be used" }
+const static double S::d = 1.0;  // { dg-error "7:.static. may not be used" }