Use rtx_jump_table_data in jump.c:delete_related_insns

gcc/ChangeLog
2014-09-05  David Malcolm  <dmalcolm@redhat.com>

	* jump.c (delete_related_insns): Introduce a new local "table" by
	replacing JUMP_TABLE_DATA_P with a dyn_cast, then use the
	get_labels method of "table" to simplify access to the labels in
	the jump table.

From-SVN: r214960

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce91a960767cf292e9230610bd30ec91cc86c917..8c355dca714dea30a6f42aa1186517fcb3d83826 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-05  David Malcolm  <dmalcolm@redhat.com>
+
+       * jump.c (delete_related_insns): Introduce a new local "table" by
+       replacing JUMP_TABLE_DATA_P with a dyn_cast, then use the
+       get_labels method of "table" to simplify access to the labels in
+       the jump table.
+
 2014-09-05  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/arm/cortex-a53.md (cortex_a53_fpalu): Add f_rints, f_rintd,

diff --git a/gcc/jump.c b/gcc/jump.c
index 12edd927e54d8b93ab4ce415c024f57a714b8e97..84040da830782918510d26fc2722958fa30c7a81 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1314,15 +1314,15 @@ delete_related_insns (rtx uncast_insn)
 
   /* Likewise if we're deleting a dispatch table.  */
 
-  if (JUMP_TABLE_DATA_P (insn))
+  if (rtx_jump_table_data *table = dyn_cast <rtx_jump_table_data *> (insn))
     {
-      rtx pat = PATTERN (insn);
-      int i, diff_vec_p = GET_CODE (pat) == ADDR_DIFF_VEC;
-      int len = XVECLEN (pat, diff_vec_p);
+      rtvec labels = table->get_labels ();
+      int i;
+      int len = GET_NUM_ELEM (labels);
 
       for (i = 0; i < len; i++)
-       if (LABEL_NUSES (XEXP (XVECEXP (pat, diff_vec_p, i), 0)) == 0)
-         delete_related_insns (XEXP (XVECEXP (pat, diff_vec_p, i), 0));
+       if (LABEL_NUSES (XEXP (RTVEC_ELT (labels, i), 0)) == 0)
+         delete_related_insns (XEXP (RTVEC_ELT (labels, i), 0));
       while (next && INSN_DELETED_P (next))
        next = NEXT_INSN (next);
       return next;