C++ Issue on GCC 3.0 branch

[John David Anglin]

> Weird.  I actually get an abort on that code, compiling as you
> suggested.  (I'm using a cross-compiler from i686-pc-linux-gnu.)
> 
> What happens is that force_const_mem records constant-pool entries for
> labels here, from expand_builtin_setjmp_setup:
> 
>   emit_move_insn (validize_mem (mem),
> 		  force_reg (Pmode, gen_rtx_LABEL_REF (Pmode, receiver_label)));
> 
> Then, flow deletes the labels.  Then, when output_constant_pool goes
> to output the reference, this abort files:
> 
> 	case LABEL_REF:
> 	  tmp = XEXP (x, 0);
> 	  if (INSN_DELETED_P (tmp)
> 	      || (GET_CODE (tmp) == NOTE
> 		  && NOTE_LINE_NUMBER (tmp) == NOTE_INSN_DELETED))
> 	    {
> 	      abort ();
> 	      x = const0_rtx;
> 	    }
> 
> What's supposed to keep that from happenning?

How about this?

Dave
-- 
J. David Anglin                                  dave.anglin@nrc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6605)

2001-04-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>

	* builtins.c (expand_builtin_setjmp_setup): Set nonlocal flag in label.

--- builtins.c.orig	Tue Apr 17 14:26:59 2001
+++ builtins.c	Sat Apr 21 18:41:27 2001
@@ -468,6 +468,7 @@
   enum machine_mode sa_mode = STACK_SAVEAREA_MODE (SAVE_NONLOCAL);
   rtx stack_save;
   rtx mem;
+  rtx label_ref;
 
   if (setjmp_alias_set == -1)
     setjmp_alias_set = new_alias_set ();
@@ -495,8 +496,9 @@
   mem = gen_rtx_MEM (Pmode, plus_constant (buf_addr, GET_MODE_SIZE (Pmode))),
   MEM_ALIAS_SET (mem) = setjmp_alias_set;
 
-  emit_move_insn (validize_mem (mem),
-		  force_reg (Pmode, gen_rtx_LABEL_REF (Pmode, receiver_label)));
+  label_ref = gen_rtx_LABEL_REF (Pmode, receiver_label);
+  LABEL_REF_NONLOCAL_P (label_ref) = 1;
+  emit_move_insn (validize_mem (mem), force_reg (Pmode, label_ref));
 
   stack_save = gen_rtx_MEM (sa_mode,
 			    plus_constant (buf_addr,