diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2004-11-09 21:22:27 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2004-11-09 21:22:27 +0000 |
| commit | 8b17a9d698ae32a281cb05521b5d3e3ef0ec6c0b (patch) | |
| tree | bef9776a44038f6f2aa0dbaaf816e8fb1684d3b5 /gcc | |
| parent | e221ef54b8cb4feb7e3b3def11afae562be2c559 (diff) | |
| download | gcc-8b17a9d698ae32a281cb05521b5d3e3ef0ec6c0b.zip gcc-8b17a9d698ae32a281cb05521b5d3e3ef0ec6c0b.tar.gz gcc-8b17a9d698ae32a281cb05521b5d3e3ef0ec6c0b.tar.bz2 | |
re PR c/18322 (__func__ diagnostic in bad location)
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.
From-SVN: r90365
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-common.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/func-outside-1.c | 2 | ||||
| -rw-r--r-- | 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 76b4af7..7b745ee 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 3a13dc7..413508e 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 66df199..df1eaa3 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 fcf233f..61c343b 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 4e0ff19..60a6c14 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__; |