Skip to content

R
riscv-gcc-1
Commit 17651386 by Richard Stallman
Options

(build_binary_op): When checking shift widths, don't assume target integer 

fits in a HOST_WIDE_INT.

From-SVN: r2106
parent 2d724389
Showing with 28 additions and 17 deletions
gcc/c-typeck.c
...@@ -2347,12 +2347,17 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) ...@@ -2347,12 +2347,17 @@ build_binary_op (code, orig_op0, orig_op1, convert_p)
{ {
if (TREE_CODE (op1) == INTEGER_CST) if (TREE_CODE (op1) == INTEGER_CST)
{ {
if (TREE_INT_CST_LOW (op1) > 0) if (tree_int_cst_lt (op1, integer_zero_node))
short_shift = 1;
else if (TREE_INT_CST_LOW (op1) < 0)
warning ("shift count is negative"); warning ("shift count is negative");
if (TREE_INT_CST_LOW (op1) >= TYPE_PRECISION (type0)) else
warning ("shift count >= width of type"); {
if (TREE_INT_CST_LOW (op1) | TREE_INT_CST_HIGH (op1))
short_shift = 1;
if (TREE_INT_CST_HIGH (op1) != 0
|| ((unsigned HOST_WIDE_INT) TREE_INT_CST_LOW (op1)
>= TYPE_PRECISION (type0)))
warning ("shift count >= width of type");
}
} }
/* Use the type of the value to be shifted. /* Use the type of the value to be shifted.
This is what most traditional C compilers do. */ This is what most traditional C compilers do. */
...@@ -2372,12 +2377,15 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) ...@@ -2372,12 +2377,15 @@ build_binary_op (code, orig_op0, orig_op1, convert_p)
case LSHIFT_EXPR: case LSHIFT_EXPR:
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE) if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
{ {
if (TREE_CODE (op1) == INTEGER_CST if (TREE_CODE (op1) == INTEGER_CST)
&& TREE_INT_CST_LOW (op1) < 0) {
warning ("shift count is negative"); if (tree_int_cst_lt (op1, integer_zero_node))
if (TREE_CODE (op1) == INTEGER_CST warning ("shift count is negative");
&& TREE_INT_CST_LOW (op1) >= TYPE_PRECISION (type0)) else if (TREE_INT_CST_HIGH (op1) != 0
warning ("shift count >= width of type"); || ((unsigned HOST_WIDE_INT) TREE_INT_CST_LOW (op1)
>= TYPE_PRECISION (type0)))
warning ("shift count >= width of type");
}
/* Use the type of the value to be shifted. /* Use the type of the value to be shifted.
This is what most traditional C compilers do. */ This is what most traditional C compilers do. */
result_type = type0; result_type = type0;
...@@ -2397,12 +2405,15 @@ build_binary_op (code, orig_op0, orig_op1, convert_p) ...@@ -2397,12 +2405,15 @@ build_binary_op (code, orig_op0, orig_op1, convert_p)
case LROTATE_EXPR: case LROTATE_EXPR:
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE) if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
{ {
if (TREE_CODE (op1) == INTEGER_CST if (TREE_CODE (op1) == INTEGER_CST)
&& TREE_INT_CST_LOW (op1) < 0) {
warning ("shift count is negative"); if (tree_int_cst_lt (op1, integer_zero_node))
if (TREE_CODE (op1) == INTEGER_CST warning ("shift count is negative");
&& TREE_INT_CST_LOW (op1) >= TYPE_PRECISION (type0)) else if (TREE_INT_CST_HIGH (op1) != 0
warning ("shift count >= width of type"); || ((unsigned HOST_WIDE_INT) TREE_INT_CST_LOW (op1)
>= TYPE_PRECISION (type0)))
warning ("shift count >= width of type");
}
/* Use the type of the value to be shifted. /* Use the type of the value to be shifted.
This is what most traditional C compilers do. */ This is what most traditional C compilers do. */
result_type = type0; result_type = type0;
......
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