diff options
| author | Richard Guenther <rguenther@suse.de> | 2009-09-14 09:38:55 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2009-09-14 09:38:55 +0000 |
| commit | cdb4dde56c5ff41ec84a73815959bc6a5aaf3183 (patch) | |
| tree | 525f98d8c0de2ba74d603a0588f367064d2b046a | |
| parent | 5c2dbba68d8540043e37f43d681ce136bf4eb0ce (diff) | |
| download | gcc-cdb4dde56c5ff41ec84a73815959bc6a5aaf3183.zip gcc-cdb4dde56c5ff41ec84a73815959bc6a5aaf3183.tar.gz gcc-cdb4dde56c5ff41ec84a73815959bc6a5aaf3183.tar.bz2 | |
re PR bootstrap/41350 (FreeBSD bootstrap failure: unimplemented: Multiple EH personalities are supported only with assemblers supporting .cfi.personality directive)
2009-09-14 Richard Guenther <rguenther@suse.de>
PR middle-end/41350
* dwarf2out.c (dwarf2out_begin_prologue): Adjust non-CFI asm
EH personality path.
* g++.dg/debug/dwarf-eh-personality-1.C: New testcase.
From-SVN: r151681
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C | 17 |
4 files changed, 36 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 21bf315..930b556 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-09-14 Richard Guenther <rguenther@suse.de> + + PR middle-end/41350 + * dwarf2out.c (dwarf2out_begin_prologue): Adjust non-CFI asm + EH personality path. + 2009-09-13 Richard Guenther <rguenther@suse.de> Rafael Avila de Espindola <espindola@google.com> diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 6f0b965..14836d5 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3881,7 +3881,6 @@ dwarf2out_begin_prologue (unsigned int line ATTRIBUTE_UNUSED, char label[MAX_ARTIFICIAL_LABEL_BYTES]; char * dup_label; dw_fde_ref fde; - rtx personality; section *fnsec; current_function_func_begin_label = NULL; @@ -3976,14 +3975,19 @@ dwarf2out_begin_prologue (unsigned int line ATTRIBUTE_UNUSED, dwarf2out_source_line (line, file, 0, true); #endif - personality = get_personality_function (current_function_decl); if (dwarf2out_do_cfi_asm ()) dwarf2out_do_cfi_startproc (false); else { - if (!current_unit_personality || current_unit_personality == personality) + rtx personality = get_personality_function (current_function_decl); + if (!current_unit_personality) current_unit_personality = personality; - else + + /* We cannot keep a current personality per function as without CFI + asm at the point where we emit the CFI data there is no current + function anymore. */ + if (personality + && current_unit_personality != personality) sorry ("Multiple EH personalities are supported only with assemblers " "supporting .cfi.personality directive."); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc1b26b..b0b2adc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-09-14 Richard Guenther <rguenther@suse.de> + + PR middle-end/41350 + * g++.dg/debug/dwarf-eh-personality-1.C: New testcase. + 2009-09-12 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/41328 diff --git a/gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C b/gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C new file mode 100644 index 0000000..5c72588 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C @@ -0,0 +1,17 @@ +// { dg-options "-fno-dwarf2-cfi-asm" } + +extern void bar (void); +int foo (void) +{ + try { + bar(); + } catch (...) { + return 1; + } + return 0; +} + +int foobar (void) +{ +} + |