diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-12-05 09:26:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-12-05 09:26:06 +0100 |
| commit | f6fa17afefbef8fe5f5aa689814852efcb5e4b58 (patch) | |
| tree | 7e5f20eaf354eb0ca5b732817f8e94c1e0732ecc /gcc | |
| parent | 47be95094bc2d5c79320234a35e5049e0514fff1 (diff) | |
| download | gcc-f6fa17afefbef8fe5f5aa689814852efcb5e4b58.zip gcc-f6fa17afefbef8fe5f5aa689814852efcb5e4b58.tar.gz gcc-f6fa17afefbef8fe5f5aa689814852efcb5e4b58.tar.bz2 | |
re PR sanitizer/88333 (ice in asan_emit_stack_protection, at asan.c:1574)
PR sanitizer/88333
* cfgexpand.c (expand_stack_vars): If asan_vec is empty, start with
aligning frame offset to ASAN_RED_ZONE_SIZE bytes.
* c-c++-common/asan/pr88333.c: New test.
From-SVN: r266817
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cfgexpand.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/asan/pr88333.c | 12 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a71d88f..22ca348 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-12-05 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/88333 + * cfgexpand.c (expand_stack_vars): If asan_vec is empty, start with + aligning frame offset to ASAN_RED_ZONE_SIZE bytes. + 2018-12-05 Xianmiao Qu <xianmiao_qu@c-sky.com> * config.gcc (csky-*-linux-gnu*): Force .init_array support. diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 5e23bc2..9b3259d 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -1124,6 +1124,11 @@ expand_stack_vars (bool (*pred) (size_t), struct stack_vars_data *data) && frame_offset.is_constant (&prev_offset) && stack_vars[i].size.is_constant ()) { + if (data->asan_vec.is_empty ()) + { + alloc_stack_frame_space (0, ASAN_RED_ZONE_SIZE); + prev_offset = frame_offset.to_constant (); + } prev_offset = align_base (prev_offset, MAX (alignb, ASAN_MIN_RED_ZONE_SIZE), !FRAME_GROWS_DOWNWARD); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b74eb0..1c90082 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-12-05 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/88333 + * c-c++-common/asan/pr88333.c: New test. + 2018-12-05 Alexandre Oliva <aoliva@redhat.com> PR c++/85569 diff --git a/gcc/testsuite/c-c++-common/asan/pr88333.c b/gcc/testsuite/c-c++-common/asan/pr88333.c new file mode 100644 index 0000000..0f257a8 --- /dev/null +++ b/gcc/testsuite/c-c++-common/asan/pr88333.c @@ -0,0 +1,12 @@ +/* PR sanitizer/88333 */ +/* { dg-do compile { target fstack_protector } } */ +/* { dg-options "-fstack-protector-strong -fsanitize=address" } */ + +void bar (int *); + +void +foo (void) +{ + int c; + bar (&c); +} |