From 57d69a633c9226fce5ea2fb728c2e817733a150c Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Wed, 18 Oct 2017 16:44:27 +0000 Subject: [PATCH] re PR middle-end/82556 (internal compiler error in curr_insn_transform, at lra-constraints.c:4307) 2017-10-18 Vladimir Makarov PR middle-end/82556 * lra-constraints.c (curr_insn_transform): Use non-input operand instead of output one for matched reload. 2017-10-18 Vladimir Makarov PR middle-end/82556 * gcc.target/i386/pr82556.c: New. From-SVN: r253862 --- gcc/ChangeLog | 6 ++++++ gcc/lra-constraints.c | 17 ++++++++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/pr82556.c | 19 +++++++++++++++++++ 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr82556.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8e056f249cb..59e0910f8a7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-10-18 Vladimir Makarov + + PR middle-end/82556 + * lra-constraints.c (curr_insn_transform): Use non-input operand + instead of output one for matched reload. + 2017-10-18 Bin Cheng * tree-loop-distribution.c (INCLUDE_ALGORITHM): New header file. diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 4734c072c96..6163d7d5056 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -4271,7 +4271,13 @@ curr_insn_transform (bool check_only_p) } else if (curr_static_id->operand[i].type == OP_IN && (curr_static_id->operand[goal_alt_matched[i][0]].type - == OP_OUT)) + == OP_OUT + || (curr_static_id->operand[goal_alt_matched[i][0]].type + == OP_INOUT + && (operands_match_p + (*curr_id->operand_loc[i], + *curr_id->operand_loc[goal_alt_matched[i][0]], + -1))))) { /* generate reloads for input and matched outputs. */ match_inputs[0] = i; @@ -4282,9 +4288,14 @@ curr_insn_transform (bool check_only_p) [goal_alt_number * n_operands + goal_alt_matched[i][0]] .earlyclobber); } - else if (curr_static_id->operand[i].type == OP_OUT + else if ((curr_static_id->operand[i].type == OP_OUT + || (curr_static_id->operand[i].type == OP_INOUT + && (operands_match_p + (*curr_id->operand_loc[i], + *curr_id->operand_loc[goal_alt_matched[i][0]], + -1)))) && (curr_static_id->operand[goal_alt_matched[i][0]].type - == OP_IN)) + == OP_IN)) /* Generate reloads for output and matched inputs. */ match_reload (i, goal_alt_matched[i], outputs, goal_alt[i], &before, &after, curr_static_id->operand_alternative diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee05077ecf0..42cdbd6b61a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-18 Vladimir Makarov + + PR middle-end/82556 + * gcc.target/i386/pr82556.c: New. + 2017-10-18 Bin Cheng * gcc.dg/tree-ssa/ldist-17.c: Adjust test string. diff --git a/gcc/testsuite/gcc.target/i386/pr82556.c b/gcc/testsuite/gcc.target/i386/pr82556.c new file mode 100644 index 00000000000..409a301af30 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr82556.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-strict-aliasing -fwrapv -fexcess-precision=standard" } */ +extern int foo(); +typedef struct { + char id; + unsigned char fork_flags; + short data_length; +} Header; +int a; +void X() { + do { + char* b; + Header c; + if (a) + c.fork_flags |= 1; + __builtin_memcpy(b, &c, __builtin_offsetof(Header, data_length)); + b += foo(); + } while (1); +} -- 2.30.2