git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/40747 (wrong code for int-is-in-range test at -O1 and above) 

PR middle-end/40747
	* fold-const.c (fold_cond_expr_with_comparison): When folding
	< and <= to MIN, make sure the MIN uses the same type as the
	comparison's operands.

	* gcc.c-torture/execute/pr40747.c: New test.

From-SVN: r149675
This commit is contained in:
Jakub Jelinek 2009-07-15 12:17:54 +02:00 committed by Jakub Jelinek
parent 00838d9ae1
commit b4e4232dc5
4 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2009-07-15 Jakub Jelinek <jakub@redhat.com>
PR middle-end/40747
* fold-const.c (fold_cond_expr_with_comparison): When folding
< and <= to MIN, make sure the MIN uses the same type as the
comparison's operands.
2009-07-15 Richard Earnshaw <rearnsha@arm.com> 2009-07-15 Richard Earnshaw <rearnsha@arm.com>
* arm.md (ior_xor): New code iterator. * arm.md (ior_xor): New code iterator.

44
gcc/fold-const.c
View File

@ -5310,31 +5310,35 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2)
return fold_build3 (COND_EXPR, type, arg0, arg1, arg2); return fold_build3 (COND_EXPR, type, arg0, arg1, arg2);
case LT_EXPR: case LT_EXPR:
/* If C1 is C2 + 1, this is min(A, C2). */ /* If C1 is C2 + 1, this is min(A, C2), but use ARG00's type for
MIN_EXPR, to preserve the signedness of the comparison. */
if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type), if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type),
OEP_ONLY_CONST) OEP_ONLY_CONST)
&& operand_equal_p (arg01, && operand_equal_p (arg01,
const_binop (PLUS_EXPR, arg2, const_binop (PLUS_EXPR, arg2,
build_int_cst (type, 1), 0), build_int_cst (type, 1), 0),
OEP_ONLY_CONST)) OEP_ONLY_CONST))
return pedantic_non_lvalue (fold_build2 (MIN_EXPR, {
type, tem = fold_build2 (MIN_EXPR, TREE_TYPE (arg00), arg00,
fold_convert (type, arg1), fold_convert (TREE_TYPE (arg00), arg2));
arg2)); return pedantic_non_lvalue (fold_convert (type, tem));
}
break; break;
case LE_EXPR: case LE_EXPR:
/* If C1 is C2 - 1, this is min(A, C2). */ /* If C1 is C2 - 1, this is min(A, C2), with the same care
as above. */
if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type), if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type),
OEP_ONLY_CONST) OEP_ONLY_CONST)
&& operand_equal_p (arg01, && operand_equal_p (arg01,
const_binop (MINUS_EXPR, arg2, const_binop (MINUS_EXPR, arg2,
build_int_cst (type, 1), 0), build_int_cst (type, 1), 0),
OEP_ONLY_CONST)) OEP_ONLY_CONST))
return pedantic_non_lvalue (fold_build2 (MIN_EXPR, {
type, tem = fold_build2 (MIN_EXPR, TREE_TYPE (arg00), arg00,
fold_convert (type, arg1), fold_convert (TREE_TYPE (arg00), arg2));
arg2)); return pedantic_non_lvalue (fold_convert (type, tem));
}
break; break;
case GT_EXPR: case GT_EXPR:
@ -5346,11 +5350,11 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2)
const_binop (MINUS_EXPR, arg2, const_binop (MINUS_EXPR, arg2,
build_int_cst (type, 1), 0), build_int_cst (type, 1), 0),
OEP_ONLY_CONST)) OEP_ONLY_CONST))
return pedantic_non_lvalue (fold_convert (type, {
fold_build2 (MAX_EXPR, TREE_TYPE (arg00), tem = fold_build2 (MAX_EXPR, TREE_TYPE (arg00), arg00,
arg00, fold_convert (TREE_TYPE (arg00), arg2));
fold_convert (TREE_TYPE (arg00), return pedantic_non_lvalue (fold_convert (type, tem));
arg2)))); }
break; break;
case GE_EXPR: case GE_EXPR:
@ -5361,11 +5365,11 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2)
const_binop (PLUS_EXPR, arg2, const_binop (PLUS_EXPR, arg2,
build_int_cst (type, 1), 0), build_int_cst (type, 1), 0),
OEP_ONLY_CONST)) OEP_ONLY_CONST))
return pedantic_non_lvalue (fold_convert (type, {
fold_build2 (MAX_EXPR, TREE_TYPE (arg00), tem = fold_build2 (MAX_EXPR, TREE_TYPE (arg00), arg00,
arg00, fold_convert (TREE_TYPE (arg00), arg2));
fold_convert (TREE_TYPE (arg00), return pedantic_non_lvalue (fold_convert (type, tem));
arg2)))); }
break; break;
case NE_EXPR: case NE_EXPR:
break; break;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-07-15 Jakub Jelinek <jakub@redhat.com>
PR middle-end/40747
* gcc.c-torture/execute/pr40747.c: New test.
2009-07-15 Richard Guenther <rguenther@suse.de> 2009-07-15 Richard Guenther <rguenther@suse.de>
PR middle-end/40753 PR middle-end/40753

22
gcc/testsuite/gcc.c-torture/execute/pr40747.c Normal file
View File

@ -0,0 +1,22 @@
/* PR middle-end/40747 */
extern void abort (void);
int
foo (int i)
{
return (i < 4 && i >= 0) ? i : 4;
}
int
main ()
{
if (foo (-1) != 4) abort ();
if (foo (0) != 0) abort ();
if (foo (1) != 1) abort ();
if (foo (2) != 2) abort ();
if (foo (3) != 3) abort ();
if (foo (4) != 4) abort ();
if (foo (5) != 4) abort ();
return 0;
}