diff options
| author | Marek Polacek <polacek@redhat.com> | 2017-06-07 11:19:40 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2017-06-07 11:19:40 +0000 |
| commit | 0874a778ec0adf43167dd4aa014dadb75b0907f8 (patch) | |
| tree | e331107548064bd858fc2e2c59ff591607aa438a | |
| parent | 55e872a462ca506350140451ad4a170d6baa462b (diff) | |
| download | gcc-0874a778ec0adf43167dd4aa014dadb75b0907f8.zip gcc-0874a778ec0adf43167dd4aa014dadb75b0907f8.tar.gz gcc-0874a778ec0adf43167dd4aa014dadb75b0907f8.tar.bz2 | |
re PR sanitizer/80932 (UBSAN: false positive as a result of distribution: c1*(c2*v1-c3*v2)=>c1*c2*v1-c1*c3*v2)
PR sanitizer/80932
* fold-const.c (extract_muldiv_1) <case MINUS_EXPR>: Add
TYPE_OVERFLOW_WRAPS check.
* c-c++-common/ubsan/pr80932.c: New test.
From-SVN: r248961
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fold-const.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/ubsan/pr80932.c | 17 |
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8198e0c..fa94c6f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-06-07 Marek Polacek <polacek@redhat.com> + + PR sanitizer/80932 + * fold-const.c (extract_muldiv_1) <case MINUS_EXPR>: Add + TYPE_OVERFLOW_WRAPS check. + 2017-06-07 Bin Cheng <bin.cheng@arm.com> * tree-vect-loop-manip.c (vect_do_peeling): Don't skip vector loop diff --git a/gcc/fold-const.c b/gcc/fold-const.c index b0d03c9..f3975c7 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -6178,6 +6178,7 @@ extract_muldiv_1 (tree t, tree c, enum tree_code code, tree wide_type, t1 = extract_muldiv (op0, c, code, wide_type, &sub_strict_overflow_p); t2 = extract_muldiv (op1, c, code, wide_type, &sub_strict_overflow_p); if (t1 != 0 && t2 != 0 + && TYPE_OVERFLOW_WRAPS (ctype) && (code == MULT_EXPR /* If not multiplication, we can only do this if both operands are divisible by c. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 38b22ee..990e10a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-06-07 Marek Polacek <polacek@redhat.com> + + PR sanitizer/80932 + * c-c++-common/ubsan/pr80932.c: New test. + 2017-06-07 Bin Cheng <bin.cheng@arm.com> * gcc.target/i386/l_fma_double_1.c: Adjust test strings. diff --git a/gcc/testsuite/c-c++-common/ubsan/pr80932.c b/gcc/testsuite/c-c++-common/ubsan/pr80932.c new file mode 100644 index 0000000..a833712 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/pr80932.c @@ -0,0 +1,17 @@ +/* PR sanitizer/80932 */ +/* { dg-do run } */ +/* { dg-options "-fsanitize=undefined -fsanitize-undefined-trap-on-error" } */ + +int x = 1; + +long int +foo (void) +{ + return ((long) (13801962912760474560ULL * x) - (long) (15334142073106273231ULL * x)) * -6; +} + +int +main () +{ + foo (); +} |