Commit 14e18d71 by David Malcolm Committed by David Malcolm

C: fix logic within c_expr::get_location

In r251239 I added a c_expr::get_location method for use by
c_parser_expr_list for building the vec<location_t> for
an expression list, rather than using the location of the first token.

When determining whether to use the location within the tree node,
or fall back to the range in the c_expr, I used EXPR_CAN_HAVE_LOCATION,
rather than EXPR_HAS_LOCATION.  This meant that any tree nodes of kinds
that *can* have a location but which erroneously had
   EXPR_LOCATION (value) == UNKNOWN_LOCATION
had that value added to the vec<location_t>, leading to missing
location information when reporting on the issue
(seen with gcc.dg/Wtraditional-conversion-2.c for m68k).

This patch addresses this in two ways:

(a) it fixes the specific issue in this failing test case, by
    setting up the location properly on the EXCESS_PRECISION_EXPR.

(b) updating c_expr::get_location by only using the EXPR_LOCATION
    if it's sane.  Arguably this is papering over bugs, but they are
    pre-existing ones exposed by r251239, and I'd rather have this
    fix in place than play whack-a-mole on any other such "missing
    location" bugs that are lurking in the codebase.

gcc/c/ChangeLog:
	* c-tree.h (c_expr::get_location) Use EXPR_HAS_LOCATION rather
	than CAN_HAVE_LOCATION_P when determining whether to use the
	location_t value within "value".

gcc/c-family/ChangeLog:
	* c-lex.c (interpret_float): Use token location
	when building an EXCESS_PRECISION_EXPR.

From-SVN: r251335
parent 845c76ce
2017-08-24 David Malcolm <dmalcolm@redhat.com>
* c-lex.c (interpret_float): Use token location
when building an EXCESS_PRECISION_EXPR.
2017-08-21 David Malcolm <dmalcolm@redhat.com> 2017-08-21 David Malcolm <dmalcolm@redhat.com>
* c-common.c (check_function_arguments): Add "arglogs" param; pass * c-common.c (check_function_arguments): Add "arglogs" param; pass
......
...@@ -988,7 +988,7 @@ interpret_float (const cpp_token *token, unsigned int flags, ...@@ -988,7 +988,7 @@ interpret_float (const cpp_token *token, unsigned int flags,
} }
if (type != const_type) if (type != const_type)
value = build1 (EXCESS_PRECISION_EXPR, type, value); value = build1_loc (token->src_loc, EXCESS_PRECISION_EXPR, type, value);
return value; return value;
} }
......
2017-08-24 David Malcolm <dmalcolm@redhat.com>
* c-tree.h (c_expr::get_location) Use EXPR_HAS_LOCATION rather
than CAN_HAVE_LOCATION_P when determining whether to use the
location_t value within "value".
2017-08-21 David Malcolm <dmalcolm@redhat.com> 2017-08-21 David Malcolm <dmalcolm@redhat.com>
* c-parser.c (c_parser_expr_list): Use c_expr::get_location () * c-parser.c (c_parser_expr_list): Use c_expr::get_location ()
......
...@@ -149,7 +149,7 @@ struct c_expr ...@@ -149,7 +149,7 @@ struct c_expr
location_t get_location () const location_t get_location () const
{ {
if (CAN_HAVE_LOCATION_P (value)) if (EXPR_HAS_LOCATION (value))
return EXPR_LOCATION (value); return EXPR_LOCATION (value);
else else
return make_location (get_start (), get_start (), get_finish ()); return make_location (get_start (), get_start (), get_finish ());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment