Merge from trunk.

[thirdparty/gcc.git] / gcc / tree-ssa.c

diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 1b4a383062b8ca3cf86374fd156c37cad8ea68ea..550381ae94d3a7ad239e9e22a146ae0898064921 100644 (file)
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1338,9 +1338,9 @@ non_rewritable_mem_ref_base (tree ref)
           || TREE_CODE (TREE_TYPE (decl)) == COMPLEX_TYPE)
          && useless_type_conversion_p (TREE_TYPE (base),
                                        TREE_TYPE (TREE_TYPE (decl)))
-         && mem_ref_offset (base).fits_uhwi ()
-         && tree_to_double_int (TYPE_SIZE_UNIT (TREE_TYPE (decl)))
-            .ugt (mem_ref_offset (base))
+         && wi::fits_uhwi_p (mem_ref_offset (base))
+         && wi::gtu_p (wi::to_offset (TYPE_SIZE_UNIT (TREE_TYPE (decl))),
+                       mem_ref_offset (base))
          && multiple_of_p (sizetype, TREE_OPERAND (base, 1),
                            TYPE_SIZE_UNIT (TREE_TYPE (base))))
        return NULL_TREE;