diff options
| author | Richard Biener <rguenther@suse.de> | 2015-10-29 08:21:50 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2015-10-29 08:21:50 +0000 |
| commit | fcbb6b483667d4c3f7bf77fca5683c688e7b3c92 (patch) | |
| tree | 988682d93098dc6128f90e4efb0513170f1f9a2e /gcc | |
| parent | 384aedfcf16640be3b3250743304207f63d4cde9 (diff) | |
| download | gcc-fcbb6b483667d4c3f7bf77fca5683c688e7b3c92.zip gcc-fcbb6b483667d4c3f7bf77fca5683c688e7b3c92.tar.gz gcc-fcbb6b483667d4c3f7bf77fca5683c688e7b3c92.tar.bz2 | |
re PR middle-end/56956 (ftrapv traps on valid abs-like code)
2015-10-29 Richard Biener <rguenther@suse.de>
PR middle-end/56956
* fold-const.c (fold_cond_expr_with_comparison): Do not fold
unsigned conditonal negation to ABS_EXPR.
* c-c++-common/ubsan/pr56956.c: New testcase.
From-SVN: r229517
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fold-const.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/ubsan/pr56956.c | 15 |
4 files changed, 28 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9dfd434..72d61ad 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2015-10-29 Richard Biener <rguenther@suse.de> + PR middle-end/56956 + * fold-const.c (fold_cond_expr_with_comparison): Do not fold + unsigned conditonal negation to ABS_EXPR. + +2015-10-29 Richard Biener <rguenther@suse.de> + * gimple-match-head.c (gimple_simplify): Remove premature checking of builtin_decl_implicit of function calls we simplify. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 71d72f1..d88bffc 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -4963,8 +4963,7 @@ fold_cond_expr_with_comparison (location_t loc, tree type, case GE_EXPR: case GT_EXPR: if (TYPE_UNSIGNED (TREE_TYPE (arg1))) - arg1 = fold_convert_loc (loc, signed_type_for - (TREE_TYPE (arg1)), arg1); + break; tem = fold_build1_loc (loc, ABS_EXPR, TREE_TYPE (arg1), arg1); return pedantic_non_lvalue_loc (loc, fold_convert_loc (loc, type, tem)); case UNLE_EXPR: @@ -4974,8 +4973,7 @@ fold_cond_expr_with_comparison (location_t loc, tree type, case LE_EXPR: case LT_EXPR: if (TYPE_UNSIGNED (TREE_TYPE (arg1))) - arg1 = fold_convert_loc (loc, signed_type_for - (TREE_TYPE (arg1)), arg1); + break; tem = fold_build1_loc (loc, ABS_EXPR, TREE_TYPE (arg1), arg1); return negate_expr (fold_convert_loc (loc, type, tem)); default: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 43f6007..8c3f4ad 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-29 Richard Biener <rguenther@suse.de> + + PR middle-end/56956 + * c-c++-common/ubsan/pr56956.c: New testcase. + 2015-10-28 Eric Botcazou <ebotcazou@adacore.com> * gnat.dg/discr44.adb: New test. diff --git a/gcc/testsuite/c-c++-common/ubsan/pr56956.c b/gcc/testsuite/c-c++-common/ubsan/pr56956.c new file mode 100644 index 0000000..996e1dd --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/pr56956.c @@ -0,0 +1,15 @@ +/* { dg-do run } */ +/* { dg-options "-fsanitize=undefined -fsanitize-undefined-trap-on-error" } */ + +unsigned int __attribute__((noinline,noclone)) +foo (unsigned int x) +{ + return x <= __INT_MAX__ ? x : -x; +} + +int +main () +{ + volatile unsigned int tem = foo (-__INT_MAX__ - 1); + return 0; +} |