===================================================================
@@ -2447,15 +2447,17 @@ gnat_to_gnu_entity (Entity_Id gnat_entit
gnu_orig_max,
gnu_orig_min),
gnu_min,
- size_binop (PLUS_EXPR, gnu_max,
- size_one_node));
+ int_const_binop (PLUS_EXPR, gnu_max,
+ size_one_node));
}
/* Finally we use (hb >= lb) ? hb : lb - 1 for the upper bound
in all the other cases. Note that, here as well as above,
the condition used in the comparison must be equivalent to
the condition (length != 0). This is relied upon in order
- to optimize array comparisons in compare_arrays. */
+ to optimize array comparisons in compare_arrays. Moreover
+ we use int_const_binop for the shift by 1 if the bound is
+ constant to avoid any unwanted overflow. */
else
gnu_high
= build_cond_expr (sizetype,
@@ -2464,8 +2466,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entit
gnu_orig_max,
gnu_orig_min),
gnu_max,
- size_binop (MINUS_EXPR, gnu_min,
- size_one_node));
+ TREE_CODE (gnu_min) == INTEGER_CST
+ ? int_const_binop (MINUS_EXPR, gnu_min,
+ size_one_node)
+ : size_binop (MINUS_EXPR, gnu_min,
+ size_one_node));
/* Reuse the index type for the range type. Then make an index
type with the size range in sizetype. */