diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-04-13 21:52:58 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-04-13 21:52:58 +0200 |
| commit | 099560172fc6d46fcd7878043acab799d4fb044f (patch) | |
| tree | 1df8de837fda91f9d1aeedcb2cca29b6d8d39d26 | |
| parent | bc0423960365b4fc8caebdd5047ea4f993df6e9a (diff) | |
| download | gcc-099560172fc6d46fcd7878043acab799d4fb044f.zip gcc-099560172fc6d46fcd7878043acab799d4fb044f.tar.gz gcc-099560172fc6d46fcd7878043acab799d4fb044f.tar.bz2 | |
re PR sanitizer/80403 (UBSAN: compile time crash with "type mismatch in binary expression" message in / and % expr)
PR sanitizer/80403
* fold-const.c (fold_ternary_loc): Revert
use op0 instead of fold_convert_loc (loc, type, arg0) part of
2017-04-12 change.
* g++.dg/ubsan/pr80403-2.C: New test.
From-SVN: r246917
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fold-const.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ubsan/pr80403-2.C | 14 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ca93f9b..33b094e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-04-13 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/80403 + * fold-const.c (fold_ternary_loc): Revert + use op0 instead of fold_convert_loc (loc, type, arg0) part of + 2017-04-12 change. + 2017-04-13 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/80343 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index fb0b1a6..7701622 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -11544,7 +11544,7 @@ fold_ternary_loc (location_t loc, enum tree_code code, tree type, && (code == VEC_COND_EXPR || !VECTOR_TYPE_P (type))) return fold_build2_loc (loc, code == VEC_COND_EXPR ? BIT_AND_EXPR : TRUTH_ANDIF_EXPR, - type, op0, op1); + type, fold_convert_loc (loc, type, arg0), op1); /* Convert A ? B : 1 into !A || B if A and B are truth values. */ if (code == VEC_COND_EXPR ? integer_all_onesp (op2) : integer_onep (op2) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4f46db8..07902c1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-13 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/80403 + * g++.dg/ubsan/pr80403-2.C: New test. + 2017-04-13 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/80343 diff --git a/gcc/testsuite/g++.dg/ubsan/pr80403-2.C b/gcc/testsuite/g++.dg/ubsan/pr80403-2.C new file mode 100644 index 0000000..434a883 --- /dev/null +++ b/gcc/testsuite/g++.dg/ubsan/pr80403-2.C @@ -0,0 +1,14 @@ +// PR sanitizer/80403 +// { dg-do compile } +// { dg-options "-fsanitize=undefined" } + +extern const long long int v; +extern unsigned long int w; + +int +foo () +{ + int a = (0 - 40U <= (0 == 8)) << !w << (0 < v) == 0; + int b = ((0 ^ 0) < (long) (1066066618772207110 <= 0)) / 0 << 0; // { dg-warning "division by zero" } + return a + b; +} |