From f0035dca698e5e09dea846ec2d3f77aec0056274 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 13 May 2014 21:17:07 +0000 Subject: * gcc-interface/decl.c (annotate_value): Fix thinko in latest change. From-SVN: r210403 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/gcc-interface/decl.c | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'gcc') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 57c5176..7167f97 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2014-05-13 Eric Botcazou + + * gcc-interface/decl.c (annotate_value): Fix thinko in latest change. + 2014-05-06 Kenneth Zadeck Mike Stump Richard Sandiford diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 6d0b8b2..43ed0b3 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -7515,15 +7515,16 @@ annotate_value (tree gnu_size) case BIT_AND_EXPR: tcode = Bit_And_Expr; - /* For negative values, build NEGATE_EXPR of the opposite. Such values - appear in expressions containing aligning patterns. Note that, since - sizetype is unsigned, we have to jump through some hoops. */ + /* For negative values in sizetype, build NEGATE_EXPR of the opposite. + Such values appear in expressions with aligning patterns. Note that, + since sizetype is unsigned, we have to jump through some hoops. */ if (TREE_CODE (TREE_OPERAND (gnu_size, 1)) == INTEGER_CST) { tree op1 = TREE_OPERAND (gnu_size, 1); - if (wi::neg_p (op1)) + wide_int signed_op1 = wi::sext (op1, TYPE_PRECISION (sizetype)); + if (wi::neg_p (signed_op1)) { - op1 = wide_int_to_tree (sizetype, wi::neg (op1)); + op1 = wide_int_to_tree (sizetype, wi::neg (signed_op1)); pre_op1 = annotate_value (build1 (NEGATE_EXPR, sizetype, op1)); } } -- cgit v1.1