diff options
| author | Marek Polacek <polacek@redhat.com> | 2014-05-01 07:08:19 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-05-01 07:08:19 +0000 |
| commit | 5436fa2e87fd7df010144347bd3e1fcc0a48d901 (patch) | |
| tree | b0be3faa960ae96110d9a1c9545b75f18b18b9ff | |
| parent | d2d9bc36ee79f7c823d1f1eb181f8eb77d8ba08b (diff) | |
| download | gcc-5436fa2e87fd7df010144347bd3e1fcc0a48d901.zip gcc-5436fa2e87fd7df010144347bd3e1fcc0a48d901.tar.gz gcc-5436fa2e87fd7df010144347bd3e1fcc0a48d901.tar.bz2 | |
re PR c/56989 (wrong location in error message)
PR c/56989
* c-typeck.c (default_conversion): Use better location for
error call.
* gcc.dg/pr56989.c: New test.
From-SVN: r209969
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr56989.c | 19 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index bf61610..cee0329 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-05-01 Marek Polacek <polacek@redhat.com> + + PR c/56989 + * c-typeck.c (default_conversion): Use better location for + error call. + 2014-04-30 Marek Polacek <polacek@redhat.com> * c-typeck.c (build_binary_op): Call ubsan_instrument_division diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index cb8ae44..409b0a7 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -2107,7 +2107,8 @@ default_conversion (tree exp) if (code == VOID_TYPE) { - error ("void value not ignored as it ought to be"); + error_at (EXPR_LOC_OR_LOC (exp, input_location), + "void value not ignored as it ought to be"); return error_mark_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a927fdd..c62126e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-01 Marek Polacek <polacek@redhat.com> + + PR c/56989 + * gcc.dg/pr56989.c: New test. + 2014-04-30 Ian Lance Taylor <iant@google.com> * go.test/go-test.exp (go-gc-tests): For rundir, pass extra files diff --git a/gcc/testsuite/gcc.dg/pr56989.c b/gcc/testsuite/gcc.dg/pr56989.c new file mode 100644 index 0000000..beb9806 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr56989.c @@ -0,0 +1,19 @@ +/* PR c/56989 */ +/* { dg-do compile } */ + +extern void voidf (void); +extern int intf (void); + +int +f (void) +{ + if (intf () < 0 + || voidf () < 0) /* { dg-error "10:void value not ignored as it ought to be" } */ + return 1; + + if (voidf () < 0 /* { dg-error "7:void value not ignored as it ought to be" } */ + || intf () < 0) + return 1; + + return 0; +} |