re PR c++/26785 ("extra qualification" error gives line number of end of declaration)

2008-08-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

	PR 26785
	* diagnostic.c (permerror_at): New.
	* toplev.h (permerror_at): Declare.
cp/
	* decl.c (grokdeclarator): Use explicit location with
        permerror_at.
testsuite/
	* g++.dg/warn/pr26785.C: New.

From-SVN: r138816

7 files changed, 51 insertions, 6 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9a0606..00b3b7d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+       
+	PR 26785
+	* diagnostic.c (permerror_at): New.
+	* toplev.h (permerror_at): Declare.
+	
 2008-08-06  Victor Kaplansky  <victork@il.ibm.com>
 	    Ira Rosen  <irar@il.ibm.com>
 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c55e4b5..4dfd564 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
+	PR 26785
+	* decl.c (grokdeclarator): Use explicit location with permerror_at.
+	
+2008-08-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
 	PR 8715
 	* typeck.c (cp_build_binary_op): Move code to c-common.c.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 69fa647..4c340e2 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8437,8 +8437,9 @@ grokdeclarator (const cp_declarator *declarator,
 	      friendp = 0;
 	    }
 	  else
-	    permerror ("extra qualification %<%T::%> on member %qs",
-		       ctype, name);
+	    permerror_at (declarator->id_loc, 
+			  "extra qualification %<%T::%> on member %qs",
+			  ctype, name);
 	}
       else if (/* If the qualifying type is already complete, then we
 		  can skip the following checks.  */
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 49b3f9a..69b7e4b 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -554,10 +554,26 @@ pedwarn0 (const char *gmsgid, ...)
   va_end (ap);
 }
 
-/* A "permissive" error: issues an error unless -fpermissive was given
-   on the command line, in which case it issues a warning.  Use this
-   for things that really should be errors but we want to support
-   legacy code.  */
+/* A "permissive" error at LOCATION: issues an error unless
+   -fpermissive was given on the command line, in which case it issues
+   a warning.  Use this for things that really should be errors but we
+   want to support legacy code.  */
+
+void
+permerror_at (location_t location, const char *gmsgid, ...)
+{
+  diagnostic_info diagnostic;
+  va_list ap;
+
+  va_start (ap, gmsgid);
+  diagnostic_set_info (&diagnostic, gmsgid, &ap, location,
+		       permissive_error_kind ());
+  diagnostic.option_index = OPT_fpermissive;
+  report_diagnostic (&diagnostic);
+  va_end (ap);
+}
+
+/* Equivalent to permerror_at (input_location, ...).  */
 
 void
 permerror (const char *gmsgid, ...)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea0a55b..d1bed88 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	PR 26785
+	* g++.dg/warn/pr26785.C: New.
+		
 2008-08-06  Victor Kaplansky  <victork@il.ibm.com>
 
 	* gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c: New test.
diff --git a/gcc/testsuite/g++.dg/warn/pr26785.C b/gcc/testsuite/g++.dg/warn/pr26785.C
new file mode 100644
index 0000000..b3c0313
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr26785.C
@@ -0,0 +1,10 @@
+// PR 26785
+// { dg-do compile }
+// { dg-options "-fshow-column" }
+
+class foo {
+  foo::foo // { dg-error "3: error: extra qualification" }
+  (int a, 
+   int b,
+   int c);
+};
diff --git a/gcc/toplev.h b/gcc/toplev.h
index f1e4fe5..1a015e6 100644
--- a/gcc/toplev.h
+++ b/gcc/toplev.h
@@ -68,6 +68,8 @@ extern void pedwarn0 (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 /* Pass one of the OPT_W* from options.h as the first parameter.  */
 extern void pedwarn (int, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3);
 extern void permerror (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
+extern void permerror_at (location_t, const char *, ...)
+     ATTRIBUTE_GCC_DIAG(2,3);
 extern void sorry (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 extern void inform (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 extern void verbatim (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);