From 185ab3b677bf383dc804bc52bc58f24e67a16825 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 25 Jun 2008 11:13:44 +0000 Subject: [PATCH] tree-ssa-structalias.c (fieldoff_compare): Make sure to not overflow the result type. 2008-06-25 Richard Guenther * tree-ssa-structalias.c (fieldoff_compare): Make sure to not overflow the result type. * gcc.c-torture/compile/20080625-1.c: New testcase. From-SVN: r137104 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.c-torture/compile/20080625-1.c | 16 ++++++++++++++++ gcc/tree-ssa-structalias.c | 14 ++++++++++---- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/20080625-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c22cbe71804..2516b26bdef 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-06-25 Richard Guenther + + * tree-ssa-structalias.c (fieldoff_compare): Make sure to + not overflow the result type. + 2008-06-25 Richard Guenther * tree-vn.c (vn_add): Handle TRUTH_*_EXPR. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 20c6345f6d1..6bcc8e70ead 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-06-25 Richard Guenther + + * gcc.c-torture/compile/20080625-1.c: New testcase. + 2008-06-25 Richard Guenther * g++.dg/torture/20080625-1.C: New testcase. diff --git a/gcc/testsuite/gcc.c-torture/compile/20080625-1.c b/gcc/testsuite/gcc.c-torture/compile/20080625-1.c new file mode 100644 index 00000000000..f0900fd9693 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20080625-1.c @@ -0,0 +1,16 @@ +struct peakbufStruct { + unsigned int lnum [5000]; + int lscan [5000][4000]; + double lmz [5000][4000]; + double lint [5000][4000]; + int PeaksInBuf; + unsigned char freelists [350000]; + unsigned char freelistl [5000]; + unsigned int LastFreeL; +} peakbuf; +void foo(int); +void findmzROI(int i, int *p_scan) +{ + foo(peakbuf.PeaksInBuf); + __builtin_memmove(p_scan, peakbuf.lscan[i], peakbuf.lnum[i]*sizeof(int)); +} diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 338e190d4c8..052903da76b 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -3999,14 +3999,20 @@ fieldoff_compare (const void *pa, const void *pb) { const fieldoff_s *foa = (const fieldoff_s *)pa; const fieldoff_s *fob = (const fieldoff_s *)pb; - HOST_WIDE_INT foasize, fobsize; + unsigned HOST_WIDE_INT foasize, fobsize; - if (foa->offset != fob->offset) - return foa->offset - fob->offset; + if (foa->offset < fob->offset) + return -1; + else if (foa->offset > fob->offset) + return 1; foasize = TREE_INT_CST_LOW (foa->size); fobsize = TREE_INT_CST_LOW (fob->size); - return foasize - fobsize; + if (foasize < fobsize) + return - 1; + else if (foasize > fobsize) + return 1; + return 0; } /* Sort a fieldstack according to the field offset and sizes. */ -- 2.30.2