diff options
| -rw-r--r-- | gcc/expr.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr95694.c | 23 |
2 files changed, 31 insertions, 7 deletions
@@ -11525,26 +11525,27 @@ expand_expr_real_1 (tree exp, rtx target, machine_mode tmode, static rtx reduce_to_bit_field_precision (rtx exp, rtx target, tree type) { + scalar_int_mode mode = SCALAR_INT_TYPE_MODE (type); HOST_WIDE_INT prec = TYPE_PRECISION (type); - if (target && GET_MODE (target) != GET_MODE (exp)) + gcc_assert (GET_MODE (exp) == VOIDmode || GET_MODE (exp) == mode); + if (target && GET_MODE (target) != mode) target = 0; - /* For constant values, reduce using build_int_cst_type. */ - poly_int64 const_exp; - if (poly_int_rtx_p (exp, &const_exp)) + + /* For constant values, reduce using wide_int_to_tree. */ + if (poly_int_rtx_p (exp)) { - tree t = build_int_cst_type (type, const_exp); + auto value = wi::to_poly_wide (exp, mode); + tree t = wide_int_to_tree (type, value); return expand_expr (t, target, VOIDmode, EXPAND_NORMAL); } else if (TYPE_UNSIGNED (type)) { - scalar_int_mode mode = as_a <scalar_int_mode> (GET_MODE (exp)); rtx mask = immed_wide_int_const (wi::mask (prec, false, GET_MODE_PRECISION (mode)), mode); return expand_and (mode, exp, mask, target); } else { - scalar_int_mode mode = as_a <scalar_int_mode> (GET_MODE (exp)); int count = GET_MODE_PRECISION (mode) - prec; exp = expand_shift (LSHIFT_EXPR, mode, exp, count, target, 0); return expand_shift (RSHIFT_EXPR, mode, exp, count, target, 0); diff --git a/gcc/testsuite/gcc.dg/pr95694.c b/gcc/testsuite/gcc.dg/pr95694.c new file mode 100644 index 0000000..6f5e190 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr95694.c @@ -0,0 +1,23 @@ +/* PR tree-optimization/68835 */ +/* { dg-do run { target int128 } } */ +/* { dg-options "-fno-tree-forwprop -fno-tree-ccp -O1 -fno-tree-dominator-opts -fno-tree-fre" } */ + +__attribute__((noinline, noclone)) unsigned __int128 +foo (void) +{ + unsigned __int128 x = (unsigned __int128) 0xffffffffffffffffULL; + struct { unsigned __int128 a : 65; } w; + w.a = x; + w.a += x; + return w.a; +} + +int +main () +{ + unsigned __int128 x = foo (); + if ((unsigned long long) x != 0xfffffffffffffffeULL + || (unsigned long long) (x >> 64) != 1) + __builtin_abort (); + return 0; +} |