aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-03-15 09:35:28 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-03-15 09:35:28 +0100
commitfa7dde7ea2e02096ab3e727b8de930c2d6678f87 (patch)
treef3bb6c6e8210e683ecad13cc7a198f0e497ca0e3 /gcc
parentc36b04c1461c2825f30760043fb216237d07ce39 (diff)
downloadgcc-fa7dde7ea2e02096ab3e727b8de930c2d6678f87.zip
gcc-fa7dde7ea2e02096ab3e727b8de930c2d6678f87.tar.gz
gcc-fa7dde7ea2e02096ab3e727b8de930c2d6678f87.tar.bz2
re PR target/84860 (ICE in emit_move_insn, at expr.c:3717)
PR target/84860 * optabs.c (emit_conditional_move): Pass address of cmode's copy rather than address of cmode as last argument to prepare_cmp_insn. * gcc.c-torture/compile/pr84860.c: New test. From-SVN: r258552
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/optabs.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr84860.c11
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4dde6e..07999ed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-15 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/84860
+ * optabs.c (emit_conditional_move): Pass address of cmode's copy
+ rather than address of cmode as last argument to prepare_cmp_insn.
+
2018-03-15 Julia Koval <julia.koval@intel.com>
* config/i386/i386.c (F_AVX512VBMI2, F_GFNI, F_VPCLMULQDQ,
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 5f61e4e..53a147c 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4345,9 +4345,10 @@ emit_conditional_move (rtx target, enum rtx_code code, rtx op0, rtx op1,
save_pending_stack_adjust (&save);
last = get_last_insn ();
do_pending_stack_adjust ();
+ machine_mode cmpmode = cmode;
prepare_cmp_insn (XEXP (comparison, 0), XEXP (comparison, 1),
GET_CODE (comparison), NULL_RTX, unsignedp,
- OPTAB_WIDEN, &comparison, &cmode);
+ OPTAB_WIDEN, &comparison, &cmpmode);
if (comparison)
{
struct expand_operand ops[4];
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4962ff5..994b8ee 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-15 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/84860
+ * gcc.c-torture/compile/pr84860.c: New test.
+
2018-03-15 Julia Koval <julia.koval@intel.com>
* gcc.target/i386/builtin_target.c (check_intel_cpu_model): Add
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr84860.c b/gcc/testsuite/gcc.c-torture/compile/pr84860.c
new file mode 100644
index 0000000..002737c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr84860.c
@@ -0,0 +1,11 @@
+/* PR target/84860 */
+
+void
+foo (int x, int y)
+{
+ while (x < 1)
+ {
+ x = y;
+ y = ((float)1 / 0) ? 2 : 0;
+ }
+}