From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 24 Aug 2017 14:28:16 +0000 (+0000)
Subject: C: fix logic within c_expr::get_location
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14e18d7100de30f3c2991401bbb414d2e3ffb716;p=gcc.git

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
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 86a8f1c28c1..3dd50557907 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	* c-common.c (check_function_arguments): Add "arglogs" param; pass
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 3765a800a57..a614b266baf 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -988,7 +988,7 @@ interpret_float (const cpp_token *token, unsigned int flags,
     }
 
   if (type != const_type)
-    value = build1 (EXCESS_PRECISION_EXPR, type, value);
+    value = build1_loc (token->src_loc, EXCESS_PRECISION_EXPR, type, value);
 
   return value;
 }
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index f58b4023cf4..0cf7bd26167 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* c-parser.c (c_parser_expr_list): Use c_expr::get_location ()
diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h
index 5182cc539ec..96c7ae7613f 100644
--- a/gcc/c/c-tree.h
+++ b/gcc/c/c-tree.h
@@ -149,7 +149,7 @@ struct c_expr
 
   location_t get_location () const
   {
-    if (CAN_HAVE_LOCATION_P (value))
+    if (EXPR_HAS_LOCATION (value))
       return EXPR_LOCATION (value);
     else
       return make_location (get_start (), get_start (), get_finish ());