Merge in trunk.

[thirdparty/gcc.git] / gcc / gimple-pretty-print.c

diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 6842213199af8f1edcdce0176587aaee08b6f130..c95b9c463571d41531354fcc5a1de07603a5ee9d 100644 (file)
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -723,7 +723,7 @@ dump_gimple_call (pretty_printer *buffer, gimple gs, int spc, int flags)
       pp_string (buffer, " [ ");
 
       /* Get the transaction code properties.  */
-      props = TREE_INT_CST_LOW (t);
+      props = tree_to_hwi (t);
 
       if (props & PR_INSTRUMENTEDCODE)
        pp_string (buffer, "instrumentedCode ");
@@ -1737,7 +1737,7 @@ dump_ssaname_info (pretty_printer *buffer, tree node, int spc)
   if (!POINTER_TYPE_P (TREE_TYPE (node))
       && SSA_NAME_RANGE_INFO (node))
     {
-      double_int min, max, nonzero_bits;
+      widest_int min, max, nonzero_bits;
       value_range_type range_type = get_range_info (node, &min, &max);
 
       if (range_type == VR_VARYING)
@@ -1746,22 +1746,18 @@ dump_ssaname_info (pretty_printer *buffer, tree node, int spc)
        {
          pp_printf (buffer, "# RANGE ");
          pp_printf (buffer, "%s[", range_type == VR_RANGE ? "" : "~");
-         pp_double_int (buffer, min, TYPE_UNSIGNED (TREE_TYPE (node)));
+         pp_wide_int (buffer, min, TYPE_SIGN (TREE_TYPE (node)));
          pp_printf (buffer, ", ");
-         pp_double_int (buffer, max, TYPE_UNSIGNED (TREE_TYPE (node)));
+         pp_wide_int (buffer, max, TYPE_SIGN (TREE_TYPE (node)));
          pp_printf (buffer, "]");
        }
       nonzero_bits = get_nonzero_bits (node);
-      if (nonzero_bits != double_int_minus_one
+      if (nonzero_bits != -1
          && (nonzero_bits
-             != double_int::mask (TYPE_PRECISION (TREE_TYPE (node)))))
+             != wi::mask <widest_int> (TYPE_PRECISION (TREE_TYPE (node)), false)))
        {
          pp_string (buffer, " NONZERO ");
-         sprintf (pp_buffer (buffer)->digit_buffer,
-                  HOST_WIDE_INT_PRINT_DOUBLE_HEX,
-                  (unsigned HOST_WIDE_INT) nonzero_bits.high,
-                  nonzero_bits.low);
-         pp_string (buffer, pp_buffer (buffer)->digit_buffer);
+         pp_wide_int (buffer, nonzero_bits, UNSIGNED);
        }
       newline_and_indent (buffer, spc);
     }