From 5436fa2e87fd7df010144347bd3e1fcc0a48d901 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 1 May 2014 07:08:19 +0000 Subject: [PATCH] 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 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-typeck.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr56989.c | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr56989.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index bf61610e37c..cee032969b6 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-05-01 Marek Polacek + + PR c/56989 + * c-typeck.c (default_conversion): Use better location for + error call. + 2014-04-30 Marek Polacek * 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 cb8ae44e363..409b0a7b99c 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 a927fddbbf6..c62126e98dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-01 Marek Polacek + + PR c/56989 + * gcc.dg/pr56989.c: New test. + 2014-04-30 Ian Lance Taylor * 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 00000000000..beb980678b2 --- /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; +}