| Message ID | 87d2jc2qgy.fsf@redhat.com |
|---|---|
| State | New |
| Headers | show |
Dodji Seketeli <dodji@redhat.com> writes: > Here is the patch I am committing right now. > > gcc/ChangeLog > > * input.c (location_get_source_line): Bail out on when line number > is zero, and test the return value of > lookup_or_add_file_to_cache_tab. > > gcc/testsuite/ChangeLog > > * c-c++-common/cpp/warning-zero-location.c: New test. > * c-c++-common/cpp/warning-zero-location-2.c: Likewise. I forgot to say that it passed bootstrap & test on x86_64-unknown-linux-gnu against trunk. Thanks.
On Tue, Jan 28, 2014 at 5:23 AM, Dodji Seketeli <dodji@redhat.com> wrote: > Dodji Seketeli <dodji@redhat.com> writes: > >> Here is the patch I am committing right now. >> >> gcc/ChangeLog >> >> * input.c (location_get_source_line): Bail out on when line number >> is zero, and test the return value of >> lookup_or_add_file_to_cache_tab. >> >> gcc/testsuite/ChangeLog >> >> * c-c++-common/cpp/warning-zero-location.c: New test. >> * c-c++-common/cpp/warning-zero-location-2.c: Likewise. > > I forgot to say that it passed bootstrap & test on > x86_64-unknown-linux-gnu against trunk. > The new tests failed on Linux/x86: ERROR: c-c++-common/cpp/warning-zero-location-2.c -std=gnu++11: syntax error in target selector "4636" for " dg-error 10 "No such file or directory" { target *-*-* } 4636 " ERROR: c-c++-common/cpp/warning-zero-location-2.c -std=gnu++98: syntax error in target selector "4636" for " dg-error 10 "No such file or directory" { target *-*-* } 4636 " ERROR: c-c++-common/cpp/warning-zero-location-2.c -Wc++-compat : syntax error in target selector "4636" for " dg-error 10 "No such file or directory" { target *-*-* } 4636 "
diff --git a/gcc/input.c b/gcc/input.c index 547c177..63cd062 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -698,7 +698,13 @@ location_get_source_line (expanded_location xloc, static char *buffer; static ssize_t len; - fcache * c = lookup_or_add_file_to_cache_tab (xloc.file); + if (xloc.line == 0) + return NULL; + + fcache *c = lookup_or_add_file_to_cache_tab (xloc.file); + if (c == NULL) + return NULL; + bool read = read_line_num (c, xloc.line, &buffer, &len); if (read && line_len) diff --git a/gcc/testsuite/c-c++-common/cpp/warning-zero-location-2.c b/gcc/testsuite/c-c++-common/cpp/warning-zero-location-2.c new file mode 100644 index 0000000..c0e0bf7 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/warning-zero-location-2.c @@ -0,0 +1,10 @@ +/* + { dg-options "-D _GNU_SOURCE -fdiagnostics-show-caret" } + { dg-do compile } + */ + +#line 4636 "configure" +#include <xxxxxxxxxxxx.h> +int main() { return 0; } + +/* { dg-error "No such file or directory" { target *-*-* } 4636 } */ diff --git a/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c b/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c new file mode 100644 index 0000000..ca2e102 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c @@ -0,0 +1,8 @@ +/* + { dg-options "-D _GNU_SOURCE -fdiagnostics-show-caret" } + { dg-do compile } + */ + +#define _GNU_SOURCE /* { dg-warning "redefined" } */ + +/* { dg-message "" "#define _GNU_SOURCE" {target *-*-* } 0 }