Convert nonlocal_goto_handler_labels from an EXPR_LIST to an INSN_LIST

gcc/
2014-08-28  David Malcolm  <dmalcolm@redhat.com>

	* function.h (struct rtl_data): Convert field
	"x_nonlocal_goto_handler_labels" from rtx_expr_list * to
	rtx_insn_list *.
	* rtl.h (remove_node_from_insn_list): New prototype.

	* builtins.c (expand_builtin): When prepending to
	nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than
	gen_rtx_EXPR_LIST.
	* cfgbuild.c (make_edges): Convert local "x" from rtx_expr_list *
	to rtx_insn_list *, and use its "insn" method rather than
	"element" method.
	* cfgrtl.c (delete_insn): Use new function
	remove_node_from_insn_list rather than
	remove_node_from_expr_list.
	(cfg_layout_initialize): Convert local "x" from rtx_expr_list *
	to rtx_insn_list *, and use its "insn" method rather than
	"element" method.
	* dwarf2cfi.c (create_trace_edges): Likewise for local "lab".
	* reload1.c (set_initial_label_offsets): Likewise for local "x".
	* rtlanal.c (remove_node_from_insn_list): New function, adapted
	from remove_node_from_expr_list.
	* stmt.c (expand_label): When prepending to
	nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than
	gen_rtx_EXPR_LIST.

From-SVN: r214687

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 813b5c75437106f5e7c356b2d72a241dd0484c53..9081532fdf9b8086f3f3b198e45bbaac331230c9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2014-08-28  David Malcolm  <dmalcolm@redhat.com>
+
+       * function.h (struct rtl_data): Convert field
+       "x_nonlocal_goto_handler_labels" from rtx_expr_list * to
+       rtx_insn_list *.
+       * rtl.h (remove_node_from_insn_list): New prototype.
+
+       * builtins.c (expand_builtin): When prepending to
+       nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than
+       gen_rtx_EXPR_LIST.
+       * cfgbuild.c (make_edges): Convert local "x" from rtx_expr_list *
+       to rtx_insn_list *, and use its "insn" method rather than
+       "element" method.
+       * cfgrtl.c (delete_insn): Use new function
+       remove_node_from_insn_list rather than
+       remove_node_from_expr_list.
+       (cfg_layout_initialize): Convert local "x" from rtx_expr_list *
+       to rtx_insn_list *, and use its "insn" method rather than
+       "element" method.
+       * dwarf2cfi.c (create_trace_edges): Likewise for local "lab".
+       * reload1.c (set_initial_label_offsets): Likewise for local "x".
+       * rtlanal.c (remove_node_from_insn_list): New function, adapted
+       from remove_node_from_expr_list.
+       * stmt.c (expand_label): When prepending to
+       nonlocal_goto_handler_labels, use gen_rtx_INSN_LIST rather than
+       gen_rtx_EXPR_LIST.
+
 2014-08-28  David Malcolm  <dmalcolm@redhat.com>
 
        * function.h (struct rtl_data): Strengthen fields "x_return_label"

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 20add5ffbece7739163749abd8459c49c56a0b33..975f696090f54fea1de481ea29c4b584f9ced88c 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -6185,7 +6185,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
          /* This is copied from the handling of non-local gotos.  */
          expand_builtin_setjmp_setup (buf_addr, label_r);
          nonlocal_goto_handler_labels
-           = gen_rtx_EXPR_LIST (VOIDmode, label_r,
+           = gen_rtx_INSN_LIST (VOIDmode, label_r,
                                 nonlocal_goto_handler_labels);
          /* ??? Do not let expand_label treat us as such since we would
             not want to be both on the list of non-local labels and on

diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 082f070408c8ee2f2ca8d898d1dc1f38b0f2d229..d7fa97a3512133119947626c6e421f694e689544 100644 (file)
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -337,10 +337,10 @@ make_edges (basic_block min, basic_block max, int update_p)
                     taken, then only calls to those functions or to other
                     nested functions that use them could possibly do
                     nonlocal gotos.  */
-                 for (rtx_expr_list *x = nonlocal_goto_handler_labels;
+                 for (rtx_insn_list *x = nonlocal_goto_handler_labels;
                       x;
                       x = x->next ())
-                   make_label_edge (edge_cache, bb, x->element (),
+                   make_label_edge (edge_cache, bb, x->insn (),
                                     EDGE_ABNORMAL | EDGE_ABNORMAL_CALL);
                }
 

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 9707c1f5f4dc45f261a859f29145231871525ddf..d9b41e0ca1cd8f7339fb8185dd69461d80540ae2 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -159,7 +159,7 @@ delete_insn (rtx uncast_insn)
            }
        }
 
-      remove_node_from_expr_list (insn, &nonlocal_goto_handler_labels);
+      remove_node_from_insn_list (insn, &nonlocal_goto_handler_labels);
     }
 
   if (really_delete)
@@ -4216,7 +4216,7 @@ cfg_layout_duplicate_bb (basic_block bb)
 void
 cfg_layout_initialize (unsigned int flags)
 {
-  rtx_expr_list *x;
+  rtx_insn_list *x;
   basic_block bb;
 
   /* Once bb partitioning is complete, cfg layout mode should not be
@@ -4237,7 +4237,7 @@ cfg_layout_initialize (unsigned int flags)
   /* Make sure that the targets of non local gotos are marked.  */
   for (x = nonlocal_goto_handler_labels; x; x = x->next ())
     {
-      bb = BLOCK_FOR_INSN (x->element ());
+      bb = BLOCK_FOR_INSN (x->insn ());
       bb->flags |= BB_NON_LOCAL_GOTO_TARGET;
     }
 

diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 245282408221557cdb40d7dddd1065d6917b5c52..7c495e4876d14801f915e03cce94eda5c17d1b6f 100644 (file)
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -2338,10 +2338,10 @@ create_trace_edges (rtx insn)
 
       /* Process non-local goto edges.  */
       if (can_nonlocal_goto (insn))
-       for (rtx_expr_list *lab = nonlocal_goto_handler_labels;
+       for (rtx_insn_list *lab = nonlocal_goto_handler_labels;
             lab;
             lab = lab->next ())
-         maybe_record_trace_start_abnormal (lab->element (), insn);
+         maybe_record_trace_start_abnormal (lab->insn (), insn);
     }
   else if (rtx_sequence *seq = dyn_cast <rtx_sequence *> (PATTERN (insn)))
     {

diff --git a/gcc/function.h b/gcc/function.h
index c2e0366b5f6418caf08683b278e0c9cb3874ef5a..3921d21f0aee0776123030f3fab37ff8eaba6042 100644 (file)
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -264,9 +264,9 @@ struct GTY(()) rtl_data {
      Used for detecting stack clobbers.  */
   tree stack_protect_guard;
 
-  /* List (chain of EXPR_LIST) of labels heading the current handlers for
+  /* List (chain of INSN_LIST) of labels heading the current handlers for
      nonlocal gotos.  */
-  rtx_expr_list *x_nonlocal_goto_handler_labels;
+  rtx_insn_list *x_nonlocal_goto_handler_labels;
 
   /* Label that will go on function epilogue.
      Jumping to this label serves as a "return" instruction

diff --git a/gcc/reload1.c b/gcc/reload1.c
index a386615d12ecfa8ac825d78686a365c1fd2ea51e..0a01b1b503e0419d774435ef178f64ed23cc5471 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3915,9 +3915,9 @@ set_initial_label_offsets (void)
     if (x->element ())
       set_label_offsets (x->element (), NULL, 1);
 
-  for (rtx_expr_list *x = nonlocal_goto_handler_labels; x; x = x->next ())
-    if (x->element ())
-      set_label_offsets (x->element (), NULL, 1);
+  for (rtx_insn_list *x = nonlocal_goto_handler_labels; x; x = x->next ())
+    if (x->insn ())
+      set_label_offsets (x->insn (), NULL, 1);
 
   for_each_eh_label (set_initial_eh_label_offset);
 }

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 3a02132838396e0991eada78c72f3fec801ff298..e6e23050cdcdbe170b49065f00485271fcdcc223 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2828,6 +2828,7 @@ extern rtx regno_use_in (unsigned int, rtx);
 extern int auto_inc_p (const_rtx);
 extern int in_expr_list_p (const_rtx, const_rtx);
 extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **);
+extern void remove_node_from_insn_list (const rtx_insn *, rtx_insn_list **);
 extern int loc_mentioned_in_p (rtx *, const_rtx);
 extern rtx_insn *find_first_parameter_load (rtx, rtx);
 extern bool keep_with_call_p (const_rtx);

diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index ceaa7ab7a747aebd71595e9da48b8f08db7a0275..21de0adbdd7c27a610b1c16c2401dcb0d00a3b24 100644 (file)
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2243,6 +2243,35 @@ remove_node_from_expr_list (const_rtx node, rtx_expr_list **listp)
       temp = temp->next ();
     }
 }
+
+/* Search LISTP (an INSN_LIST) for an entry whose first operand is NODE and
+   remove that entry from the list if it is found.
+
+   A simple equality test is used to determine if NODE matches.  */
+
+void
+remove_node_from_insn_list (const rtx_insn *node, rtx_insn_list **listp)
+{
+  rtx_insn_list *temp = *listp;
+  rtx prev = NULL;
+
+  while (temp)
+    {
+      if (node == temp->insn ())
+       {
+         /* Splice the node out of the list.  */
+         if (prev)
+           XEXP (prev, 1) = temp->next ();
+         else
+           *listp = temp->next ();
+
+         return;
+       }
+
+      prev = temp;
+      temp = temp->next ();
+    }
+}
 \f
 /* Nonzero if X contains any volatile instructions.  These are instructions
    which may cause unpredictable machine state instructions, and thus no

diff --git a/gcc/stmt.c b/gcc/stmt.c
index beafaa0bc1ef2d6324b2a60b92b527cb68e13cdd..1cbd63d53a21c17627983b4696ddbdec43dd8328 100644 (file)
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -187,7 +187,7 @@ expand_label (tree label)
     {
       expand_builtin_setjmp_receiver (NULL);
       nonlocal_goto_handler_labels
-       = gen_rtx_EXPR_LIST (VOIDmode, label_r,
+       = gen_rtx_INSN_LIST (VOIDmode, label_r,
                             nonlocal_goto_handler_labels);
     }