re PR middle-end/40057 (Incorrect right shift by 31 with long long)

PR middle-end/40057
	* dojump.c (prefer_and_bit_test): Use immed_double_const instead of
	GEN_INT for 1 << bitnum.
	(do_jump) <case BIT_AND_EXPR>: Use build_int_cst_wide_type instead of
	build_int_cst_type.

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

From-SVN: r147241
This commit is contained in:
Jakub Jelinek 2009-05-07 17:27:40 +02:00 committed by Jakub Jelinek
parent 262118b947
commit 472e0df9f0
4 changed files with 55 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2009-05-07 Jakub Jelinek <jakub@redhat.com>
PR middle-end/40057
* dojump.c (prefer_and_bit_test): Use immed_double_const instead of
GEN_INT for 1 << bitnum.
(do_jump) <case BIT_AND_EXPR>: Use build_int_cst_wide_type instead of
build_int_cst_type.
2009-05-07 Uros Bizjak <ubizjak@gmail.com>
* doc/md.texi (Standard Pattern Names For Generation) [sync_nand]:

View File

@ -141,7 +141,8 @@ prefer_and_bit_test (enum machine_mode mode, int bitnum)
}
/* Fill in the integers. */
XEXP (and_test, 1) = GEN_INT ((unsigned HOST_WIDE_INT) 1 << bitnum);
XEXP (and_test, 1)
= immed_double_const ((unsigned HOST_WIDE_INT) 1 << bitnum, 0, mode);
XEXP (XEXP (shift_test, 0), 1) = GEN_INT (bitnum);
return (rtx_cost (and_test, IF_THEN_ELSE, optimize_insn_for_speed_p ())
@ -474,10 +475,10 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label)
&& prefer_and_bit_test (TYPE_MODE (argtype),
TREE_INT_CST_LOW (shift)))
{
HOST_WIDE_INT mask = (HOST_WIDE_INT) 1
<< TREE_INT_CST_LOW (shift);
unsigned HOST_WIDE_INT mask
= (unsigned HOST_WIDE_INT) 1 << TREE_INT_CST_LOW (shift);
do_jump (build2 (BIT_AND_EXPR, argtype, arg,
build_int_cst_type (argtype, mask)),
build_int_cst_wide_type (argtype, mask, 0)),
clr_label, set_label);
break;
}

View File

@ -1,3 +1,8 @@
2009-05-07 Jakub Jelinek <jakub@redhat.com>
PR middle-end/40057
* gcc.c-torture/execute/pr40057.c: New test.
2009-05-06 James E. Wilson <wilson@codesourcery.com>
* gcc.c-torture/compile/const-high-part.c: New test.

View File

@ -0,0 +1,37 @@
/* PR middle-end/40057 */
extern void abort (void);
__attribute__((noinline)) int
foo (unsigned long long x)
{
unsigned long long y = (x >> 31ULL) & 1ULL;
if (y == 0ULL)
return 0;
return -1;
}
__attribute__((noinline)) int
bar (long long x)
{
long long y = (x >> 31LL) & 1LL;
if (y == 0LL)
return 0;
return -1;
}
int
main (void)
{
if (sizeof (long long) != 8)
return 0;
if (foo (0x1682a9aaaULL))
abort ();
if (!foo (0x1882a9aaaULL))
abort ();
if (bar (0x1682a9aaaLL))
abort ();
if (!bar (0x1882a9aaaLL))
abort ();
return 0;
}