summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Makarov <vmakarov@redhat.com>2019-07-10 16:07:10 +0000
committerVladimir Makarov <vmakarov@gcc.gnu.org>2019-07-10 16:07:10 +0000
commit613caed2feb9cfc8158308670b59df3d031ec629 (patch)
treea7a6e3e8f35c31ba35b57e041c14eab9ac773965
parent12bb04368e7fcbdd8d3744a440eee23c9293958f (diff)
re PR target/91102 (aarch64 ICE on Linux kernel with -Os starting with r270266)
2019-07-10 Vladimir Makarov <vmakarov@redhat.com> PR target/91102 * lra-constraints.c (process_alt_operands): Don't match user defined regs only if they are early clobbers. 2019-07-10 Vladimir Makarov <vmakarov@redhat.com> PR target/91102 * gcc.target/aarch64/pr91102.c: New test. From-SVN: r273357
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lra-constraints.c17
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/aarch64/pr91102.c26
4 files changed, 50 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f109a8cc5ef..e7004e3b95c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-10 Vladimir Makarov <vmakarov@redhat.com>
+
+ PR target/91102
+ * lra-constraints.c (process_alt_operands): Don't match user
+ defined regs only if they are early clobbers.
+
2019-07-10 Marc Glisse <marc.glisse@inria.fr>
* wide-int.h (wi::lshift): Reject negative values for the fast path.
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index d1d99e01cde..55d8d133d39 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative)
else
{
/* Operands don't match. If the operands are
- different user defined explicit hard registers,
- then we cannot make them match. */
+ different user defined explicit hard
+ registers, then we cannot make them match
+ when one is early clobber operand. */
if ((REG_P (*curr_id->operand_loc[nop])
|| SUBREG_P (*curr_id->operand_loc[nop]))
&& (REG_P (*curr_id->operand_loc[m])
@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative)
&& REG_P (m_reg)
&& HARD_REGISTER_P (m_reg)
&& REG_USERVAR_P (m_reg))
- break;
+ {
+ int i;
+
+ for (i = 0; i < early_clobbered_regs_num; i++)
+ if (m == early_clobbered_nops[i])
+ break;
+ if (i < early_clobbered_regs_num
+ || early_clobber_p)
+ break;
+ }
}
-
/* Both operands must allow a reload register,
otherwise we cannot make them match. */
if (curr_alt[m] == NO_REGS)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e531f0a3b97..6b2bf884bfd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-10 Vladimir Makarov <vmakarov@redhat.com>
+
+ PR target/91102
+ * gcc.target/aarch64/pr91102.c: New test.
+
2019-07-10 Richard Biener <rguenther@suse.de>
PR tree-optimization/91126
diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c
new file mode 100644
index 00000000000..70b99045a48
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c
@@ -0,0 +1,26 @@
+/* PR target/91102 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int
+foo (long d, long l)
+{
+ register long e asm ("x1") = d;
+ register long f asm("x2") = l;
+ asm ("" : : "r" (e), "r" (f));
+ return 3;
+}
+
+struct T { int i; int j; };
+union S { long h; struct T t; };
+
+void
+bar (union S b)
+{
+ while (1)
+ {
+ union S c = b;
+ c.t.j++;
+ b.h = foo (b.h, c.h);
+ }
+}