diff options
| author | Martin Liska <mliska@suse.cz> | 2017-10-18 10:14:47 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2017-10-18 08:14:47 +0000 |
| commit | 236ac44204c4a0f172751fad3221a8686e58bfc7 (patch) | |
| tree | 3725d74c3a9dce2e6b7b2d1b0724a8dbd3b604c9 /gcc | |
| parent | 1b2944cbd4da300b142524fe259fc20140396692 (diff) | |
| download | gcc-236ac44204c4a0f172751fad3221a8686e58bfc7.zip gcc-236ac44204c4a0f172751fad3221a8686e58bfc7.tar.gz gcc-236ac44204c4a0f172751fad3221a8686e58bfc7.tar.bz2 | |
Do not put gimple stmt on an abnormal edge (PR sanitizer/82545).
2017-10-18 Martin Liska <mliska@suse.cz>
PR sanitizer/82545
* asan.c (asan_expand_poison_ifn): Do not put gimple stmt
on an abnormal edge.
2017-10-18 Martin Liska <mliska@suse.cz>
PR sanitizer/82545
* gcc.dg/asan/pr82545.c: New test.
From-SVN: r253845
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/asan.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/asan/pr82545.c | 17 |
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a59161d..b945f8b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-10-18 Martin Liska <mliska@suse.cz> + + PR sanitizer/82545 + * asan.c (asan_expand_poison_ifn): Do not put gimple stmt + on an abnormal edge. + 2017-10-18 Sebastian Huber <sebastian.huber@embedded-brains.de> * doc/invoke.texi (ffunction-sections and fdata-sections): @@ -3400,6 +3400,10 @@ asan_expand_poison_ifn (gimple_stmt_iterator *iter, { edge e = gimple_phi_arg_edge (phi, i); + /* Do not insert on an edge we can't split. */ + if (e->flags & EDGE_ABNORMAL) + continue; + if (call_to_insert == NULL) call_to_insert = gimple_copy (call); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0f3e73..4ac7524 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-18 Martin Liska <mliska@suse.cz> + + PR sanitizer/82545 + * gcc.dg/asan/pr82545.c: New test. + 2017-10-18 Paolo Carlini <paolo.carlini@oracle.com> PR c++/69057 diff --git a/gcc/testsuite/gcc.dg/asan/pr82545.c b/gcc/testsuite/gcc.dg/asan/pr82545.c new file mode 100644 index 0000000..8870db3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/asan/pr82545.c @@ -0,0 +1,17 @@ +/* PR sanitizer/82545. */ +/* { dg-do compile } */ + +extern void c(int); +extern void d(void); + +void *buf[5]; + +void a(void) { + { + int b; + &b; + __builtin_setjmp(buf); + c(b); + } + d(); +} |