Fix merge fallout.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@204914 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index ee4c9f7..96810ea 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -13375,7 +13375,7 @@ c_parser_cilk_clause_vectorlength (c_parser *parser, tree clauses)
       || !TREE_CONSTANT (expr)
       || !INTEGRAL_TYPE_P (TREE_TYPE (expr)))
     error_at (loc, "vectorlength must be an integer constant");
-  else if (exact_log2 (TREE_INT_CST_LOW (expr)) == -1)
+  else if (exact_log2 (tree_to_hwi (expr)) == -1)
     error_at (loc, "vectorlength must be a power of 2");
   else
     {

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 99d3f91..2944a31 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -31277,7 +31277,7 @@ cp_parser_cilk_simd_vectorlength (cp_parser *parser, tree clauses)
   expr = maybe_constant_value (expr);
 
   if (TREE_CONSTANT (expr)
-          && exact_log2 (TREE_INT_CST_LOW (expr)) == -1)
+          && exact_log2 (tree_to_hwi (expr)) == -1)
     error_at (loc, "vectorlength must be a power of 2");
   else if (expr != error_mark_node)
     {

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 5de2916..2acac5c 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -17496,7 +17496,7 @@ gen_enumeration_type_die (tree type, dw_die_ref context_die)
            value = DECL_INITIAL (value);
 
          if (simple_type_size_in_bits (TREE_TYPE (value))
-             <= HOST_BITS_PER_WIDE_INT || tree_fits_shwi_p (value)))
+             <= HOST_BITS_PER_WIDE_INT || tree_fits_shwi_p (value))
            /* DWARF2 does not provide a way of indicating whether or
               not enumeration constants are signed or unsigned.  GDB
               always assumes the values are signed, so we output all

diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 379d6d6..bcc9c7c 100644 (file)
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -2113,12 +2113,11 @@ stmt_kills_ref_p_1 (gimple stmt, ao_ref *ref)
              if (!tree_fits_shwi_p (len))
                return false;
              tree rbase = ref->base;
-             offset_int roffset = wi::to_offset (ref->offset);
+             offset_int roffset = ref->offset;
              ao_ref dref;
              ao_ref_init_from_ptr_and_size (&dref, dest, len);
              tree base = ao_ref_base (&dref);
-             offset_int offset = wi::to_offset (dref.offset);
-             offset_int bpu = wi::to_offset (BITS_PER_UNIT);
+             offset_int offset = dref.offset;
              if (!base || dref.size == -1)
                return false;
              if (TREE_CODE (base) == MEM_REF)
@@ -2126,16 +2125,16 @@ stmt_kills_ref_p_1 (gimple stmt, ao_ref *ref)
                  if (TREE_CODE (rbase) != MEM_REF)
                    return false;
                  // Compare pointers.
-                 offset += bpu * mem_ref_offset (base);
-                 roffset += bpu * mem_ref_offset (rbase);
+                 offset += mem_ref_offset (base) * BITS_PER_UNIT;
+                 roffset += mem_ref_offset (rbase) * BITS_PER_UNIT;
                  base = TREE_OPERAND (base, 0);
                  rbase = TREE_OPERAND (rbase, 0);
                }
              if (base == rbase)
                {
-                 wide_int size = bpu * tree_to_hwi (len);
-                 if (wi::le_p (offset, roffset, SIGNED)
-                     && wi::le_p (roffset + ref->max_size, offset + size, SIGNED))
+                 offset_int size = wi::to_offset (len) * BITS_PER_UNIT;
+                 if (wi::les_p (offset, roffset)
+                     && wi::les_p (roffset + ref->max_size, offset + size))
                    return true;
                }
              break;