From 3b2fbe3e723b20ea9089e5f45c55b79feb37085b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 23 Jan 2020 20:08:22 +0100 Subject: [PATCH] postreload: Fix up postreload combine [PR93402] The following testcase is miscompiled, because the postreload pass changes: -(insn 14 13 23 2 (parallel [ - (set (reg:DI 1 dx [94]) - (plus:DI (reg:DI 1 dx [95]) - (reg:DI 5 di [92]))) - (clobber (reg:CC 17 flags)) - ]) "pr93402.c":8:30 186 {*adddi_1} - (expr_list:REG_EQUAL (plus:DI (reg:DI 5 di [92]) - (const_int 111111111111 [0x19debd01c7])) - (nil))) -(insn 23 14 25 2 (set (reg:SI 0 ax) +(insn 23 13 25 2 (set (reg:SI 0 ax) (const_int 0 [0])) "pr93402.c":10:1 67 {*movsi_internal} (nil)) (insn 25 23 26 2 (use (reg:SI 0 ax)) "pr93402.c":10:1 -1 (nil)) -(insn 26 25 35 2 (use (reg:DI 1 dx)) "pr93402.c":10:1 -1 +(insn 26 25 35 2 (use (plus:DI (reg:DI 1 dx [95]) + (reg:DI 5 di [92]))) "pr93402.c":10:1 -1 (nil)) A USE insn is not a normal insn and verify_changes called from apply_change_group is happy about any changes into it. The following patch avoids this optimization if we were to change the USE operand (this routine only changes a reg into (plus reg reg2)). 2020-01-23 Jakub Jelinek PR rtl-optimization/93402 * postreload.c (reload_combine_recognize_pattern): Don't try to adjust USE insns. * gcc.c-torture/execute/pr93402.c: New test. --- gcc/ChangeLog | 9 ++++++++ gcc/postreload.c | 4 ++++ gcc/testsuite/ChangeLog | 8 +++++++ gcc/testsuite/gcc.c-torture/execute/pr93402.c | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr93402.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1916dab20d19..2029c67bf020 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2020-02-13 Jakub Jelinek + + Backported from mainline + 2020-01-23 Jakub Jelinek + + PR rtl-optimization/93402 + * postreload.c (reload_combine_recognize_pattern): Don't try to adjust + USE insns. + 2020-02-11 Tamar Christina Backport from mainline diff --git a/gcc/postreload.c b/gcc/postreload.c index 728aa9b0ed5a..b76c7b0b758f 100644 --- a/gcc/postreload.c +++ b/gcc/postreload.c @@ -1081,6 +1081,10 @@ reload_combine_recognize_pattern (rtx_insn *insn) struct reg_use *use = reg_state[regno].reg_use + i; if (GET_MODE (*use->usep) != mode) return false; + /* Don't try to adjust (use (REGX)). */ + if (GET_CODE (PATTERN (use->insn)) == USE + && &XEXP (PATTERN (use->insn), 0) == use->usep) + return false; } /* Look for (set (REGX) (CONST_INT)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1dcf894a92a0..bec5eba50332 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-02-13 Jakub Jelinek + + Backported from mainline + 2020-01-23 Jakub Jelinek + + PR rtl-optimization/93402 + * gcc.c-torture/execute/pr93402.c: New test. + 2020-02-11 Tamar Christina Backport from mainline diff --git a/gcc/testsuite/gcc.c-torture/execute/pr93402.c b/gcc/testsuite/gcc.c-torture/execute/pr93402.c new file mode 100644 index 000000000000..6487797d0aa9 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr93402.c @@ -0,0 +1,21 @@ +/* PR rtl-optimization/93402 */ + +struct S { unsigned int a; unsigned long long b; }; + +__attribute__((noipa)) struct S +foo (unsigned long long x) +{ + struct S ret; + ret.a = 0; + ret.b = x * 11111111111ULL + 111111111111ULL; + return ret; +} + +int +main () +{ + struct S a = foo (1); + if (a.a != 0 || a.b != 122222222222ULL) + __builtin_abort (); + return 0; +} -- 2.47.2