name-lookup.c (check_extern_c_conflict): Use DECL_SOURCE_LOCATION.

/cp
2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>

	* name-lookup.c (check_extern_c_conflict): Use DECL_SOURCE_LOCATION.
	(check_local_shadow): Use it in three additional places.

/testsuite
2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/redeclaration-1.C: New.
	* g++.dg/lookup/extern-c-hidden.C: Test location(s) too.
	* g++.dg/lookup/extern-c-redecl.C: Likewise.
	* g++.dg/lookup/extern-c-redecl6.C: Likewise.
	* g++.old-deja/g++.other/using9.C: Likewise.

From-SVN: r276119

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e5edd806947c613ae931930f58284a913a44ff74..ca317e7730bea1ac9fca4d68f8594d53f22790db 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * name-lookup.c (check_extern_c_conflict): Use DECL_SOURCE_LOCATION.
+       (check_local_shadow): Use it in three additional places.
+
 2019-09-24  Jason Merrill  <jason@redhat.com>
 
        * parser.c (cp_parser_postfix_expression): Do set location of

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 74f1072fa8c5c361e15d36341c994bd092b90078..4d01a54055e4ac54c58780155ad760c56e520942 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2549,12 +2549,12 @@ check_extern_c_conflict (tree decl)
       if (mismatch)
        {
          auto_diagnostic_group d;
-         pedwarn (input_location, 0,
+         pedwarn (DECL_SOURCE_LOCATION (decl), 0,
                   "conflicting C language linkage declaration %q#D", decl);
          inform (DECL_SOURCE_LOCATION (old),
                  "previous declaration %q#D", old);
          if (mismatch < 0)
-           inform (input_location,
+           inform (DECL_SOURCE_LOCATION (decl),
                    "due to different exception specifications");
        }
       else
@@ -2674,7 +2674,8 @@ check_local_shadow (tree decl)
          /* ARM $8.3 */
          if (b->kind == sk_function_parms)
            {
-             error ("declaration of %q#D shadows a parameter", decl);
+             error_at (DECL_SOURCE_LOCATION (decl),
+                       "declaration of %q#D shadows a parameter", decl);
              return;
            }
        }
@@ -2700,7 +2701,8 @@ check_local_shadow (tree decl)
               && (old_scope->kind == sk_cond || old_scope->kind == sk_for))
        {
          auto_diagnostic_group d;
-         error ("redeclaration of %q#D", decl);
+         error_at (DECL_SOURCE_LOCATION (decl),
+                   "redeclaration of %q#D", decl);
          inform (DECL_SOURCE_LOCATION (old),
                  "%q#D previously declared here", old);
          return;
@@ -2723,7 +2725,8 @@ check_local_shadow (tree decl)
                   && in_function_try_handler))
        {
          auto_diagnostic_group d;
-         if (permerror (input_location, "redeclaration of %q#D", decl))
+         if (permerror (DECL_SOURCE_LOCATION (decl),
+                        "redeclaration of %q#D", decl))
            inform (DECL_SOURCE_LOCATION (old),
                    "%q#D previously declared here", old);
          return;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1f670bf0cfd05ec8236edeb637f7b36cd6ac76a..44fc3e382c620037739232fb344756fc193c8d5f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * g++.dg/diagnostic/redeclaration-1.C: New.
+       * g++.dg/lookup/extern-c-hidden.C: Test location(s) too.
+       * g++.dg/lookup/extern-c-redecl.C: Likewise.
+       * g++.dg/lookup/extern-c-redecl6.C: Likewise.
+       * g++.old-deja/g++.other/using9.C: Likewise.
+
 2019-09-23  Martin Sebor  <msebor@redhat.com>
 
        PR tree-optimization/91570

diff --git a/gcc/testsuite/g++.dg/diagnostic/redeclaration-1.C b/gcc/testsuite/g++.dg/diagnostic/redeclaration-1.C
new file mode 100644 (file)
index 0000000..a41a2b8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/redeclaration-1.C
@@ -0,0 +1,20 @@
+void
+foo (int i)
+{
+  int i  // { dg-error "7:declaration of .int i. shadows a parameter" }
+    (0);
+  
+  for (int j ;;)  // { dg-message "12:.int j. previously declared here" }
+    int j  // { dg-error "9:redeclaration of .int j." }
+      (0);
+}
+
+void
+bar (int i)  // { dg-message "10:.int i. previously declared here" }
+  try
+    { }
+  catch (...)
+    {
+      int i  // { dg-error "11:redeclaration of .int i." }
+       (0);
+    }

diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-hidden.C b/gcc/testsuite/g++.dg/lookup/extern-c-hidden.C
index 80593dba7358c9b4da8ceff3ba233ae31c49af44..2b4a46222c37084b024e8db8bf526bc3e9c6f92b 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/extern-c-hidden.C
+++ b/gcc/testsuite/g++.dg/lookup/extern-c-hidden.C
@@ -4,8 +4,8 @@ extern "C" float fabsf (float);  // { dg-message "previous declaration" }
 
 namespace Bob 
 {
-  extern "C" float fabsf (float, float); // { dg-error "C language" }
+  extern "C" float fabsf (float, float); // { dg-error "20:conflicting C language" }
   extern "C" double fabs (double, double); // { dg-message "previous declaration" }
 }
 
-extern "C" double fabs (double); // { dg-error "C language" }
+extern "C" double fabs (double); // { dg-error "19:conflicting C language" }

diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl.C
index fd49868ee4ebabb8425182a332d9f35c2e9748f0..4ffb8226154307e71af971d411282c22ece272a2 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/extern-c-redecl.C
+++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl.C
@@ -8,4 +8,4 @@ namespace A {
 // next line should trigger an error because
 // it conflicts with previous declaration of foo_func (), due to
 // different exception specifications.
-extern "C" void foo_func (); // { dg-error "C language linkage|exception specifications" }
+extern "C" void foo_func (); // { dg-error "17:conflicting C language linkage|exception specifications" }

diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl6.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl6.C
index b4537d64a26d11f3a4fd708cc17a848107ac2932..1d6c57197761a1abe5b91452f5773217e0b5e250 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/extern-c-redecl6.C
+++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl6.C
@@ -16,10 +16,10 @@ extern "C" {
 
   namespace BAD
   {
-    long i; // { dg-error "C language linkage" }
-    double f; // { dg-error "C language linkage" }
-    int fn (); // { dg-error "C language linkage" }
-    int ai1[2]; // { dg-error "C language linkage" }
+    long i; // { dg-error "10:conflicting C language linkage" }
+    double f; // { dg-error "12:conflicting C language linkage" }
+    int fn (); // { dg-error "9:conflicting C language linkage" }
+    int ai1[2]; // { dg-error "9:conflicting C language linkage" }
   }
 }
 

diff --git a/gcc/testsuite/g++.old-deja/g++.other/using9.C b/gcc/testsuite/g++.old-deja/g++.other/using9.C
index c79f993fd2b9a15b890b61f455302db8d59ff577..e1b5aa7861179997f6aabece98b27b656770629b 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/using9.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/using9.C
@@ -16,6 +16,6 @@ using ::a;
 extern "C" void foo ();                // { dg-message "previous declaration" }
 
 namespace {
-  extern "C" int foo ();       // { dg-error "C.*linkage" }
+  extern "C" int foo ();       // { dg-error "18:conflicting C.*linkage" }
   using ::foo; // { dg-error "" } already in use
 }