OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/82274 (__builtin_mul_overflow fails to detect overflow for int64_t when compiled with -m32)

Browse Source 
PR target/82274
	* internal-fn.c (expand_mul_overflow): If both operands have
	the same highpart of -1 or 0 and the topmost bit of lowpart
	is different, overflow is if res <= 0 rather than res < 0.

	* libgcc2.c (__mulvDI3): If both operands have
	the same highpart of -1 and the topmost bit of lowpart is 0,
	multiplication overflows even if both lowparts are 0.

	* gcc.dg/pr82274-1.c: New test.
	* gcc.dg/pr82274-2.c: New test.

From-SVN: r253735
This commit is contained in:
Jakub Jelinek 2017-10-13 19:26:28 +02:00 committed by Jakub Jelinek
parent f35018157d
commit 7aaf7ebd9b
7 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,5 +1,10 @@
2017-10-13 Jakub Jelinek <jakub@redhat.com>
PR target/82274
* internal-fn.c (expand_mul_overflow): If both operands have
the same highpart of -1 or 0 and the topmost bit of lowpart
is different, overflow is if res <= 0 rather than res < 0.
PR target/82524
* config/i386/i386.md (addqi_ext_1, andqi_ext_1,
*andqi_ext_1_cc, *<code>qi_ext_1, *xorqi_ext_1_cc): Change

6
gcc/internal-fn.c
View File

@ -1754,8 +1754,8 @@ expand_mul_overflow (location_t loc, tree lhs, tree arg0, tree arg1,
}
/* At this point hipart{0,1} are both in [-1, 0]. If they are
the same, overflow happened if res is negative, if they are
different, overflow happened if res is positive. */
the same, overflow happened if res is non-positive, if they
are different, overflow happened if res is positive. */
if (op0_sign != 1 && op1_sign != 1 && op0_sign != op1_sign)
emit_jump (hipart_different);
else if (op0_sign == 1 || op1_sign == 1)
@ -1763,7 +1763,7 @@ expand_mul_overflow (location_t loc, tree lhs, tree arg0, tree arg1,
NULL_RTX, NULL, hipart_different,
PROB_EVEN);
do_compare_rtx_and_jump (res, const0_rtx, LT, false, mode,
do_compare_rtx_and_jump (res, const0_rtx, LE, false, mode,
NULL_RTX, NULL, do_error,
PROB_VERY_UNLIKELY);
emit_jump (done_label);

4
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,9 @@
2017-10-13 Jakub Jelinek <jakub@redhat.com>
PR target/82274
* gcc.dg/pr82274-1.c: New test.
* gcc.dg/pr82274-2.c: New test.
PR target/82524
* gcc.c-torture/execute/pr82524.c: New test.

16
gcc/testsuite/gcc.dg/pr82274-1.c Normal file
View File

@ -0,0 +1,16 @@
/* PR target/82274 */
/* { dg-do run } */
/* { dg-shouldfail "trapv" } */
/* { dg-options "-ftrapv" } */
int
main ()
{
#ifdef __SIZEOF_INT128__
volatile __int128 m = -(((__int128) 1) << (__CHAR_BIT__ * __SIZEOF_INT128__ / 2));
#else
volatile long long m = -(1LL << (__CHAR_BIT__ * __SIZEOF_LONG_LONG__ / 2));
#endif
m = m * m;
return 0;
}

26
gcc/testsuite/gcc.dg/pr82274-2.c Normal file
View File

@ -0,0 +1,26 @@
/* PR target/82274 */
/* { dg-do run } */
/* { dg-options "-O2" } */
int
main ()
{
#ifdef __SIZEOF_INT128__
__int128 m = -(((__int128) 1) << (__CHAR_BIT__ * __SIZEOF_INT128__ / 2));
volatile __int128 mv = m;
__int128 r;
#else
long long m = -(1LL << (__CHAR_BIT__ * __SIZEOF_LONG_LONG__ / 2));
volatile long long mv = m;
long long r;
#endif
if (!__builtin_mul_overflow (mv, mv, &r))
__builtin_abort ();
if (!__builtin_mul_overflow_p (mv, mv, r))
__builtin_abort ();
if (!__builtin_mul_overflow (m, m, &r))
__builtin_abort ();
if (!__builtin_mul_overflow_p (m, m, r))
__builtin_abort ();
return 0;
}

7
libgcc/ChangeLog
View File

@ -1,3 +1,10 @@
2017-10-13 Jakub Jelinek <jakub@redhat.com>
PR target/82274
* libgcc2.c (__mulvDI3): If both operands have
the same highpart of -1 and the topmost bit of lowpart is 0,
multiplication overflows even if both lowparts are 0.
2017-09-28 Krister Walfridsson <krister.walfridsson@gmail.com>
Backport from mainline

3
libgcc/libgcc2.c
View File

@ -375,7 +375,8 @@ __mulvDI3 (DWtype u, DWtype v)
}
else
{
if (uu.s.high == (Wtype) -1 && vv.s.high == (Wtype) - 1)
if ((uu.s.high & vv.s.high) == (Wtype) -1
&& (uu.s.low | vv.s.low) != 0)
{
DWunion ww = {.ll = (UDWtype) (UWtype) uu.s.low
* (UDWtype) (UWtype) vv.s.low};