diff options
| author | Martin Liska <mliska@suse.cz> | 2017-04-10 09:29:29 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2017-04-10 07:29:29 +0000 |
| commit | 3ee0fb02bb5164817f9ec9e40f9eccde78b6e10b (patch) | |
| tree | 31af896cdb1e309a27a9f50375a1da7ebc7ee096 /gcc | |
| parent | 167a5b77978fd30959290d5649d96534ae8db9a3 (diff) | |
| download | gcc-3ee0fb02bb5164817f9ec9e40f9eccde78b6e10b.zip gcc-3ee0fb02bb5164817f9ec9e40f9eccde78b6e10b.tar.gz gcc-3ee0fb02bb5164817f9ec9e40f9eccde78b6e10b.tar.bz2 | |
Evaluate a SAVE_EXPR before an UBSAN check (PR sanitizer/80350).
2017-04-10 Martin Liska <mliska@suse.cz>
PR sanitizer/80350
* c-ubsan.c (ubsan_instrument_shift): Evaluate RHS before
doing an UBSAN check.
2017-04-10 Martin Liska <mliska@suse.cz>
PR sanitizer/80350
* c-c++-common/ubsan/pr80350.c: New test.
From-SVN: r246799
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -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/pr80350.c | 17 |
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 594aa05..ff6edbd 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2017-04-10 Martin Liska <mliska@suse.cz> + + PR sanitizer/80350 + * c-ubsan.c (ubsan_instrument_shift): Evaluate RHS before + doing an UBSAN check. + 2017-04-03 Jonathan Wakely <jwakely@redhat.com> * c-warn.c (do_warn_double_promotion): Fix typo in comment. diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c index 91bdef8..e48841a 100644 --- a/gcc/c-family/c-ubsan.c +++ b/gcc/c-family/c-ubsan.c @@ -172,6 +172,7 @@ ubsan_instrument_shift (location_t loc, enum tree_code code, /* In case we have a SAVE_EXPR in a conditional context, we need to make sure it gets evaluated before the condition. */ t = fold_build2 (COMPOUND_EXPR, TREE_TYPE (t), unshare_expr (op0), t); + t = fold_build2 (COMPOUND_EXPR, TREE_TYPE (t), unshare_expr (op1), t); enum sanitize_code recover_kind = SANITIZE_SHIFT_EXPONENT; tree else_t = void_node; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c94c7c4..8e6523a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-10 Martin Liska <mliska@suse.cz> + + PR sanitizer/80350 + * c-c++-common/ubsan/pr80350.c: New test. + 2017-04-10 Jakub Jelinek <jakub@redhat.com> PR target/80324 diff --git a/gcc/testsuite/c-c++-common/ubsan/pr80350.c b/gcc/testsuite/c-c++-common/ubsan/pr80350.c new file mode 100644 index 0000000..317d2fa --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/pr80350.c @@ -0,0 +1,17 @@ +/* PR target/80310 */ +/* { dg-do run } */ +/* { dg-options "-O0 -fsanitize=shift -fno-sanitize-recover=shift" } */ + +unsigned int x = 1; +unsigned int y = 0; + +void foo() { + y = 1 >> (!x * 1111); +} + +int main () { + foo (); + if (y != 1) + __builtin_abort (); + return 0; +} |