backport: re PR target/84827 (ICE in extract_insn, at recog.c:2311)

	Backported from mainline
	2018-03-13  Jakub Jelinek  <jakub@redhat.com>

	PR target/84827
	* config/i386/i386.md (round<mode>2): For 387 fancy math, disable
	pattern if -ftrapping-math -fno-fp-int-builtin-inexact.

	* gcc.target/i386/pr84827.c: New test.

From-SVN: r261920

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 105317b17b6ed9e0b899d4084c2858a8594cc046..f8789d2668313a989bf01f9edb06a159f084067c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
        Backported from mainline
        2018-03-13  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/84827
+       * config/i386/i386.md (round<mode>2): For 387 fancy math, disable
+       pattern if -ftrapping-math -fno-fp-int-builtin-inexact.
+
        PR target/84786
        * config/i386/sse.md (sse2_loadhpd): Use Yv constraint rather than v
        on the last operand.

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index ed09ee0bdc2989f8ba0af383a0d0c5a53cbacc51..191f3f1b2024f9953aa1942dd5233e1d102c482a 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -15536,7 +15536,8 @@
   "(TARGET_USE_FANCY_MATH_387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
-    && flag_unsafe_math_optimizations)
+    && flag_unsafe_math_optimizations
+    && (flag_fp_int_builtin_inexact || !flag_trapping_math))
    || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
        && !flag_trapping_math && !flag_rounding_math)"
 {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5dbc86894dc39df0d71b238d76360a4bc0857d3f..b4e4fec70fb43d20af4cba9353fc1cd3e5308658 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backported from mainline
        2018-03-13  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/84827
+       * gcc.target/i386/pr84827.c: New test.
+
        PR target/84786
        * gcc.target/i386/avx512f-pr84786-1.c: New test.
        * gcc.target/i386/avx512f-pr84786-2.c: New test.

diff --git a/gcc/testsuite/gcc.target/i386/pr84827.c b/gcc/testsuite/gcc.target/i386/pr84827.c
new file mode 100644 (file)
index 0000000..003258c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr84827.c
@@ -0,0 +1,21 @@
+/* PR target/84827 */
+/* { dg-do compile } */
+/* { dg-options "-Ofast -fno-fp-int-builtin-inexact -ftrapping-math -fno-associative-math -mfpmath=387" } */
+
+double
+f1 (double a)
+{
+  return __builtin_round (a);
+}
+
+float
+f2 (float a)
+{
+  return __builtin_roundf (a);
+}
+
+long double
+f3 (long double a)
+{
+  return __builtin_roundl (a);
+}