From a565d95cd0f0ce7b7c44cfd86ea5abfe4fcba1b7 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 27 Oct 2017 09:35:37 -0600 Subject: [PATCH] tree-vrp.c (check_all_array_refs): Do not use wi->info to smuggle gimple statement locations. * 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 --- gcc/ChangeLog | 7 +++++++ gcc/tree-vrp.c | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 68d5943e90b..33e275f6b3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-10-27 Jeff Law + + * 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 PR target/82717 diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 2c86b8e5c91..98be68467d7 100644 --- 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); -- 2.30.2