revert: re PR sanitizer/82353 (runtime ubsan crash)

2017-10-12  Vladimir Makarov  <vmakarov@redhat.com>

	Revert
	2017-10-11  Vladimir Makarov  <vmakarov@redhat.com>
	PR sanitizer/82353
	* lra.c (collect_non_operand_hard_regs): Don't ignore operator
	locations.
	* lra-lives.c (bb_killed_pseudos, bb_gen_pseudos): Move up.
	(make_hard_regno_born, make_hard_regno_dead): Update
	bb_killed_pseudos and bb_gen_pseudos.

From-SVN: r253685

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 79316bb98fdfa310a8d8ac7be168c3636b958daa..430f3c9096b50ff39b55f86b507e734278c9bb84 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2017-10-12  Vladimir Makarov  <vmakarov@redhat.com>
+
+       Revert
+       2017-10-11  Vladimir Makarov  <vmakarov@redhat.com>
+       PR sanitizer/82353
+       * lra.c (collect_non_operand_hard_regs): Don't ignore operator
+       locations.
+       * lra-lives.c (bb_killed_pseudos, bb_gen_pseudos): Move up.
+       (make_hard_regno_born, make_hard_regno_dead): Update
+       bb_killed_pseudos and bb_gen_pseudos.
+
 2017-10-12  Jan Hubicka  <hubicka@ucw.cz>
 
        * x86-tune-sched.c (ix86_adjust_cost): Fix Zen support.

diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 6a49f9a8341b18eb23c98db8b25f6101a35357bf..4648eca5ace8af61875832324c997050125d4192 100644 (file)
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -220,9 +220,6 @@ lra_intersected_live_ranges_p (lra_live_range_t r1, lra_live_range_t r2)
   return false;
 }
 
-/* The corresponding bitmaps of BB currently being processed.  */
-static bitmap bb_killed_pseudos, bb_gen_pseudos;
-
 /* The function processing birth of hard register REGNO.  It updates
    living hard regs, START_LIVING, and conflict hard regs for living
    pseudos.  Conflict hard regs for the pic pseudo is not updated if
@@ -246,7 +243,6 @@ make_hard_regno_born (int regno, bool check_pic_pseudo_p ATTRIBUTE_UNUSED)
        || i != REGNO (pic_offset_table_rtx))
 #endif
       SET_HARD_REG_BIT (lra_reg_info[i].conflict_hard_regs, regno);
-  bitmap_set_bit (bb_gen_pseudos, regno);
 }
 
 /* Process the death of hard register REGNO.  This updates
@@ -259,8 +255,6 @@ make_hard_regno_dead (int regno)
     return;
   sparseset_set_bit (start_dying, regno);
   CLEAR_HARD_REG_BIT (hard_regs_live, regno);
-  bitmap_clear_bit (bb_gen_pseudos, regno);
-  bitmap_set_bit (bb_killed_pseudos, regno);
 }
 
 /* Mark pseudo REGNO as living at program point POINT, update conflicting
@@ -305,6 +299,9 @@ mark_pseudo_dead (int regno, int point)
     }
 }
 
+/* The corresponding bitmaps of BB currently being processed.  */
+static bitmap bb_killed_pseudos, bb_gen_pseudos;
+
 /* Mark register REGNO (pseudo or hard register) in MODE as live at
    program point POINT.  Update BB_GEN_PSEUDOS.
    Return TRUE if the liveness tracking sets were modified, or FALSE

diff --git a/gcc/lra.c b/gcc/lra.c
index 3122f2c25053a8b48b2ab277510bf18c4376cec9..a4737773b6e8fa74f58ed31340b4d6a32f623cb8 100644 (file)
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -820,8 +820,7 @@ collect_non_operand_hard_regs (rtx *x, lra_insn_recog_data_t data,
   const char *fmt = GET_RTX_FORMAT (code);
 
   for (i = 0; i < data->insn_static_data->n_operands; i++)
-    if (! data->insn_static_data->operand[i].is_operator
-       && x == data->operand_loc[i])
+    if (x == data->operand_loc[i])
       /* It is an operand loc. Stop here.  */
       return list;
   for (i = 0; i < data->insn_static_data->n_dups; i++)