diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-14 20:54:22 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-14 20:54:22 +0000 |
| commit | 2a4b892970941759663bda9f6464dbff415b06cf (patch) | |
| tree | 21ac4dc1e8f7684dfc4e43a947417c41369a1b86 /gcc/dwarf2out.c | |
| parent | c7f0a362d24042abe9d77e4201270872dda1704a (diff) | |
| download | gcc-2a4b892970941759663bda9f6464dbff415b06cf.tar.gz | |
2009-09-14 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 151701
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@151702 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/dwarf2out.c')
| -rw-r--r-- | gcc/dwarf2out.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 6f0b965d2e7..14836d539e8 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."); } |