From: Marek Polacek <polacek@redhat.com>
Date: Wed, 16 Dec 2015 16:50:07 +0000 (+0000)
Subject: re PR c/64637 (Incorrect location for -Wunused-value warnings in for-loop)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d06f8b75bd1d2bda101444a44b0a953a4b9895b3;p=gcc.git

re PR c/64637 (Incorrect location for -Wunused-value warnings in for-loop)

	PR c/64637
	* c-typeck.c (c_process_expr_stmt): Use location of the expression if
	available.

	* gcc.dg/pr64637.c: New test.

From-SVN: r231700
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index e61a2edd2b3..fd1c707f46b 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-16  Marek Polacek  <polacek@redhat.com>
+
+	PR c/64637
+	* c-typeck.c (c_process_expr_stmt): Use location of the expression if
+	available.
+
 2015-12-15  Marek Polacek  <polacek@redhat.com>
 
 	PR c/68907
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 9d6c604ed90..a147ac6a7ce 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -10131,7 +10131,7 @@ c_process_expr_stmt (location_t loc, tree expr)
      out which is the result.  */
   if (!STATEMENT_LIST_STMT_EXPR (cur_stmt_list)
       && warn_unused_value)
-    emit_side_effect_warnings (loc, expr);
+    emit_side_effect_warnings (EXPR_LOC_OR_LOC (expr, loc), expr);
 
   exprv = expr;
   while (TREE_CODE (exprv) == COMPOUND_EXPR)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ebc8903ed1e..7a66b14fecb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-16  Marek Polacek  <polacek@redhat.com>
+
+	PR c/64637
+	* gcc.dg/pr64637.c: New test.
+
 2015-12-16  Nathan Sidwell  <nathan@acm.org>
 
 	* gcc.dg/sibcall-9.c: Xfail for nvptx.
diff --git a/gcc/testsuite/gcc.dg/pr64637.c b/gcc/testsuite/gcc.dg/pr64637.c
new file mode 100644
index 00000000000..779ff502dfe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr64637.c
@@ -0,0 +1,25 @@
+/* PR c/64637 */
+/* { dg-do compile } */
+/* { dg-options "-Wunused" } */
+
+void g ();
+
+void
+f (int b)
+{
+  for (int i = 0; i < b; i + b) /* { dg-warning "28:statement with no effect" } */
+    g ();
+  // PARM_DECLs still don't have a location, don't expect an exact location.
+  for (int i = 0; i < b; b) /* { dg-warning "statement with no effect" } */
+    g ();
+  for (int i = 0; i < b; !i) /* { dg-warning "26:statement with no effect" } */
+    g ();
+  for (!b;;) /* { dg-warning "8:statement with no effect" } */
+    g ();
+  for (;; b * 2) /* { dg-warning "13:statement with no effect" } */
+    g ();
+  ({
+     b / 5; /* { dg-warning "8:statement with no effect" } */
+     b ^ 5;
+   });
+}