tree-vrp.c (check_all_array_refs): Do not use wi->info to smuggle gimple statement...

	* tree-vrp.c (check_all_array_refs): Do not use wi->info to smuggle
	gimple statement locations.
	(check_array_bounds): Corresponding changes.  Get the statement's
	location directly from wi->stmt.

From-SVN: r254154

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 68d5943..33e275f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-27  Jeff Law  <law@redhat.com>
+
+       * tree-vrp.c (check_all_array_refs): Do not use wi->info to smuggle
+       gimple statement locations.
+       (check_array_bounds): Corresponding changes.  Get the statement's
+       location directly from wi->stmt.
+
 2017-10-27  Palmer Dabbelt  <palmer@dabbelt.com>
 
        PR target/82717

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 2c86b8e..98be684 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -6837,10 +6837,7 @@ check_array_bounds (tree *tp, int *walk_subtree, void *data)
   if (EXPR_HAS_LOCATION (t))
     location = EXPR_LOCATION (t);
   else
-    {
-      location_t *locp = (location_t *) wi->info;
-      location = *locp;
-    }
+    location = gimple_location (wi->stmt);
 
   *walk_subtree = TRUE;
 
@@ -6887,9 +6884,6 @@ check_all_array_refs (void)
 
          memset (&wi, 0, sizeof (wi));
 
-         location_t loc = gimple_location (stmt);
-         wi.info = &loc;
-
          walk_gimple_op (gsi_stmt (si),
                          check_array_bounds,
                          &wi);