From 006e3ae49013fc76e9ab97a653401153a014047b Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Wed, 13 Apr 2016 08:24:43 +0000 Subject: [PATCH] [ARM] PR target/70566 Check that condition register is dead in tst-imm -> lsls-imm Thumb2 peepholes Backport from mainline 2016-04-08 Kyrylo Tkachov PR target/70566 * config/arm/thumb2.md (tst + branch-> lsls + branch peephole below *orsi_not_shiftsi_si): Require that condition register is dead after the peephole. (second peephole after the above): Likewise. * gcc.c-torture/execute/pr70566.c: New test. From-SVN: r234931 --- gcc/ChangeLog | 11 +++++ gcc/config/arm/thumb2.md | 6 ++- gcc/testsuite/ChangeLog | 8 ++++ gcc/testsuite/gcc.c-torture/execute/pr70566.c | 47 +++++++++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr70566.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 828338e55650..4f31fc743301 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2016-04-13 Kyrylo Tkachov + + Backport from mainline + 2016-04-08 Kyrylo Tkachov + + PR target/70566 + * config/arm/thumb2.md (tst + branch-> lsls + branch + peephole below *orsi_not_shiftsi_si): Require that condition + register is dead after the peephole. + (second peephole after the above): Likewise. + 2016-04-12 Eric Botcazou PR target/70630 diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md index 1411a6816abc..10c8b0ea9ecb 100644 --- a/gcc/config/arm/thumb2.md +++ b/gcc/config/arm/thumb2.md @@ -1421,7 +1421,8 @@ (match_operand 5 "" "") (match_operand 6 "" "")))] "TARGET_THUMB2 - && (INTVAL (operands[2]) >= 0 && INTVAL (operands[2]) < 32)" + && (INTVAL (operands[2]) >= 0 && INTVAL (operands[2]) < 32) + && peep2_reg_dead_p (2, operands[0])" [(parallel [(set (match_dup 0) (compare:CC_NOOV (ashift:SI (match_dup 1) (match_dup 2)) (const_int 0))) @@ -1449,7 +1450,8 @@ (match_operand 5 "" "") (match_operand 6 "" "")))] "TARGET_THUMB2 - && (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 32)" + && (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 32) + && peep2_reg_dead_p (2, operands[0])" [(parallel [(set (match_dup 0) (compare:CC_NOOV (ashift:SI (match_dup 1) (match_dup 2)) (const_int 0))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ba7723a47892..324810d7bb46 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2016-04-13 Kyrylo Tkachov + + Backport from mainline + 2016-04-08 Kyrylo Tkachov + + PR target/70566 + * gcc.c-torture/execute/pr70566.c: New test. + 2016-04-13 Alan Modra Backport from mainline diff --git a/gcc/testsuite/gcc.c-torture/execute/pr70566.c b/gcc/testsuite/gcc.c-torture/execute/pr70566.c new file mode 100644 index 000000000000..f47106e70c7d --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr70566.c @@ -0,0 +1,47 @@ +/* PR target/70566. */ + +#define NULL 0 + +struct mystruct +{ + unsigned int f1 : 1; + unsigned int f2 : 1; + unsigned int f3 : 1; +}; + +__attribute__ ((noinline)) void +myfunc (int a, void *b) +{ +} +__attribute__ ((noinline)) int +myfunc2 (void *a) +{ + return 0; +} + +static void +set_f2 (struct mystruct *user, int f2) +{ + if (user->f2 != f2) + myfunc (myfunc2 (NULL), NULL); + else + __builtin_abort (); +} + +__attribute__ ((noinline)) void +foo (void *data) +{ + struct mystruct *user = data; + if (!user->f2) + set_f2 (user, 1); +} + +int +main (void) +{ + struct mystruct a; + a.f1 = 1; + a.f2 = 0; + foo (&a); + return 0; +} -- 2.47.2