function.h (enum function_frequency): Move declaration out of struct function.

2006-06-16  Richard Guenther  <rguenther@suse.de>

	* function.h (enum function_frequency): Move declaration
	out of struct function.
	(struct function): Move bool fields and the enum to the bitfield
	section.  Reorder elements to avoid padding.  Remove unused
	fields left over from the RTL inliner removal.
	* function.c (free_after_compilation): Do not zero removed fields.
	* Makefile.in (ipa-reference.o): Add $(FUNCTION_H) dependency.
	(ipa-type-escape.o): Likewise.

From-SVN: r114712

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a86fc802f9bf2d9f342a89c12670185cfa46ef4..e600a4eb4598ad9a7771909ae0f2ab90ccb10527 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-16  Richard Guenther  <rguenther@suse.de>
+
+       * function.h (enum function_frequency): Move declaration
+       out of struct function.
+       (struct function): Move bool fields and the enum to the bitfield
+       section.  Reorder elements to avoid padding.  Remove unused
+       fields left over from the RTL inliner removal.
+       * function.c (free_after_compilation): Do not zero removed fields.
+       * Makefile.in (ipa-reference.o): Add $(FUNCTION_H) dependency.
+       (ipa-type-escape.o): Likewise.
+
 2006-06-16  Richard Guenther  <rguenther@suse.de>
 
        * cgraph.h (struct cgraph_local_info): Turn bool elements

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4ffbd5588d1ff8f0de8310ce14314a9ffd8e9a38..9197d4eb88c0408e06297eb146eaf7d258f4fba4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2306,7 +2306,9 @@ ipa-utils.o : ipa-utils.c $(IPA_UTILS_H) $(CONFIG_H) $(SYSTEM_H) \
 ipa-reference.o : ipa-reference.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \
    pointer-set.h $(GGC_H) $(IPA_REFERENCE_H) $(IPA_UTILS_H) $(C_COMMON_H) \
-   $(TREE_GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) tree-pass.h $(DIAGNOSTIC_H)  
+   $(TREE_GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) tree-pass.h \
+   $(DIAGNOSTIC_H) $(FUNCTION_H) 
+
 ipa-pure-const.o : ipa-pure-const.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \
    pointer-set.h $(GGC_H) $(IPA_UTILS_H) $(C_COMMON_H) $(TARGET_H) \
@@ -2314,7 +2316,9 @@ ipa-pure-const.o : ipa-pure-const.c $(CONFIG_H) $(SYSTEM_H) \
 ipa-type-escape.o : ipa-type-escape.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \
    pointer-set.h $(GGC_H) $(IPA_TYPE_ESCAPE_H) $(IPA_UTILS_H) $(C_COMMON_H) \
-   $(TREE_GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) tree-pass.h $(DIAGNOSTIC_H)  
+   $(TREE_GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) tree-pass.h \
+   $(DIAGNOSTIC_H) $(FUNCTION_H) 
+
 coverage.o : coverage.c $(GCOV_IO_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) \
    $(FUNCTION_H) toplev.h $(GGC_H) langhooks.h $(COVERAGE_H) gt-coverage.h \

diff --git a/gcc/function.c b/gcc/function.c
index bb6480118d6f7b5067c53cb84165d9e1e8983ecc..1a495ac1a056c9221514e3194f24f6a9134b75af 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -332,8 +332,6 @@ free_after_compilation (struct function *f)
   f->x_stack_check_probe_note = NULL;
   f->x_arg_pointer_save_area = NULL;
   f->x_parm_birth_insn = NULL;
-  f->original_arg_vector = NULL;
-  f->original_decl_initial = NULL;
   f->epilogue_delay_list = NULL;
 }
 \f

diff --git a/gcc/function.h b/gcc/function.h
index 63295258c11c32b9f27e83eeb3d74dd49350332e..1903b165f419a05d7caa5cbbcb9e823f1d583a5a 100644 (file)
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -165,6 +165,17 @@ typedef struct temp_slot *temp_slot_p;
 DEF_VEC_P(temp_slot_p);
 DEF_VEC_ALLOC_P(temp_slot_p,gc);
 
+enum function_frequency {
+  /* This function most likely won't be executed at all.
+     (set only when profile feedback is available).  */
+  FUNCTION_FREQUENCY_UNLIKELY_EXECUTED,
+  /* The default value.  */
+  FUNCTION_FREQUENCY_NORMAL,
+  /* Optimize this function hard
+     (set only when profile feedback is available).  */
+  FUNCTION_FREQUENCY_HOT
+};
+
 /* This structure can save all the important global and static variables
    describing the status of the current function.  */
 
@@ -177,7 +188,6 @@ struct function GTY(())
 
   /* The control flow graph for this function.  */
   struct control_flow_graph *cfg;
-  bool after_inlining;
 
   /* For function.c.  */
 
@@ -277,18 +287,12 @@ struct function GTY(())
   /* List of available temp slots.  */
   struct temp_slot *x_avail_temp_slots;
 
-  /* Current nesting level for temporaries.  */
-  int x_temp_slot_level;
-
   /* This slot is initialized as 0 and is added to
      during the nested function.  */
   struct var_refs_queue *fixup_var_refs_queue;
 
-  /* For integrate.c.  */
-  int inlinable;
-  int no_debugging_symbols;
-  rtvec original_arg_vector;
-  tree original_decl_initial;
+  /* Current nesting level for temporaries.  */
+  int x_temp_slot_level;
 
   /* Highest label number in current function.  */
   int inl_max_label_num;
@@ -307,14 +311,12 @@ struct function GTY(())
 
   /* tm.h can use this to store whatever it likes.  */
   struct machine_function * GTY ((maybe_undef)) machine;
+
   /* The largest alignment of slot allocated on the stack.  */
   unsigned int stack_alignment_needed;
+
   /* Preferred alignment of the end of stack frame.  */
   unsigned int preferred_stack_boundary;
-  /* Set when the call to function itself has been emit.  */
-  bool recursive_call_emit;
-  /* Set when the tail call has been produced.  */
-  bool tail_call_emit;
 
   /* Language-specific code can use this to store whatever it likes.  */
   struct language_function * language;
@@ -328,19 +330,6 @@ struct function GTY(())
      delay list for them is recorded here.  */
   rtx epilogue_delay_list;
 
-  /* How commonly executed the function is.  Initialized during branch
-     probabilities pass.  */
-  enum function_frequency {
-    /* This function most likely won't be executed at all.
-       (set only when profile feedback is available).  */
-    FUNCTION_FREQUENCY_UNLIKELY_EXECUTED,
-    /* The default value.  */
-    FUNCTION_FREQUENCY_NORMAL,
-    /* Optimize this function hard
-       (set only when profile feedback is available).  */
-    FUNCTION_FREQUENCY_HOT
-  } function_frequency;
-
   /* Maximal number of entities in the single jumptable.  Used to estimate
      final flowgraph size.  */
   int max_jumptable_ents;
@@ -454,6 +443,18 @@ struct function GTY(())
   /* Nonzero if code to initialize arg_pointer_save_area has been emitted.  */
   unsigned int arg_pointer_save_area_init : 1;
 
+  unsigned int after_inlining : 1;
+
+  /* Set when the call to function itself has been emit.  */
+  unsigned int recursive_call_emit : 1;
+
+  /* Set when the tail call has been produced.  */
+  unsigned int tail_call_emit : 1;
+
+  /* How commonly executed the function is.  Initialized during branch
+     probabilities pass.  */
+  ENUM_BITFIELD (function_frequency) function_frequency : 2;
+
   /* Number of units of general registers that need saving in stdarg
      function.  What unit is depends on the backend, either it is number
      of bytes, or it can be number of registers.  */