From b506575ff66ca6e62494b000ae68c182c7b22573 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 20 Dec 2017 12:52:43 +0000 Subject: [PATCH] poly_int: same_addr_size_stores_p This patch makes tree-ssa-alias.c:same_addr_size_stores_p handle poly_int sizes and offsets. 2017-12-20 Richard Sandiford Alan Hayward David Sherwood gcc/ * tree-ssa-alias.c (same_addr_size_stores_p): Take the offsets and sizes as poly_int64s rather than HOST_WIDE_INTs. Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r255870 --- gcc/ChangeLog | 7 +++++++ gcc/tree-ssa-alias.c | 31 ++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 562907636ec..a08c80bed1b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-12-20 Richard Sandiford + Alan Hayward + David Sherwood + + * tree-ssa-alias.c (same_addr_size_stores_p): Take the offsets and + sizes as poly_int64s rather than HOST_WIDE_INTs. + 2017-12-20 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index 5340fd350bc..4d46162791f 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -2320,14 +2320,14 @@ stmt_may_clobber_ref_p (gimple *stmt, tree ref) address. */ static bool -same_addr_size_stores_p (tree base1, HOST_WIDE_INT offset1, HOST_WIDE_INT size1, - HOST_WIDE_INT max_size1, - tree base2, HOST_WIDE_INT offset2, HOST_WIDE_INT size2, - HOST_WIDE_INT max_size2) +same_addr_size_stores_p (tree base1, poly_int64 offset1, poly_int64 size1, + poly_int64 max_size1, + tree base2, poly_int64 offset2, poly_int64 size2, + poly_int64 max_size2) { /* Offsets need to be 0. */ - if (offset1 != 0 - || offset2 != 0) + if (maybe_ne (offset1, 0) + || maybe_ne (offset2, 0)) return false; bool base1_obj_p = SSA_VAR_P (base1); @@ -2346,17 +2346,19 @@ same_addr_size_stores_p (tree base1, HOST_WIDE_INT offset1, HOST_WIDE_INT size1, tree memref = base1_memref_p ? base1 : base2; /* Sizes need to be valid. */ - if (max_size1 == -1 || max_size2 == -1 - || size1 == -1 || size2 == -1) + if (!known_size_p (max_size1) + || !known_size_p (max_size2) + || !known_size_p (size1) + || !known_size_p (size2)) return false; /* Max_size needs to match size. */ - if (max_size1 != size1 - || max_size2 != size2) + if (maybe_ne (max_size1, size1) + || maybe_ne (max_size2, size2)) return false; /* Sizes need to match. */ - if (size1 != size2) + if (maybe_ne (size1, size2)) return false; @@ -2384,10 +2386,9 @@ same_addr_size_stores_p (tree base1, HOST_WIDE_INT offset1, HOST_WIDE_INT size1, /* Check that the object size is the same as the store size. That ensures us that ptr points to the start of obj. */ - if (!tree_fits_shwi_p (DECL_SIZE (obj))) - return false; - HOST_WIDE_INT obj_size = tree_to_shwi (DECL_SIZE (obj)); - return obj_size == size1; + return (DECL_SIZE (obj) + && poly_int_tree_p (DECL_SIZE (obj)) + && known_eq (wi::to_poly_offset (DECL_SIZE (obj)), size1)); } /* If STMT kills the memory reference REF return true, otherwise -- 2.30.2