expr.c (pending_chain): Move up.

	* expr.c (pending_chain): Move up.
	(save_expr_status): Do save pending_chain.
	(restore_expr_status): And restore it.
	* function.h (struct function): Add pending_chain.

From-SVN: r23241

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d27c8a840222a63eba3a05e229675ac60d1fc7fb..5f6faa2ddbd40e564c2499d1fd1745873cf36fd0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 23 00:56:11 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * expr.c (pending_chain): Move up.
+       (save_expr_status): Do save pending_chain.
+       (restore_expr_status): And restore it.
+       * function.h (struct function): Add pending_chain.
+
 1998-10-23 Herman A.J. ten Brugge <Haj.Ten.Brugge@net.HCC.nl>
 
        * reorg.c (relax_delay_slots): Fixed test for mostly_true_jump. The

diff --git a/gcc/expr.c b/gcc/expr.c
index 9a42b43c9699e531d67a7abaf1fae31658b39ef3..37581ec39ce81e3f214e231360e0e56fbd3e44f8 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -114,6 +114,9 @@ static int can_handle_constant_p;
    infinite recursion.  */
 static int in_check_memory_usage;
 
+/* Postincrements that still need to be expanded.  */
+static rtx pending_chain;
+
 /* This structure is used by move_by_pieces to describe the move to
    be performed.  */
 struct move_by_pieces
@@ -342,15 +345,14 @@ void
 save_expr_status (p)
      struct function *p;
 {
-  /* Instead of saving the postincrement queue, empty it.  */
-  emit_queue ();
-
+  p->pending_chain = pending_chain;
   p->pending_stack_adjust = pending_stack_adjust;
   p->inhibit_defer_pop = inhibit_defer_pop;
   p->saveregs_value = saveregs_value;
   p->apply_args_value = apply_args_value;
   p->forced_labels = forced_labels;
 
+  pending_chain = NULL_RTX;
   pending_stack_adjust = 0;
   inhibit_defer_pop = 0;
   saveregs_value = 0;
@@ -365,6 +367,7 @@ void
 restore_expr_status (p)
      struct function *p;
 {
+  pending_chain = p->pending_chain;
   pending_stack_adjust = p->pending_stack_adjust;
   inhibit_defer_pop = p->inhibit_defer_pop;
   saveregs_value = p->saveregs_value;
@@ -375,8 +378,6 @@ restore_expr_status (p)
 /* Manage the queue of increment instructions to be output
    for POSTINCREMENT_EXPR expressions, etc.  */
 
-static rtx pending_chain;
-
 /* Queue up to increment (or change) VAR later.  BODY says how:
    BODY should be the same thing you would pass to emit_insn
    to increment right away.  It will go to emit_insn later on.

diff --git a/gcc/function.h b/gcc/function.h
index 014ed135b74401eeadb48f74e9d775f5cd3e340d..d5e6cd06abc53c1bd45be46265d123aa9a1f1a69 100644 (file)
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -146,6 +146,7 @@ struct function
   rtx ehc;
 
   /* For expr.c.  */
+  rtx pending_chain;
   int pending_stack_adjust;
   int inhibit_defer_pop;
   rtx saveregs_value;