C: use full locations within c_parser_expr_list's vec<location_t>

The previous patch uncovered a bug in how c_parser_expr_list builds the
vec<location_t>: it was only using the location of the first token
within each assignment-expression in the expr-list.

This shows up in e.g. this -Wformat warning, where only part of the
2nd param is underlined:

   printf("hello %i", (long)0);
                 ~^   ~
                 %li

This patch fixes c_parser_expr_list to use the full range of
each assignment-expression in the list for the vec<location_t>, so
that for the above we print:

   printf("hello %i", (long)0);
                 ~^   ~~~~~~~
                 %li

gcc/c/ChangeLog:
	* c-parser.c (c_parser_expr_list): Use c_expr::get_location ()
	rather than peeking the location of the first token.
	* c-tree.h (c_expr::get_location): New method.

gcc/testsuite/ChangeLog:
	* gcc.dg/format/diagnostic-ranges.c (test_mismatching_types):
	Update expected result to show all of "(long)0" being underlined.
	* gcc.dg/plugin/diagnostic-test-string-literals-1.c
	(test_multitoken_macro): Update expected underlining.

From-SVN: r251239

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 64497a259ae97be3e198768c538f71bd332ecc2a..f58b4023cf49ac74699741eab574a51a9d48ac7e 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+       * c-parser.c (c_parser_expr_list): Use c_expr::get_location ()
+       rather than peeking the location of the first token.
+       * c-tree.h (c_expr::get_location): New method.
+
 2017-08-21  David Malcolm  <dmalcolm@redhat.com>
 
        * c-typeck.c (build_function_call_vec): Pass arg_loc to call

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 5c965d4420d3f4065ee0b1a76f6907e04c2c4f60..3d15eb7a6de08f10b9b93062e80ece6c348e91d6 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -8912,7 +8912,6 @@ c_parser_expr_list (c_parser *parser, bool convert_p, bool fold_p,
   vec<tree, va_gc> *ret;
   vec<tree, va_gc> *orig_types;
   struct c_expr expr;
-  location_t loc = c_parser_peek_token (parser)->location;
   unsigned int idx = 0;
 
   ret = make_tree_vector ();
@@ -8925,14 +8924,14 @@ c_parser_expr_list (c_parser *parser, bool convert_p, bool fold_p,
     c_parser_check_literal_zero (parser, literal_zero_mask, 0);
   expr = c_parser_expr_no_commas (parser, NULL);
   if (convert_p)
-    expr = convert_lvalue_to_rvalue (loc, expr, true, true);
+    expr = convert_lvalue_to_rvalue (expr.get_location (), expr, true, true);
   if (fold_p)
     expr.value = c_fully_fold (expr.value, false, NULL);
   ret->quick_push (expr.value);
   if (orig_types)
     orig_types->quick_push (expr.original_type);
   if (locations)
-    locations->safe_push (loc);
+    locations->safe_push (expr.get_location ());
   if (sizeof_arg != NULL
       && expr.original_code == SIZEOF_EXPR)
     {
@@ -8942,19 +8941,19 @@ c_parser_expr_list (c_parser *parser, bool convert_p, bool fold_p,
   while (c_parser_next_token_is (parser, CPP_COMMA))
     {
       c_parser_consume_token (parser);
-      loc = c_parser_peek_token (parser)->location;
       if (literal_zero_mask)
        c_parser_check_literal_zero (parser, literal_zero_mask, idx + 1);
       expr = c_parser_expr_no_commas (parser, NULL);
       if (convert_p)
-       expr = convert_lvalue_to_rvalue (loc, expr, true, true);
+       expr = convert_lvalue_to_rvalue (expr.get_location (), expr, true,
+                                        true);
       if (fold_p)
        expr.value = c_fully_fold (expr.value, false, NULL);
       vec_safe_push (ret, expr.value);
       if (orig_types)
        vec_safe_push (orig_types, expr.original_type);
       if (locations)
-       locations->safe_push (loc);
+       locations->safe_push (expr.get_location ());
       if (++idx < 3
          && sizeof_arg != NULL
          && expr.original_code == SIZEOF_EXPR)

diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h
index 92bcc70653e6b267e9641dcdca4abc7446603945..5182cc539ecef1bd02744dcd9a8ed84af42f042d 100644 (file)
--- a/gcc/c/c-tree.h
+++ b/gcc/c/c-tree.h
@@ -147,6 +147,14 @@ struct c_expr
   location_t get_start () const { return src_range.m_start; }
   location_t get_finish () const { return src_range.m_finish; }
 
+  location_t get_location () const
+  {
+    if (CAN_HAVE_LOCATION_P (value))
+      return EXPR_LOCATION (value);
+    else
+      return make_location (get_start (), get_start (), get_finish ());
+  }
+
   /* Set the value to error_mark_node whilst ensuring that src_range
      is initialized.  */
   void set_error ()

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f1eab8cfa35d8b451a71870277565c485a6f342..48f041e082830d37c9e732b15695de3b153fa149 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+       * gcc.dg/format/diagnostic-ranges.c (test_mismatching_types):
+       Update expected result to show all of "(long)0" being underlined.
+       * gcc.dg/plugin/diagnostic-test-string-literals-1.c
+       (test_multitoken_macro): Update expected underlining.
+
 2017-08-21  David Malcolm  <dmalcolm@redhat.com>
 
        * gcc.dg/format/diagnostic-ranges.c: Update expected results

diff --git a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c b/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c
index bc6f665600d5c28fb740f134d10b2fed74daf5de..e56e1595502f4126672274283ea434b7b5167d6f 100644 (file)
--- a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c
+++ b/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c
@@ -25,7 +25,7 @@ void test_mismatching_types (const char *msg)
   printf("hello %i", (long)0);  /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'long int' " } */
 /* { dg-begin-multiline-output "" }
    printf("hello %i", (long)0);
-                 ~^   ~
+                 ~^   ~~~~~~~
                  %li
    { dg-end-multiline-output "" } */
 }

diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c
index 03f042abf7b61b6de8d49e62efdd4668299f2c53..bea86afad7659805c6e705fb9264563d1ca997bd 100644 (file)
--- a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c
+++ b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c
@@ -250,7 +250,7 @@ test_multitoken_macro (void)
   __emit_string_literal_range (RANGE, 4, 3, 6);
 /* { dg-begin-multiline-output "" }
  #define RANGE ("0123456789")
-               ^
+               ^~~~~~~~~~~~~~
    { dg-end-multiline-output "" } */
 /* { dg-begin-multiline-output "" }
    __emit_string_literal_range (RANGE, 4, 3, 6);