From f8f77d4d0028e99035a48626c6e53ebbe2448798 Mon Sep 17 00:00:00 2001 From: Sudakshina Das Date: Thu, 11 Jan 2018 10:46:59 +0000 Subject: [PATCH] [PR82096] Fix ICE in int_mode_for_mode with arm-linux-gnueabi The bug reported a particular test di-longlong64-sync-1.c failing when run on arm-linux-gnueabi with options -mthumb -march=armv5t -O[g,1,2,3] and -mthumb -march=armv6 -O[g,1,2,3]. The crash was caused because of the explicit VOIDmode argument that is sent to emit_store_flag_force () and that the emit_store_flag_force () was not handling the VOIDmode adequately. This patch fixes that. ChangeLog entries: *** gcc/ChangeLog *** 2017-01-11 Sudakshina Das PR target/82096 * expmed.c (emit_store_flag_force): Swap if const op0 and change VOIDmode to mode of op0. *** gcc/testsuite/ChangeLog *** 2017-01-11 Sudakshina Das PR target/82096 * gcc.c-torture/compile/pr82096.c: New test. From-SVN: r256526 --- gcc/ChangeLog | 6 ++++++ gcc/expmed.c | 11 +++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr82096.c | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr82096.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e5f46a259d..d34418e82ee 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-01-11 Sudakshina Das + + PR target/82096 + * expmed.c (emit_store_flag_force): Swap if const op0 + and change VOIDmode to mode of op0. + 2018-01-11 Richard Sandiford PR rtl-optimization/83761 diff --git a/gcc/expmed.c b/gcc/expmed.c index f34ed9376af..35ce82bbb29 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -6082,6 +6082,17 @@ emit_store_flag_force (rtx target, enum rtx_code code, rtx op0, rtx op1, if (tem != 0) return tem; + /* If one operand is constant, make it the second one. Only do this + if the other operand is not constant as well. */ + if (swap_commutative_operands_p (op0, op1)) + { + std::swap (op0, op1); + code = swap_condition (code); + } + + if (mode == VOIDmode) + mode = GET_MODE (op0); + if (!target) target = gen_reg_rtx (word_mode); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e6d2045674a..3b49b86a30b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-01-11 Sudakshina Das + + PR target/82096 + * gcc.c-torture/compile/pr82096.c: New test. + 2018-01-11 Ed Schonberg * gnat.dg/bip_overlay.adb, gnat.dg/bip_overlay.ads: New testcase. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c b/gcc/testsuite/gcc.c-torture/compile/pr82096.c new file mode 100644 index 00000000000..9fed28cd189 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c @@ -0,0 +1,9 @@ +/* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { target arm*-*-* } } */ + +static long long AL[24]; + +int +check_ok (void) +{ + return (__sync_bool_compare_and_swap (AL+1, 0x200000003ll, 0x1234567890ll)); +} -- 2.30.2