diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-02-21 15:39:21 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-02-21 15:39:21 +0100 |
| commit | 2f3ec56d606df6665d93599b2a018db631a13113 (patch) | |
| tree | c342c5dab1daaea372097f60db202ee861e37058 /gcc | |
| parent | 03108bad95b96d9dad75dc99482d652ea9a749c5 (diff) | |
| download | gcc-2f3ec56d606df6665d93599b2a018db631a13113.zip gcc-2f3ec56d606df6665d93599b2a018db631a13113.tar.gz gcc-2f3ec56d606df6665d93599b2a018db631a13113.tar.bz2 | |
re PR target/79494 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2330)
PR target/79494
* config/i386/i386.c (ix86_expand_split_stack_prologue): Call
make_reg_eh_region_note_nothrow_nononlocal on call_insn.
* config/rs6000/rs6000.c: Include except.h.
(rs6000_expand_split_stack_prologue): Call
make_reg_eh_region_note_nothrow_nononlocal on the call insn.
* gcc.dg/pr79494.c: New test.
From-SVN: r245629
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 2 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr79494.c | 22 |
5 files changed, 41 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1286f16..0d39438 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-02-21 Jakub Jelinek <jakub@redhat.com> + + PR target/79494 + * config/i386/i386.c (ix86_expand_split_stack_prologue): Call + make_reg_eh_region_note_nothrow_nononlocal on call_insn. + * config/rs6000/rs6000.c: Include except.h. + (rs6000_expand_split_stack_prologue): Call + make_reg_eh_region_note_nothrow_nononlocal on the call insn. + 2017-02-21 Martin Jambor <mjambor@suse.cz> PR lto/79579 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index fe2dd6a..14ac189 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -15057,6 +15057,8 @@ ix86_expand_split_stack_prologue (void) add_function_usage_to (call_insn, call_fusage); if (!TARGET_64BIT) add_reg_note (call_insn, REG_ARGS_SIZE, GEN_INT (0)); + /* Indicate that this function can't jump to non-local gotos. */ + make_reg_eh_region_note_nothrow_nononlocal (as_a <rtx_insn *> (call_insn)); /* In order to make call/return prediction work right, we now need to execute a return instruction. See diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 41ad008..25b10f1 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -66,6 +66,7 @@ #include "builtins.h" #include "context.h" #include "tree-pass.h" +#include "except.h" #if TARGET_XCOFF #include "xcoffout.h" /* get declarations of xcoff_*_section_name */ #endif @@ -31680,6 +31681,8 @@ rs6000_expand_split_stack_prologue (void) split_stack_return use r0. */ use_reg (&call_fusage, r0); add_function_usage_to (insn, call_fusage); + /* Indicate that this function can't jump to non-local gotos. */ + make_reg_eh_region_note_nothrow_nononlocal (insn); emit_insn (gen_frame_load (r0, r1, info->lr_save_offset)); insn = emit_move_insn (lr, r0); add_reg_note (insn, REG_CFA_RESTORE, lr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7161eb0..b9c70a7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-21 Jakub Jelinek <jakub@redhat.com> + + PR target/79494 + * gcc.dg/pr79494.c: New test. + 2017-02-21 Segher Boessenkool <segher@kernel.crashing.org> * gcc.dg/plugin/diagnostic-test-expressions-1.c: Add -Wno-psabi diff --git a/gcc/testsuite/gcc.dg/pr79494.c b/gcc/testsuite/gcc.dg/pr79494.c new file mode 100644 index 0000000..e8543f8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr79494.c @@ -0,0 +1,22 @@ +/* PR target/79494 */ +/* { dg-do compile } */ +/* { dg-require-effective-target split_stack } */ +/* { dg-options "-O2 -fsplit-stack -g" } */ + +void +foo (int a) +{ + __label__ lab; + __attribute__((noinline, noclone)) void bar (int b) + { + switch (b) + { + case 1: + goto lab; + case 2: + goto lab; + } + } + bar (a); +lab:; +} |