From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 30 Aug 2019 12:39:50 +0000 (+0200)
Subject: backport: re PR target/90187 (ICE in extract_insn, at recog.c:2304 x86_64)
X-Git-Tag: releases/gcc-7.5.0~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3f6ecaff26e0610aa0c4d3506c74a782e57622;p=thirdparty%2Fgcc.git

backport: re PR target/90187 (ICE in extract_insn, at recog.c:2304 x86_64)

	Backported from mainline
	2019-04-24  Jakub Jelinek  <jakub@redhat.com>

	PR target/90187
	* config/i386/i386.c (ix86_expand_sse_fp_minmax): Force if_true into
	a register if both if_true and if_false are MEMs.

	* g++.dg/opt/pr90187.C: New test.

From-SVN: r275152
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b21d88fdecb..3662abf12c51 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
 	Backported from mainline
 	2019-04-24  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/90187
+	* config/i386/i386.c (ix86_expand_sse_fp_minmax): Force if_true into
+	a register if both if_true and if_false are MEMs.
+
 	PR tree-optimization/90208
 	* tree-cfg.c (remove_bb): Move forced labels from removed bbs
 	after labels of new_bb, not before them.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1f4029c7a6cd..3658759a62e9 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -24147,6 +24147,8 @@ ix86_expand_sse_fp_minmax (rtx dest, enum rtx_code code, rtx cmp_op0,
   else
     {
       code = is_min ? SMIN : SMAX;
+      if (MEM_P (if_true) && MEM_P (if_false))
+	if_true = force_reg (mode, if_true);
       tmp = gen_rtx_fmt_ee (code, mode, if_true, if_false);
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4bbe02353780..0a714e310292 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
 	Backported from mainline
 	2019-04-24  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/90187
+	* g++.dg/opt/pr90187.C: New test.
+
 	PR tree-optimization/90208
 	* gcc.dg/tsan/pr90208-2.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/opt/pr90187.C b/gcc/testsuite/g++.dg/opt/pr90187.C
new file mode 100644
index 000000000000..ed9e9fe32265
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr90187.C
@@ -0,0 +1,15 @@
+// PR target/90187
+// { dg-do compile }
+// { dg-options "-Ofast -ffloat-store" }
+
+double a[64];
+double *foo (void);
+
+void
+bar (int x, const double *y)
+{
+  int i;
+  for (i = 0; i < x; i++)
+    if (y[i] < a[i])
+      a[i] = y[i];
+}