Merge in trunk.

[thirdparty/gcc.git] / gcc / gimplify.c

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 4df9ed49e96b4815e16ff8a1fa71d66eda7c4577..58cb533ab94cf756022c7915d530978396e3ad6c 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -714,7 +714,7 @@ gimple_add_tmp_var (tree tmp)
   /* Later processing assumes that the object size is constant, which might
      not be true at this point.  Force the use of a constant upper bound in
      this case.  */
-  if (!host_integerp (DECL_SIZE_UNIT (tmp), 1))
+  if (!tree_fits_uhwi_p (DECL_SIZE_UNIT (tmp)))
     force_constant_size (tmp);
 
   DECL_CONTEXT (tmp) = current_function_decl;
@@ -1739,11 +1739,7 @@ preprocess_case_label_vec_for_gimple (vec<tree> labels,
                  low = CASE_HIGH (labels[i - 1]);
                  if (!low)
                    low = CASE_LOW (labels[i - 1]);
-                 if ((TREE_INT_CST_LOW (low) + 1
-                      != TREE_INT_CST_LOW (high))
-                     || (TREE_INT_CST_HIGH (low)
-                         + (TREE_INT_CST_LOW (high) == 0)
-                         != TREE_INT_CST_HIGH (high)))
+                 if (wi::add (low, 1) != high)
                    break;
                }
              if (i == len)
@@ -3089,7 +3085,7 @@ gimple_boolify (tree expr)
       return expr;
 
     case ANNOTATE_EXPR:
-      if ((enum annot_expr_kind) TREE_INT_CST_LOW (TREE_OPERAND (expr, 1))
+      if ((enum annot_expr_kind) tree_to_uhwi (TREE_OPERAND (expr, 1))
          == annot_expr_ivdep_kind)
        {
          TREE_OPERAND (expr, 0) = gimple_boolify (TREE_OPERAND (expr, 0));