[PATCH] Merge from LTO: eh_personality changes

[Richard Guenther]

On Sun, 13 Sep 2009, David Edelsohn wrote:

> This patch broke bootstrap on AIX:
> 
> /farm/dje/src/src/libstdc++-v3/libsupc++/eh_ptr.cc: In destructor
> 'std::__exception_ptr::exception_ptr::~exception_ptr()':
> /farm/dje/src/src/libstdc++-v3/libsupc++/eh_ptr.cc:67:1: sorry,
> unimplemented: Multiple EH personalities are supported only with
> assemblers supporting .cfi.personality directive.
> make[2]: *** [eh_ptr.lo] Error 1

Doh, I forgot about that path.  Fixed like the following, committed
as obvious.  Can you verify this restores bootstrap?

Thanks,
Richard.

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.

Index: gcc/dwarf2out.c
===================================================================
*** gcc/dwarf2out.c	(revision 151680)
--- gcc/dwarf2out.c	(working copy)
*************** dwarf2out_begin_prologue (unsigned int l
*** 3881,3887 ****
    char label[MAX_ARTIFICIAL_LABEL_BYTES];
    char * dup_label;
    dw_fde_ref fde;
-   rtx personality;
    section *fnsec;
  
    current_function_func_begin_label = NULL;
--- 3881,3886 ----
*************** dwarf2out_begin_prologue (unsigned int l
*** 3976,3989 ****
      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)
          current_unit_personality = personality;
!       else
  	sorry ("Multiple EH personalities are supported only with assemblers "
  	       "supporting .cfi.personality directive.");
      }
--- 3975,3993 ----
      dwarf2out_source_line (line, file, 0, true);
  #endif
  
    if (dwarf2out_do_cfi_asm ())
      dwarf2out_do_cfi_startproc (false);
    else
      {
!       rtx personality = get_personality_function (current_function_decl);
!       if (!current_unit_personality)
          current_unit_personality = personality;
! 
!       /* 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.");
      }
Index: gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C
===================================================================
*** gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C	(revision 0)
--- gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C	(revision 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)
+ {
+ }
+