* emit-rtl.c (free_emit_status): Don't check DECL_DEFER_OUTPUT.

        Free the struct.
        (mark_emit_status): Renamed from mark_emit_state.
        * except.c (mark_eh_status): Renamed from mark_eh_state.
        Check not null before marking.
        (free_eh_status): New.
        * expr.c (mark_expr_status, free_expr_status): New.
        * function.c (free_machine_status): New.
        (free_after_parsing): New.
        (free_after_compilation): Move bits to free_after_parsing; call
        free_eh_status, free_expr_status; zero the marked members of the
        function state.
        (prepare_function_start): No can_garbage_collect.
        Call init_eh_for_function.
        (expand_dummy_function_end): Free up current_function state.
        (mark_function_status): Renamed from mark_function_state.
        (mark_function_chain): No can_garbage_collect.  Call mark_expr_status.
        * function.h (struct function): No can_garbage_collect.
        (free_machine_status, free_after_parsing): Declare.
        (free_eh_status, free_expr_status): Declare.
        * ggc.h (mark_expr_status): Declare.
        * stmt.c (free_stmt_status): Free the struct.
        (mark_stmt_status): Renamed from mark_stmt_state.
        (init_stmt): Don't call init_eh.
        (init_stmt_for_function): Don't call init_eh_for_function.
        * toplev.c (compile_file): Call init_eh.
        (rest_of_compilation): Free basic block info before ggc_collect.
        Call free_after_parsing; conditionally call free_after_compilation.
        * varasm.c (mark_varasm_status): Renamed from mark_varasm_state.
        Check not null before marking.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29448 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 10 deletions

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 779aeaa04d8..cf56a09f3ad 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -3228,9 +3228,12 @@ mark_pool_sym_hash_table (pps)
 /* Mark P for GC.  */
 
 void
-mark_varasm_state (p)
-  struct varasm_status *p;
+mark_varasm_status (p)
+     struct varasm_status *p;
 {
+  if (p == NULL)
+    return;
+
   mark_pool_constant (p->x_first_pool);
   mark_pool_sym_hash_table (p->x_const_rtx_sym_hash_table);
   ggc_mark_rtx (p->x_const_double_chain);
@@ -3246,17 +3249,11 @@ free_varasm_status (f)
 {
   struct varasm_status *p;
 
-  if (DECL_DEFER_OUTPUT (f->decl))
-    return;
-
   p = f->varasm;
   free (p->x_const_rtx_hash_table);
   free (p->x_const_rtx_sym_hash_table);
-
-  p->x_first_pool = p->x_last_pool = 0;
-  p->x_const_rtx_hash_table = 0;
-  p->x_const_rtx_sym_hash_table = 0;
-  p->x_const_double_chain = 0;
+  free (p);
+  f->varasm = NULL;
 }
 
 enum kind { RTX_DOUBLE, RTX_INT };