diff options
| author | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-25 09:50:29 +0000 |
|---|---|---|
| committer | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-25 09:50:29 +0000 |
| commit | ac13b2b22368acfe40e05fe807d70f7dd6a5091f (patch) | |
| tree | bce2a9d14d5ecf32f4056017dc04cade4e2301c4 | |
| parent | 07d9b77b53e8a2b1237871fe253659cd81ca23a4 (diff) | |
| download | gcc-ac13b2b22368acfe40e05fe807d70f7dd6a5091f.tar.gz | |
PR sanitizer/64906
* c-ubsan.c (ubsan_instrument_division): Also pre-evaluate OP1.
* c-c++-common/ubsan/pr64906.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228112 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-ubsan.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/ubsan/pr64906.c | 12 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index e409150ba61..b9feff6e55c 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2015-09-25 Marek Polacek <polacek@redhat.com> + + PR sanitizer/64906 + * c-ubsan.c (ubsan_instrument_division): Also pre-evaluate OP1. + 2015-09-24 Patrick Palka <ppalka@gcc.gnu.org> * c-indentation.c (should_warn_for_misleading_indentation): diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c index e0cce8467e4..d2bc264f632 100644 --- a/gcc/c-family/c-ubsan.c +++ b/gcc/c-family/c-ubsan.c @@ -104,6 +104,7 @@ ubsan_instrument_division (location_t loc, tree op0, tree op1) } } t = fold_build2 (COMPOUND_EXPR, TREE_TYPE (t), unshare_expr (op0), t); + t = fold_build2 (COMPOUND_EXPR, TREE_TYPE (t), unshare_expr (op1), t); if (flag_sanitize_undefined_trap_on_error) tt = build_call_expr_loc (loc, builtin_decl_explicit (BUILT_IN_TRAP), 0); else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 193eb8e99b4..cfa23c659b8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-25 Marek Polacek <polacek@redhat.com> + + PR sanitizer/64906 + * c-c++-common/ubsan/pr64906.c: New test. + 2015-09-24 H.J. Lu <hongjiu.lu@intel.com> * gcc.target/i386/pr66749.c (dg-options): Replace -mtune=iamcu diff --git a/gcc/testsuite/c-c++-common/ubsan/pr64906.c b/gcc/testsuite/c-c++-common/ubsan/pr64906.c new file mode 100644 index 00000000000..e0ac0eefd5e --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/pr64906.c @@ -0,0 +1,12 @@ +/* PR sanitizer/64906 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=integer-divide-by-zero -O -Werror=maybe-uninitialized" } */ + +int +fn1 (int f, int s) +{ + int ret = 0; + if (f) + ret = s / (f ? (unsigned long) 8 : 0); + return ret; +} |