re PR bootstrap/41350 (FreeBSD bootstrap failure: unimplemented: Multiple EH…

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

gcc/ChangeLog

+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>
 

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.");
     }

gcc/testsuite/ChangeLog

+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

gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C

+// { dg-options "-fno-dwarf2-cfi-asm" }
+
+extern void bar (void);
+int foo (void)
+{
+  try {
+      bar();
+  } catch (...) {
+      return 1;
+  }
+  return 0;
+}
+
+int foobar (void)
+{
+}
+