From fe81684aeafdfdee46e4270787298dcaf6bf52c2 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 15 Mar 2018 08:35:28 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258552 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/optabs.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr84860.c | 11 +++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr84860.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b4dde6ea8b4..07999ed4662 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-03-15 Jakub Jelinek + + 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 * config/i386/i386.c (F_AVX512VBMI2, F_GFNI, F_VPCLMULQDQ, diff --git a/gcc/optabs.c b/gcc/optabs.c index 5f61e4e9521..53a147c8ef6 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 4962ff5f407..994b8ee7fdd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-15 Jakub Jelinek + + PR target/84860 + * gcc.c-torture/compile/pr84860.c: New test. + 2018-03-15 Julia Koval * 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 00000000000..002737c71b5 --- /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; + } +} -- 2.11.4.GIT