From cbb0dbb0a06e5c44e3883eaad8a1ced84647ac41 Mon Sep 17 00:00:00 2001
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Nov 2004 21:22:27 +0000
Subject: [PATCH] PR c/18322 * c-common.c (fname_decl): Don't use
line number of decl in diagnostic.
testsuite:
* gcc.dg/func-outside-1.c, gcc.dg/func-outside-2.c: Correct
expected diagnostic location.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90365 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/c-common.c | 2 +-
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/gcc.dg/func-outside-1.c | 2 +-
gcc/testsuite/gcc.dg/func-outside-2.c | 2 +-
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 76b4af76da7d..7b745eeeb699 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-09 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/18322
+ * c-common.c (fname_decl): Don't use line number of decl in
+ diagnostic.
+
2004-11-09 Ulrich Weigand <uweigand@de.ibm.com>
* config/s390/s390-protos.h (s390_pool_operand): Remove.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 3a13dc788229..413508e50dd7 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -828,7 +828,7 @@ fname_decl (unsigned int rid, tree id)
input_location = saved_location;
}
if (!ix && !current_function_decl)
- pedwarn ("%J%qD is not defined outside of function scope", decl, decl);
+ pedwarn ("%qD is not defined outside of function scope", decl);
return decl;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 66df19999b2f..df1eaa3b8eda 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-09 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/18322
+ * gcc.dg/func-outside-1.c, gcc.dg/func-outside-2.c: Correct
+ expected diagnostic location.
+
2004-11-09 Ulrich Weigand <uweigand@de.ibm.com>
* gcc.dg/20041109-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/func-outside-1.c b/gcc/testsuite/gcc.dg/func-outside-1.c
index fcf233f8a6b3..61c343bc8fe0 100644
--- a/gcc/testsuite/gcc.dg/func-outside-1.c
+++ b/gcc/testsuite/gcc.dg/func-outside-1.c
@@ -4,6 +4,6 @@
/* { dg-do compile } */
/* { dg-options "" } */
-const char *a = __func__; /* { dg-warning "warning: '__func__' is not defined outside of function scope" "undef" { target *-*-* } 0 } */
+const char *a = __func__; /* { dg-warning "warning: '__func__' is not defined outside of function scope" "undef" } */
const char *b = __FUNCTION__;
const char *c = __PRETTY_FUNCTION__;
diff --git a/gcc/testsuite/gcc.dg/func-outside-2.c b/gcc/testsuite/gcc.dg/func-outside-2.c
index 4e0ff19e7c44..60a6c144c725 100644
--- a/gcc/testsuite/gcc.dg/func-outside-2.c
+++ b/gcc/testsuite/gcc.dg/func-outside-2.c
@@ -4,6 +4,6 @@
/* { dg-do compile } */
/* { dg-options "-pedantic-errors" } */
-const char *a = __func__; /* { dg-error "error: '__func__' is not defined outside of function scope" "undef" { target *-*-* } 0 } */
+const char *a = __func__; /* { dg-error "error: '__func__' is not defined outside of function scope" "undef" } */
const char *b = __FUNCTION__;
const char *c = __PRETTY_FUNCTION__;
--
GitLab