From: H.J. Lu Date: Tue, 7 Oct 2008 18:50:46 +0000 (+0000) Subject: backport: re PR middle-end/37731 (long long may not work correctly on 32bit host) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0926e6faae05346554d5176405aa5d6bdf1dc68d;p=thirdparty%2Fgcc.git backport: re PR middle-end/37731 (long long may not work correctly on 32bit host) gcc/ 2008-10-07 H.J. Lu Backport from mainline: 2008-10-07 H.J. Lu PR middle-end/37731 * expmed.c (expand_mult): Properly check DImode constant in CONST_DOUBLE. gcc/testsuite/ 2008-10-07 H.J. Lu Backport from mainline: 2008-10-07 H.J. Lu PR middle-end/37731 * gcc.dg/torture/pr37731-1.c: New. * gcc.dg/torture/pr37731-2.c: Likewise. From-SVN: r140950 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7957e493d626..e14d0e34ee4e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2008-10-07 H.J. Lu + + Backport from mainline: + 2008-10-07 H.J. Lu + + PR middle-end/37731 + * expmed.c (expand_mult): Properly check DImode constant in + CONST_DOUBLE. + 2008-09-28 Eric Botcazou PR middle-end/36575 diff --git a/gcc/expmed.c b/gcc/expmed.c index d392197d8e94..8de9e4d208bb 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -3163,7 +3163,8 @@ expand_mult (enum machine_mode mode, rtx op0, rtx op1, rtx target, { /* If we are multiplying in DImode, it may still be a win to try to work with shifts and adds. */ - if (CONST_DOUBLE_HIGH (op1) == 0) + if (CONST_DOUBLE_HIGH (op1) == 0 + && CONST_DOUBLE_LOW (op1) > 0) coeff = CONST_DOUBLE_LOW (op1); else if (CONST_DOUBLE_LOW (op1) == 0 && EXACT_POWER_OF_2_OR_ZERO_P (CONST_DOUBLE_HIGH (op1))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8f400bc47acb..360c91a9aebb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2008-10-07 H.J. Lu + + Backport from mainline: + 2008-10-07 H.J. Lu + + PR middle-end/37731 + * expmed.c (expand_mult): Properly check DImode constant in + CONST_DOUBLE. + 2008-09-28 Eric Botcazou * gnat.dg/conv_decimal.adb: New test. diff --git a/gcc/testsuite/gcc.dg/torture/pr37731-1.c b/gcc/testsuite/gcc.dg/torture/pr37731-1.c new file mode 100644 index 000000000000..5c156b1f9a62 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr37731-1.c @@ -0,0 +1,17 @@ +/* { dg-do run } */ + +extern void abort (); + +unsigned long long xh = 1; + +int +main () +{ + unsigned long long yh = 0xffffffffull; + unsigned long long z = xh * yh; + + if (z != yh) + abort (); + + return 0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr37731-2.c b/gcc/testsuite/gcc.dg/torture/pr37731-2.c new file mode 100644 index 000000000000..a7f8f1e02e5a --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr37731-2.c @@ -0,0 +1,17 @@ +/* { dg-do run } */ + +extern void abort (); + +long long xh = 1; + +int +main () +{ + long long yh = 0xffffffffll; + long long z = xh * yh; + + if (z != yh) + abort (); + + return 0; +}