Merge with trunk.

[thirdparty/gcc.git] / gcc / ipa-prop.c

diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 712dab76c50db69aa437745772a5fd7b35d61204..acc01fcfbbb0b5e6dff9fdb700614b51f872b200 100644 (file)
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -1069,7 +1069,7 @@ compute_complex_assign_jump_func (struct ipa_node_params *info,
       || max_size == -1
       || max_size != size)
     return;
-  offset += mem_ref_offset (base).low * BITS_PER_UNIT;
+  offset += mem_ref_offset (base).to_short_addr () * BITS_PER_UNIT;
   ssa = TREE_OPERAND (base, 0);
   if (TREE_CODE (ssa) != SSA_NAME
       || !SSA_NAME_IS_DEFAULT_DEF (ssa)
@@ -1128,7 +1128,7 @@ get_ancestor_addr_info (gimple assign, tree *obj_p, HOST_WIDE_INT *offset)
       || TREE_CODE (SSA_NAME_VAR (parm)) != PARM_DECL)
     return NULL_TREE;
 
-  *offset += mem_ref_offset (expr).low * BITS_PER_UNIT;
+  *offset += mem_ref_offset (expr).to_short_addr () * BITS_PER_UNIT;
   *obj_p = obj;
   return expr;
 }
@@ -3669,9 +3669,8 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
                  if (TYPE_ALIGN (type) > align)
                    align = TYPE_ALIGN (type);
                }
-             misalign += (tree_to_double_int (off)
-                          .sext (TYPE_PRECISION (TREE_TYPE (off))).low
-                          * BITS_PER_UNIT);
+             misalign += (offset_int::from (off, SIGNED)
+                          * BITS_PER_UNIT).to_short_addr ();
              misalign = misalign & (align - 1);
              if (misalign != 0)
                align = (misalign & -misalign);
@@ -3857,7 +3856,7 @@ ipa_get_adjustment_candidate (tree **expr, bool *convert,
 
   if (TREE_CODE (base) == MEM_REF)
     {
-      offset += mem_ref_offset (base).low * BITS_PER_UNIT;
+      offset += mem_ref_offset (base).to_short_addr () * BITS_PER_UNIT;
       base = TREE_OPERAND (base, 0);
     }