lra: fix spill_hard_reg_in_range clobber check

FROM..TO range might contain NOTE_INSN_DELETED insns, for which the
corresponding entries in lra_insn_recog_data[] are NULLs.  Example from
the problematic code from PR87596:

    (note 148 154 68 7 NOTE_INSN_DELETED)

lra_insn_recog_data[] is used directly only when the insn in question
is taken from insn_bitmap, which is not the case here.  In other
situations lra_get_insn_recog_data () guarded by INSN_P () or other
stricter predicate are used.  So we need to do this here as well.

A tiny detail worth noting: I put the INSN_P () check before the
insn_bitmap check, because I believe that insn_bitmap can contain only
real insns anyway.

gcc/ChangeLog:

2018-10-19  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR rtl-optimization/87596
	* lra-constraints.c (spill_hard_reg_in_range): Use INSN_P () +
	lra_get_insn_recog_data () instead of lra_insn_recog_data[]
	for instructions in FROM..TO range.

gcc/testsuite/ChangeLog:

2018-10-19  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR rtl-optimization/87596
	* gcc.target/i386/pr87596.c: New test.

From-SVN: r265306

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 88ec6863128fdaa32cbd91b605e3f34b2a842330..1b91d7d42a0193fea238aa28577f9e830f17c64f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-19  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+       PR rtl-optimization/87596
+       * lra-constraints.c (spill_hard_reg_in_range): Use INSN_P () +
+       lra_get_insn_recog_data () instead of lra_insn_recog_data[]
+       for instructions in FROM..TO range.
+
 2018-10-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * cfgexpand.c (expand_one_var): Use specific wording in error message

diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 774d1ff3aaa722d088bdde09ad78095704e98f8f..3cbe0465a87d54c5d142e84c398d950efbbb7390 100644 (file)
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -5696,12 +5696,15 @@ spill_hard_reg_in_range (int regno, enum reg_class rclass, rtx_insn *from, rtx_i
        continue;
       for (insn = from; insn != NEXT_INSN (to); insn = NEXT_INSN (insn))
        {
-         lra_insn_recog_data_t id = lra_insn_recog_data[uid = INSN_UID (insn)];
-         struct lra_static_insn_data *static_id = id->insn_static_data;
+         struct lra_static_insn_data *static_id;
          struct lra_insn_reg *reg;
 
-         if (bitmap_bit_p (&lra_reg_info[hard_regno].insn_bitmap, uid))
+         if (!INSN_P (insn))
+             continue;
+         if (bitmap_bit_p (&lra_reg_info[hard_regno].insn_bitmap,
+                           INSN_UID (insn)))
            break;
+         static_id = lra_get_insn_recog_data (insn)->insn_static_data;
          for (reg = static_id->hard_regs; reg != NULL; reg = reg->next)
            if (reg->regno == hard_regno)
              break;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index edceccd0c3e1c31f9b39dcb4672d4c0e8d09f476..705d745a2d4a586cfac4db35afdd2fd668651fed 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-19  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+       PR rtl-optimization/87596
+       * gcc.target/i386/pr87596.c: New test.
+
 2018-10-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/frame_overflow2.adb: New test.

diff --git a/gcc/testsuite/gcc.target/i386/pr87596.c b/gcc/testsuite/gcc.target/i386/pr87596.c
new file mode 100644 (file)
index 0000000..764708b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr87596.c
@@ -0,0 +1,16 @@
+/* LRA corner case which triggered a segfault.  */
+/* Reduced testcase by Arseny Solokha.  */
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O1 -fschedule-insns -ftrapv -funroll-all-loops -fno-tree-dominator-opts -fno-tree-loop-im" } */
+    
+void
+wh (__int128 *ku)
+{
+  unsigned int *dp;
+
+  while (*ku < 1)
+    {
+      *dp <<= 32;  /* { dg-warning "left shift count >= width of type" } */
+      ++*ku;
+    }
+}