Commit 05626b02 by Eric Botcazou Committed by Eric Botcazou

decl.c (annotate_value): Really test the sign of the value when deciding to build a NEGATE_EXPR.

	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Really test the
	sign of the value when deciding to build a NEGATE_EXPR.
	<PLUS_EXPR>: Remove redundant line.
	<BIT_AND_EXPR>: Do the negation here.

From-SVN: r276866
parent 43b60e57
2019-10-11 Eric Botcazou <ebotcazou@adacore.com> 2019-10-11 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Really test the
sign of the value when deciding to build a NEGATE_EXPR.
<PLUS_EXPR>: Remove redundant line.
<BIT_AND_EXPR>: Do the negation here.
2019-10-11 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (Gigi_Equivalent_Type) <E_Array_Subtype>: New * gcc-interface/decl.c (Gigi_Equivalent_Type) <E_Array_Subtype>: New
case. Return the base type if the subtype is not constrained. case. Return the base type if the subtype is not constrained.
......
...@@ -8287,9 +8287,8 @@ annotate_value (tree gnu_size) ...@@ -8287,9 +8287,8 @@ annotate_value (tree gnu_size)
{ {
case INTEGER_CST: case INTEGER_CST:
/* For negative values, build NEGATE_EXPR of the opposite. Such values /* For negative values, build NEGATE_EXPR of the opposite. Such values
can appear for discriminants in expressions for variants. Note that, can appear for discriminants in expressions for variants. */
sizetype being unsigned, we don't directly use tree_int_cst_sgn. */ if (tree_int_cst_sgn (gnu_size) < 0)
if (tree_int_cst_sign_bit (gnu_size))
{ {
tree t = wide_int_to_tree (sizetype, -wi::to_wide (gnu_size)); tree t = wide_int_to_tree (sizetype, -wi::to_wide (gnu_size));
tcode = Negate_Expr; tcode = Negate_Expr;
...@@ -8367,9 +8366,8 @@ annotate_value (tree gnu_size) ...@@ -8367,9 +8366,8 @@ annotate_value (tree gnu_size)
&& tree_int_cst_sign_bit (TREE_OPERAND (gnu_size, 1))) && tree_int_cst_sign_bit (TREE_OPERAND (gnu_size, 1)))
{ {
tcode = Minus_Expr; tcode = Minus_Expr;
ops[0] = annotate_value (TREE_OPERAND (gnu_size, 0)); wide_int wop1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1));
wide_int op1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1)); ops[1] = annotate_value (wide_int_to_tree (sizetype, wop1));
ops[1] = annotate_value (wide_int_to_tree (sizetype, op1));
break; break;
} }
...@@ -8410,9 +8408,9 @@ annotate_value (tree gnu_size) ...@@ -8410,9 +8408,9 @@ annotate_value (tree gnu_size)
Such values can appear in expressions with aligning patterns. */ Such values can appear in expressions with aligning patterns. */
if (TREE_CODE (TREE_OPERAND (gnu_size, 1)) == INTEGER_CST) if (TREE_CODE (TREE_OPERAND (gnu_size, 1)) == INTEGER_CST)
{ {
wide_int op1 = wi::sext (wi::to_wide (TREE_OPERAND (gnu_size, 1)), wide_int wop1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1));
TYPE_PRECISION (sizetype)); tree op1 = wide_int_to_tree (sizetype, wop1);
ops[1] = annotate_value (wide_int_to_tree (sizetype, op1)); ops[1] = annotate_value (build1 (NEGATE_EXPR, sizetype, op1));
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment