emit-rtl.c (last_label_num, [...]): Remove.

	* emit-rtl.c (last_label_num, base_label_num): Remove.
	(max_label_num): Always return label_num.
	(set_new_last_label_num, restore_emit_status): Remove.
	(init_emit): Don't initialize last_label_num.
	* function.c (pop_function_context_from): Don't call
	restore_emit_status.
	* function.h: Remove the prototype for restore_emit_status.
	* rtl.h: Remove the prototype for set_new_last_label_num.

From-SVN: r88789

5 files changed, 11 insertions, 37 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d8d386fad6..77818b2e892 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
 2004-10-08  Kazu Hirata  <kazu@cs.umass.edu>
 
+	* emit-rtl.c (last_label_num, base_label_num): Remove.
+	(max_label_num): Always return label_num.
+	(set_new_last_label_num, restore_emit_status): Remove.
+	(init_emit): Don't initialize last_label_num.
+	* function.c (pop_function_context_from): Don't call
+	restore_emit_status.
+	* function.h: Remove the prototype for restore_emit_status.
+	* rtl.h: Remove the prototype for set_new_last_label_num.
+
+2004-10-08  Kazu Hirata  <kazu@cs.umass.edu>
+
 	* stmt.c (expand_decl_init): Remove.
 	* tree.h: Remove the corresponding prototype.
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 2a152c525c0..ec7bec39adc 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -69,17 +69,6 @@ enum machine_mode ptr_mode;	/* Mode whose width is POINTER_SIZE.  */
 
 static GTY(()) int label_num = 1;
 
-/* Highest label number in current function.
-   Zero means use the value of label_num instead.
-   This is nonzero only when belatedly compiling an inline function.  */
-
-static int last_label_num;
-
-/* Value label_num had when set_new_last_label_num was called.
-   If label_num has not changed since then, last_label_num is valid.  */
-
-static int base_label_num;
-
 /* Nonzero means do not generate NOTEs for source line numbers.  */
 
 static int no_line_numbers;
@@ -1007,8 +996,6 @@ max_reg_num (void)
 int
 max_label_num (void)
 {
-  if (last_label_num && label_num == base_label_num)
-    return last_label_num;
   return label_num;
 }
 
@@ -2135,25 +2122,6 @@ set_new_first_and_last_insn (rtx first, rtx last)
 
   cur_insn_uid++;
 }
-
-/* Set the last label number found in the current function.
-   This is used when belatedly compiling an inline function.  */
-
-void
-set_new_last_label_num (int last)
-{
-  base_label_num = label_num;
-  last_label_num = last;
-}
-
-/* Restore all variables describing the current status from the structure *P.
-   This is used after a nested function.  */
-
-void
-restore_emit_status (struct function *p ATTRIBUTE_UNUSED)
-{
-  last_label_num = 0;
-}
 
 /* Go through all the RTL insn bodies and copy any invalid shared
    structure.  This routine should only be called once.  */
@@ -5233,7 +5201,6 @@ init_emit (void)
   reg_rtx_no = LAST_VIRTUAL_REGISTER + 1;
   last_location = UNKNOWN_LOCATION;
   first_label_num = label_num;
-  last_label_num = 0;
   seq_stack = NULL;
 
   /* Init the tables that describe all the pseudo regs.  */
diff --git a/gcc/function.c b/gcc/function.c
index 4c8d6c409c1..f583d29b969 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -287,8 +287,6 @@ pop_function_context_from (tree context ATTRIBUTE_UNUSED)
   current_function_decl = p->decl;
   reg_renumber = 0;
 
-  restore_emit_status (p);
-
   lang_hooks.function.leave_nested (p);
 
   /* Reset variables that have known state during rtx generation.  */
diff --git a/gcc/function.h b/gcc/function.h
index e38b5294dbb..addf21365d4 100644
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -516,7 +516,6 @@ extern HOST_WIDE_INT get_func_frame_size (struct function *);
 extern struct machine_function * (*init_machine_status) (void);
 
 /* Save and restore status information for a nested function.  */
-extern void restore_emit_status (struct function *);
 extern void free_after_parsing (struct function *);
 extern void free_after_compilation (struct function *);
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index e0f86ee1c3d..9bbb04c15de 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1963,7 +1963,6 @@ extern void push_topmost_sequence (void);
 extern void pop_topmost_sequence (void);
 extern void reverse_comparison (rtx);
 extern void set_new_first_and_last_insn (rtx, rtx);
-extern void set_new_last_label_num (int);
 extern void unshare_all_rtl (void);
 extern void unshare_all_rtl_again (rtx);
 extern void unshare_all_rtl_in_chain (rtx);