remove gimple_location_ptr ()

gcc/ChangeLog:

2015-10-05  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* gimple.h (gimple_location_ptr): Remove.
	* tree-vrp.c (check_all_array_refs): Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228485 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 754668d..c831924 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-10-05  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+       * gimple.h (gimple_location_ptr): Remove.
+       * tree-vrp.c (check_all_array_refs): Adjust.
+
+2015-10-05  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
        * tree-ssa-operands.c (build_uses): store tree * instead of
        tree.
        (finalize_ssa_uses): Adjust.

diff --git a/gcc/gimple.h b/gcc/gimple.h
index 30b1041..cfd8d2c 100644 (file)
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -1734,15 +1734,6 @@ gimple_location_safe (const gimple *g)
   return g ? gimple_location (g) : UNKNOWN_LOCATION;
 }
 
-/* Return pointer to location information for statement G.  */
-
-static inline const location_t *
-gimple_location_ptr (const gimple *g)
-{
-  return &g->location;
-}
-
-
 /* Set location information for statement G.  */
 
 static inline void

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 3bc3b03..ef5ef10 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -6717,8 +6717,9 @@ check_all_array_refs (void)
            continue;
 
          memset (&wi, 0, sizeof (wi));
-         wi.info = CONST_CAST (void *, (const void *)
-                               gimple_location_ptr (stmt));
+
+         location_t loc = gimple_location (stmt);
+         wi.info = &loc;
 
          walk_gimple_op (gsi_stmt (si),
                          check_array_bounds,