diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/final.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-prof/pr57451.C | 27 |
4 files changed, 55 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c6a5893..208b291 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-08-20 Teresa Johnson <tejohnson@google.com> + + PR rtl-optimizations/57451 + * final.c (reemit_insn_block_notes): Prevent lexical blocks + from crossing split section boundaries. + 2013-08-20 Matthew Gretton-Dann <matthew.gretton-dann@linaro.org> * config/arm/linux-elf.h (MULTILIB_DEFAULTS): Remove definition. diff --git a/gcc/final.c b/gcc/final.c index 31ced4f..4eaae0f 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -1650,12 +1650,26 @@ reemit_insn_block_notes (void) rtx insn, note; insn = get_insns (); - if (!active_insn_p (insn)) - insn = next_active_insn (insn); - for (; insn; insn = next_active_insn (insn)) + for (; insn; insn = next_insn (insn)) { tree this_block; + /* Prevent lexical blocks from straddling section boundaries. */ + if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_SWITCH_TEXT_SECTIONS) + { + for (tree s = cur_block; s != DECL_INITIAL (cfun->decl); + s = BLOCK_SUPERCONTEXT (s)) + { + rtx note = emit_note_before (NOTE_INSN_BLOCK_END, insn); + NOTE_BLOCK (note) = s; + note = emit_note_after (NOTE_INSN_BLOCK_BEG, insn); + NOTE_BLOCK (note) = s; + } + } + + if (!active_insn_p (insn)) + continue; + /* Avoid putting scope notes between jump table and its label. */ if (JUMP_TABLE_DATA_P (insn)) continue; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3d2abb7..f05e068 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-08-20 Teresa Johnson <tejohnson@google.com> + + PR rtl-optimizations/57451 + * g++.dg/tree-prof/pr57451.C: New test. + 2013-08-20 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58190 diff --git a/gcc/testsuite/g++.dg/tree-prof/pr57451.C b/gcc/testsuite/g++.dg/tree-prof/pr57451.C new file mode 100644 index 0000000..c69c130 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-prof/pr57451.C @@ -0,0 +1,27 @@ +// { dg-do run } +// { dg-require-effective-target freorder } +// { dg-options "-O2 -freorder-blocks-and-partition -g" } + +extern "C" void abort (void); +struct MyException {}; +struct Data { + int nr; + Data() : nr(66) {} +}; +Data __attribute__((noinline,noclone)) getData(int i) +{ + if (i) throw MyException(); + Data data; + data.nr = i; + return data; +} +int main(int, char **) +{ + Data data; + try { + data = getData(1); + } catch (MyException& e) { + if (data.nr != 66) + abort (); + } +} |